===================================================================
RCS file: /cvs/mandoc/Makefile,v
retrieving revision 1.30
retrieving revision 1.312
diff -u -p -r1.30 -r1.312
--- mandoc/Makefile	2008/12/07 22:40:18	1.30
+++ mandoc/Makefile	2011/02/24 14:30:15	1.312
@@ -1,108 +1,346 @@
-.SUFFIXES:	.html .7
+.SUFFIXES:	.html .xml .sgml .1 .3 .7 .md5 .tar.gz 
+.SUFFIXES:	.1.txt .3.txt .7.txt
+.SUFFIXES:	.1.xhtml .3.xhtml .7.xhtml
+.SUFFIXES:	.1.sgml .3.sgml .7.sgml 
+.SUFFIXES:	.h .h.html 
+.SUFFIXES:	.1.ps .3.ps .7.ps
+.SUFFIXES:	.1.pdf .3.pdf .7.pdf
 
-CFLAGS += -W -Wall -Wno-unused-parameter -g -DDEBUG
+PREFIX		= /usr/local
+BINDIR		= $(PREFIX)/bin
+INCLUDEDIR	= $(PREFIX)/include
+LIBDIR		= $(PREFIX)/lib
+MANDIR		= $(PREFIX)/man
+EXAMPLEDIR	= $(PREFIX)/share/examples/mandoc
+INSTALL		= install
+INSTALL_PROGRAM	= $(INSTALL) -m 0755
+INSTALL_DATA	= $(INSTALL) -m 0444
+INSTALL_LIB	= $(INSTALL) -m 0644
+INSTALL_MAN	= $(INSTALL_DATA)
 
-LINTFLAGS += -c -e -f -u
+VERSION	   = 1.10.9
+VDATE	   = 07 January 2011
 
-LNS	= mdocml.ln html.ln xml.ln libmdocml.ln roff.ln ml.ln mlg.ln compat.ln tokens.ln literals.ln
+VFLAGS	   = -DVERSION="\"$(VERSION)\""
+WFLAGS     = -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings
+CFLAGS    += -g $(WFLAGS) $(VFLAGS) -DHAVE_CONFIG_H
 
-LLNS	= llib-lmdocml.ln
+# Specify this if you want to hard-code the operating system to appear
+# in the lower-left hand corner of -mdoc manuals.
+# CFLAGS += -DOSNAME="\"OpenBSD 4.5\""
 
-LIBS	= libmdocml.a
+LINTFLAGS += $(VFLAGS)
 
-OBJS	= mdocml.o html.o xml.o libmdocml.o roff.o ml.o mlg.o compat.o tokens.o literals.o
+ROFFLNS    = roff.ln tbl.ln tbl_opts.ln tbl_layout.ln tbl_data.ln eqn.ln
 
-SRCS	= mdocml.c html.c xml.c libmdocml.c roff.c ml.c mlg.c compat.c tokens.c literals.c
+ROFFSRCS   = roff.c tbl.c tbl_opts.c tbl_layout.c tbl_data.c eqn.c
 
-HEADS	= libmdocml.h private.h ml.h roff.h
+ROFFOBJS   = roff.o tbl.o tbl_opts.o tbl_layout.o tbl_data.o eqn.o
 
-MANS	= mdocml.1
+MANDOCLNS  = mandoc.ln
 
-HTML	= index.html
+MANDOCSRCS = mandoc.c
 
-CLEAN	= mdocml mdocml.tgz $(LLNS) $(LNS) $(OBJS) $(LIBS) $(HTML)
+MANDOCOBJS = mandoc.o
 
-INSTALL	= Makefile $(HEADS) $(SRCS) $(MANS)
+MDOCLNS	   = mdoc_macro.ln mdoc.ln mdoc_hash.ln mdoc_strings.ln \
+	     mdoc_argv.ln mdoc_validate.ln \
+	     lib.ln att.ln arch.ln vol.ln msec.ln st.ln
 
-FAIL	= test.0 test.1 test.2 test.3 test.4 test.5 test.6 \
-	  test.15 test.20 test.22 test.24 test.26 test.27 test.30 \
-	  test.36 test.37 test.40 test.50
+MDOCOBJS   = mdoc_macro.o mdoc.o mdoc_hash.o mdoc_strings.o \
+	     mdoc_argv.o mdoc_validate.o lib.o att.o \
+	     arch.o vol.o msec.o st.o
 
-SUCCEED	= test.7 test.8 test.9 test.10 test.11 test.12 test.13 \
-	  test.14 test.16 test.17 test.18 test.19 test.21 test.23 \
-	  test.25 test.28 test.29 test.31 test.32 test.33 test.34 \
-	  test.35 test.38 test.39 test.41 test.42 test.43 test.44 \
-	  test.45 test.46 test.47 test.48 test.49 test.51 test.52 \
-	  test.54 test.55 test.56 test.57 test.58 test.59 test.60
+MDOCSRCS   = mdoc_macro.c mdoc.c mdoc_hash.c mdoc_strings.c \
+	     mdoc_argv.c mdoc_validate.c lib.c att.c \
+	     arch.c vol.c msec.c st.c
 
+MANLNS	   = man_macro.ln man.ln man_hash.ln man_validate.ln \
+	     man_argv.ln
 
-all: mdocml
+MANOBJS	   = man_macro.o man.o man_hash.o man_validate.o \
+	     man_argv.o
+MANSRCS	   = man_macro.c man.c man_hash.c man_validate.c \
+	     man_argv.c
 
-lint: llib-lmdocml.ln
+MAINLNS	   = main.ln mdoc_term.ln chars.ln term.ln tree.ln \
+	     compat.ln man_term.ln html.ln mdoc_html.ln \
+	     man_html.ln out.ln term_ps.ln term_ascii.ln \
+	     tbl_term.ln tbl_html.ln
 
-dist: mdocml.tgz
+MAINOBJS   = main.o mdoc_term.o chars.o term.o tree.o compat.o \
+	     man_term.o html.o mdoc_html.o man_html.o out.o \
+	     term_ps.o term_ascii.o tbl_term.o tbl_html.o
 
-www: $(HTML)
+MAINSRCS   = main.c mdoc_term.c chars.c term.c tree.c compat.c \
+	     man_term.c html.c mdoc_html.c man_html.c out.c \
+	     term_ps.c term_ascii.c tbl_term.c tbl_html.c
 
-regress: mdocml
-	@for f in $(FAIL); do \
-		echo "./mdocml $$f" ; \
-		./mdocml $$f 1>/dev/null 2>/dev/null || continue ; \
-	done
-	@for f in $(SUCCEED); do \
-		echo "./mdocml $$f" ; \
-		./mdocml $$f 1>/dev/null || exit 1 ; \
-	done
+LLNS	   = llib-llibmdoc.ln llib-llibman.ln llib-lmandoc.ln \
+	     llib-llibmandoc.ln llib-llibroff.ln
 
-mdocml: mdocml.o libmdocml.a
-	$(CC) $(CFLAGS) -o $@ mdocml.o libmdocml.a
+LNS	   = $(MAINLNS) $(MDOCLNS) $(MANLNS) \
+	     $(MANDOCLNS) $(ROFFLNS)
 
+LIBS	   = libmdoc.a libman.a libmandoc.a libroff.a
+
+OBJS	   = $(MDOCOBJS) $(MAINOBJS) $(MANOBJS) \
+	     $(MANDOCOBJS) $(ROFFOBJS)
+
+SRCS	   = $(MDOCSRCS) $(MAINSRCS) $(MANSRCS) \
+	     $(MANDOCSRCS) $(ROFFSRCS)
+
+DATAS	   = arch.in att.in lib.in msec.in st.in \
+	     vol.in chars.in
+
+HEADS	   = mdoc.h libmdoc.h man.h libman.h term.h \
+	     libmandoc.h html.h chars.h out.h main.h roff.h \
+	     mandoc.h libroff.h
+
+GSGMLS	   = mandoc.1.sgml mdoc.3.sgml mdoc.7.sgml \
+	     mandoc_char.7.sgml man.7.sgml man.3.sgml roff.7.sgml \
+	     roff.3.sgml tbl.7.sgml eqn.7.sgml
+
+SGMLS	   = index.sgml
+
+XHTMLS	   = mandoc.1.xhtml mdoc.3.xhtml \
+	     man.3.xhtml mdoc.7.xhtml man.7.xhtml mandoc_char.7.xhtml \
+	     roff.7.xhtml roff.3.xhtml tbl.7.xhtml eqn.7.xhtml
+
+HTMLS	   = ChangeLog.html index.html man.h.html mdoc.h.html \
+	     mandoc.h.html roff.h.html mandoc.1.html mdoc.3.html \
+	     man.3.html mdoc.7.html man.7.html mandoc_char.7.html \
+	     roff.7.html roff.3.html tbl.7.html eqn.7.html
+
+PSS	   = mandoc.1.ps mdoc.3.ps man.3.ps mdoc.7.ps man.7.ps \
+	     mandoc_char.7.ps roff.7.ps roff.3.ps tbl.7.ps eqn.7.ps
+
+PDFS	   = mandoc.1.pdf mdoc.3.pdf man.3.pdf mdoc.7.pdf man.7.pdf \
+	     mandoc_char.7.pdf roff.7.pdf roff.3.pdf tbl.7.pdf eqn.7.pdf
+
+XSLS	   = ChangeLog.xsl
+
+TEXTS	   = mandoc.1.txt mdoc.3.txt man.3.txt mdoc.7.txt man.7.txt \
+	     mandoc_char.7.txt ChangeLog.txt \
+	     roff.7.txt roff.3.txt tbl.7.txt eqn.7.txt
+
+EXAMPLES   = example.style.css
+
+XMLS	   = ChangeLog.xml
+
+STATICS	   = index.css style.css external.png
+
+MD5S	   = mdocml-$(VERSION).md5 
+
+TARGZS	   = mdocml-$(VERSION).tar.gz
+
+MANS	   = mandoc.1 mdoc.3 mdoc.7 mandoc_char.7 man.7 \
+	     man.3 roff.7 roff.3 tbl.7 eqn.7
+
+BINS	   = mandoc
+
+TESTS	   = test-strlcat.c test-strlcpy.c
+
+CONFIGS	   = config.h.pre config.h.post
+
+DOCLEAN	   = $(BINS) $(LNS) $(LLNS) $(LIBS) $(OBJS) $(HTMLS) \
+	     $(TARGZS) tags $(MD5S) $(XMLS) $(TEXTS) $(GSGMLS) \
+	     config.h config.log $(PSS) $(PDFS) $(XHTMLS)
+
+DOINSTALL  = $(SRCS) $(HEADS) Makefile $(MANS) $(SGMLS) $(STATICS) \
+	     $(DATAS) $(XSLS) $(EXAMPLES) $(TESTS) $(CONFIGS)
+
+all:	$(BINS)
+
+lint:	$(LLNS)
+
 clean:
-	rm -f $(CLEAN)
+	rm -f $(DOCLEAN)
 
-index.html: index.7 mdocml.css
-	./mdocml -W -fhtml -e -o $@ index.7
+dist:	mdocml-$(VERSION).tar.gz
 
-mdocml.tgz: $(INSTALL)
-	mkdir -p .dist/mdocml/
-	install -m 0644 $(INSTALL) .dist/mdocml/
-	( cd .dist/ && tar zcf ../mdocml.tgz mdocml/ )
+www:	all $(GSGMLS) $(HTMLS) $(XHTMLS) $(TEXTS) $(MD5S) $(TARGZS) $(PSS) $(PDFS)
+
+ps:	$(PSS)
+
+pdf:	$(PDFS)
+
+installwww: www
+	$(INSTALL_DATA) $(HTMLS) $(XHTMLS) $(PSS) $(PDFS) $(TEXTS) $(STATICS) $(DESTDIR)$(PREFIX)/
+	$(INSTALL_DATA) mdocml-$(VERSION).tar.gz $(DESTDIR)$(PREFIX)/snapshots/
+	$(INSTALL_DATA) mdocml-$(VERSION).md5 $(DESTDIR)$(PREFIX)/snapshots/
+	$(INSTALL_DATA) mdocml-$(VERSION).tar.gz $(DESTDIR)$(PREFIX)/snapshots/mdocml.tar.gz
+	$(INSTALL_DATA) mdocml-$(VERSION).md5 $(DESTDIR)$(PREFIX)/snapshots/mdocml.md5
+
+install:
+	mkdir -p $(DESTDIR)$(BINDIR)
+	mkdir -p $(DESTDIR)$(EXAMPLEDIR)
+	mkdir -p $(DESTDIR)$(MANDIR)/man1
+	mkdir -p $(DESTDIR)$(MANDIR)/man7
+	$(INSTALL_PROGRAM) mandoc $(DESTDIR)$(BINDIR)
+	$(INSTALL_MAN) mandoc.1 $(DESTDIR)$(MANDIR)/man1
+	$(INSTALL_MAN) man.7 mdoc.7 roff.7 eqn.7 tbl.7 mandoc_char.7 $(DESTDIR)$(MANDIR)/man7
+	$(INSTALL_DATA) example.style.css $(DESTDIR)$(EXAMPLEDIR)
+
+uninstall:
+	rm -f $(DESTDIR)$(BINDIR)/mandoc
+	rm -f $(DESTDIR)$(MANDIR)/man1/mandoc.1
+	rm -f $(DESTDIR)$(MANDIR)/man7/mdoc.7
+	rm -f $(DESTDIR)$(MANDIR)/man7/roff.7
+	rm -f $(DESTDIR)$(MANDIR)/man7/eqn.7
+	rm -f $(DESTDIR)$(MANDIR)/man7/tbl.7
+	rm -f $(DESTDIR)$(MANDIR)/man7/man.7
+	rm -f $(DESTDIR)$(MANDIR)/man7/mandoc_char.7
+	rm -f $(DESTDIR)$(EXAMPLEDIR)/example.style.css
+
+$(OBJS): config.h
+
+$(LNS): config.h
+
+man_macro.ln man_macro.o: man_macro.c libman.h
+
+lib.ln lib.o: lib.c lib.in libmdoc.h
+
+att.ln att.o: att.c att.in libmdoc.h
+
+arch.ln arch.o: arch.c arch.in libmdoc.h
+
+vol.ln vol.o: vol.c vol.in libmdoc.h
+
+chars.ln chars.o: chars.c chars.in chars.h
+
+msec.ln msec.o: msec.c msec.in libmdoc.h
+
+st.ln st.o: st.c st.in libmdoc.h
+
+mdoc_macro.ln mdoc_macro.o: mdoc_macro.c libmdoc.h
+
+mdoc_term.ln mdoc_term.o: mdoc_term.c term.h mdoc.h
+
+mdoc_strings.ln mdoc_strings.o: mdoc_strings.c libmdoc.h
+
+man_hash.ln man_hash.o: man_hash.c libman.h
+
+mdoc_hash.ln mdoc_hash.o: mdoc_hash.c libmdoc.h
+
+mdoc.ln mdoc.o: mdoc.c libmdoc.h
+
+man.ln man.o: man.c libman.h
+
+main.ln main.o: main.c mdoc.h man.h roff.h
+
+compat.ln compat.o: compat.c 
+
+term.ln term.o: term.c term.h man.h mdoc.h chars.h
+
+term_ps.ln term_ps.o: term_ps.c term.h main.h
+
+term_ascii.ln term_ascii.o: term_ascii.c term.h main.h
+
+html.ln html.o: html.c html.h chars.h
+
+mdoc_html.ln mdoc_html.o: mdoc_html.c html.h mdoc.h
+
+man_html.ln man_html.o: man_html.c html.h man.h out.h
+
+out.ln out.o: out.c out.h
+
+mandoc.ln mandoc.o: mandoc.c libmandoc.h
+
+tree.ln tree.o: tree.c man.h mdoc.h
+
+mdoc_argv.ln mdoc_argv.o: mdoc_argv.c libmdoc.h
+
+man_argv.ln man_argv.o: man_argv.c libman.h
+
+man_validate.ln man_validate.o: man_validate.c libman.h
+
+mdoc_validate.ln mdoc_validate.o: mdoc_validate.c libmdoc.h
+
+libmdoc.h: mdoc.h
+
+ChangeLog.xml:
+	cvs2cl --xml --xml-encoding iso-8859-15 -t --noxmlns -f $@
+
+ChangeLog.txt:
+	cvs2cl -t -f $@
+
+ChangeLog.html: ChangeLog.xml ChangeLog.xsl
+	xsltproc -o $@ ChangeLog.xsl ChangeLog.xml
+
+mdocml-$(VERSION).tar.gz: $(DOINSTALL)
+	mkdir -p .dist/mdocml/mdocml-$(VERSION)/
+	cp -f $(DOINSTALL) .dist/mdocml/mdocml-$(VERSION)/
+	( cd .dist/mdocml/ && tar zcf ../../$@ mdocml-$(VERSION)/ )
 	rm -rf .dist/
 
-llib-lmdocml.ln: mdocml.ln libmdocml.ln html.ln xml.ln roff.ln ml.ln mlg.ln compat.ln tokens.ln literals.ln
-	$(LINT) $(LINTFLAGS) -Cmdocml mdocml.ln libmdocml.ln html.ln xml.ln roff.ln ml.ln mlg.ln compat.ln tokens.ln literals.ln
+llib-llibmdoc.ln: $(MDOCLNS)
+	$(LINT) -Clibmdoc $(MDOCLNS)
 
-mdocml.ln: mdocml.c libmdocml.h
+llib-llibman.ln: $(MANLNS)
+	$(LINT) -Clibman $(MANLNS)
 
-mdocml.o: mdocml.c libmdocml.h
+llib-llibmandoc.ln: $(MANDOCLNS)
+	$(LINT) -Clibmandoc $(MANDOCLNS)
 
-libmdocml.a: libmdocml.o html.o xml.o roff.o ml.o mlg.o compat.o tokens.o literals.o
-	$(AR) rs $@ libmdocml.o html.o xml.o roff.o ml.o mlg.o compat.o tokens.o literals.o
+llib-llibroff.ln: $(ROFFLNS)
+	$(LINT) -Clibroff $(ROFFLNS)
 
-xml.ln: xml.c private.h libmdocml.h ml.h
+llib-lmandoc.ln: $(MAINLNS) llib-llibmdoc.ln llib-llibman.ln llib-llibmandoc.ln llib-llibroff.ln
+	$(LINT) -Cmandoc $(MAINLNS) llib-llibmdoc.ln llib-llibman.ln llib-llibmandoc.ln llib-llibroff.ln
 
-xml.o: xml.c private.h libmdocml.h ml.h
+libmdoc.a: $(MDOCOBJS)
+	$(AR) rs $@ $(MDOCOBJS)
 
-html.ln: html.c private.h libmdocml.h
+libman.a: $(MANOBJS)
+	$(AR) rs $@ $(MANOBJS)
 
-html.o: html.c private.h libmdocml.h
+libmandoc.a: $(MANDOCOBJS)
+	$(AR) rs $@ $(MANDOCOBJS)
 
-roff.ln: roff.c private.h roff.h libmdocml.h
+libroff.a: $(ROFFOBJS)
+	$(AR) rs $@ $(ROFFOBJS)
 
-roff.o: roff.c private.h roff.h libmdocml.h
+mandoc: $(MAINOBJS) libroff.a libmdoc.a libman.a libmandoc.a
+	$(CC) $(CFLAGS) -o $@ $(MAINOBJS) libroff.a libmdoc.a libman.a libmandoc.a
 
-libmdocml.ln: libmdocml.c private.h libmdocml.h
+.sgml.html:
+	validate --warn $<
+	sed -e "s!@VERSION@!$(VERSION)!" -e "s!@VDATE@!$(VDATE)!" $< > $@
 
-libmdocml.o: libmdocml.c private.h libmdocml.h
+.1.1.txt .3.3.txt .7.7.txt:
+	./mandoc -Tascii -Wall,stop $< | col -b > $@
 
-ml.ln: ml.c private.h libmdocml.h ml.h
+.1.1.sgml .3.3.sgml .7.7.sgml:
+	./mandoc -Thtml -Wall,stop -Ostyle=style.css,man=%N.%S.html,includes=%I.html $< > $@
 
-ml.o: ml.c private.h libmdocml.h ml.h
+.1.1.ps .3.3.ps .7.7.ps:
+	./mandoc -Tps -Wall,stop $< > $@
 
-mlg.ln: mlg.c private.h libmdocml.h ml.h
+.1.1.xhtml .3.3.xhtml .7.7.xhtml:
+	./mandoc -Txhtml -Wall,stop -Ostyle=style.css,man=%N.%S.xhtml,includes=%I.html $< > $@
 
-mlg.o: mlg.c private.h libmdocml.h ml.h
+.1.1.pdf .3.3.pdf .7.7.pdf:
+	./mandoc -Tpdf -Wall,stop $< > $@
 
-compat.ln: compat.c
+.tar.gz.md5:
+	md5 $< > $@
 
-compat.o: compat.c
+.h.h.html:
+	highlight -I $< >$@
+
+config.h: config.h.pre config.h.post
+	rm -f config.log
+	( cat config.h.pre; \
+	echo; \
+	if $(CC) $(CFLAGS) -Werror -o test-strlcat test-strlcat.c >> config.log 2>&1; then \
+		echo '#define HAVE_STRLCAT'; \
+		rm test-strlcat; \
+	fi; \
+	if $(CC) $(CFLAGS) -Werror -o test-strlcpy test-strlcpy.c >> config.log 2>&1; then \
+		echo '#define HAVE_STRLCPY'; \
+		rm test-strlcpy; \
+	fi; \
+	echo; \
+	cat config.h.post \
+	) > $@