===================================================================
RCS file: /cvs/mandoc/Makefile,v
retrieving revision 1.49
retrieving revision 1.251
diff -u -p -r1.49 -r1.251
--- mandoc/Makefile	2008/12/10 17:40:56	1.49
+++ mandoc/Makefile	2010/03/22 18:30:23	1.251
@@ -1,174 +1,250 @@
-VERSION	= 1.0.3
+.SUFFIXES:	.html .xml .sgml .1 .3 .7 .md5 .tar.gz .1.txt .3.txt .7.txt .1.sgml .3.sgml .7.sgml
 
-# FIXME
-CFLAGS += -W -Wall -Wno-unused-parameter -g -DDEBUG
+BINDIR		= $(PREFIX)/bin
+INCLUDEDIR	= $(PREFIX)/include
+LIBDIR		= $(PREFIX)/lib
+MANDIR		= $(PREFIX)/man
+EXAMPLEDIR	= $(PREFIX)/share/examples/mandoc
+INSTALL_PROGRAM	= install -m 0755
+INSTALL_DATA	= install -m 0444
+INSTALL_LIB	= install -m 0644
+INSTALL_MAN	= $(INSTALL_DATA)
 
-LNS	= mdocml.ln html.ln xml.ln libmdocml.ln roff.ln ml.ln mlg.ln \
-	  compat.ln tokens.ln literals.ln tags.ln noop.ln
+VERSION	   = 1.9.16
+VDATE	   = 22 March 2010
 
-LLNS	= llib-lmdocml.ln
+VFLAGS     = -DVERSION="\"$(VERSION)\"" -DHAVE_CONFIG_H
+WFLAGS     = -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings
+CFLAGS    += -g $(VFLAGS) $(WFLAGS)
+#CFLAGS	  += -DOSNAME="\"OpenBSD 4.5\""
+LINTFLAGS += $(VFLAGS)
 
-LIBS	= libmdocml.a
+MANDOCFLAGS = -Wall -fstrict
+MANDOCHTML = -Thtml -Ostyle=style.css,man=%N.%S.html,includes=%I.html
 
-OBJS	= mdocml.o html.o xml.o libmdocml.o roff.o ml.o mlg.o \
-	  compat.o tokens.o literals.o tags.o noop.o
+MDOCLNS	   = mdoc_macro.ln mdoc.ln mdoc_hash.ln mdoc_strings.ln \
+	     mdoc_argv.ln mdoc_validate.ln mdoc_action.ln \
+	     lib.ln att.ln arch.ln vol.ln msec.ln st.ln \
+	     mandoc.ln
+MDOCOBJS   = mdoc_macro.o mdoc.o mdoc_hash.o mdoc_strings.o \
+	     mdoc_argv.o mdoc_validate.o mdoc_action.o lib.o att.o \
+	     arch.o vol.o msec.o st.o mandoc.o
+MDOCSRCS   = mdoc_macro.c mdoc.c mdoc_hash.c mdoc_strings.c \
+	     mdoc_argv.c mdoc_validate.c mdoc_action.c lib.c att.c \
+	     arch.c vol.c msec.c st.c mandoc.c
 
-SRCS	= mdocml.c html.c xml.c libmdocml.c roff.c ml.c mlg.c \
-	  compat.c tokens.c literals.c tags.c noop.c
+MANLNS	   = man_macro.ln man.ln man_hash.ln man_validate.ln \
+	     man_action.ln mandoc.ln man_argv.ln
+MANOBJS	   = man_macro.o man.o man_hash.o man_validate.o \
+	     man_action.o mandoc.o man_argv.o
+MANSRCS	   = man_macro.c man.c man_hash.c man_validate.c \
+	     man_action.c mandoc.c man_argv.c
 
-HEADS	= libmdocml.h private.h ml.h roff.h html.h
+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
+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
+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
 
-MANS	= mdocml.1 index.7
+LLNS	   = llib-llibmdoc.ln llib-llibman.ln llib-lmandoc.ln
+LNS	   = $(MAINLNS) $(MDOCLNS) $(MANLNS)
+LIBS	   = libmdoc.a libman.a
+OBJS	   = $(MDOCOBJS) $(MAINOBJS) $(MANOBJS)
+SRCS	   = $(MDOCSRCS) $(MAINSRCS) $(MANSRCS)
+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
+GSGMLS	   = mandoc.1.sgml mdoc.3.sgml mdoc.7.sgml manuals.7.sgml \
+	     mandoc_char.7.sgml man.7.sgml man.3.sgml
+SGMLS	   = index.sgml
+HTMLS	   = ChangeLog.html index.html
+XSLS	   = ChangeLog.xsl
+GHTMLS	   = mandoc.1.html mdoc.3.html man.3.html mdoc.7.html \
+	     man.7.html mandoc_char.7.html manuals.7.html
+TEXTS	   = mandoc.1.txt mdoc.3.txt man.3.txt mdoc.7.txt man.7.txt \
+	     mandoc_char.7.txt manuals.7.txt ChangeLog.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 manuals.7 mandoc_char.7 \
+	     man.7 man.3
+BINS	   = mandoc
+TESTS	   = test-strlcat.c test-strlcpy.c
+CONFIGS	   = config.h.pre config.h.post
+CLEAN	   = $(BINS) $(LNS) $(LLNS) $(LIBS) $(OBJS) $(HTMLS) \
+	     $(TARGZS) tags $(MD5S) $(XMLS) $(TEXTS) $(GSGMLS) \
+	     $(GHTMLS) config.h config.log
+INSTALL	   = $(SRCS) $(HEADS) Makefile $(MANS) $(SGMLS) $(STATICS) \
+	     $(DATAS) $(XSLS) $(EXAMPLES) $(TESTS) $(CONFIGS)
 
-HTML	= index.html mdocml.html 
+all:	$(BINS)
 
-XML	= index.xml
+lint:	$(LLNS)
 
-TEXT	= index.txt
+clean:
+	rm -f $(CLEAN)
 
-CLEAN	= mdocml $(LLNS) $(LNS) $(OBJS) $(LIBS) $(HTML) $(XML) $(TEXT) \
-	  mdocml-$(VERSION).tar.gz mdocml-port-$(VERSION).tar.gz
+cleanlint:
+	rm -f $(LNS) $(LLNS)
 
-INSTALL	= Makefile $(HEADS) $(SRCS) $(MANS) mdocml.css
+cleanhtml:
+	rm -f $(HTMLS) $(GSGMLS) $(GHTMLS)
 
-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 test.61 test.64 test.65 \
-	  test.66 test.69 test.70
+dist:	mdocml-$(VERSION).tar.gz
 
-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 \
-	  test.62 test.63 test.67 test.68 test.71 test.72 test.73
+www:	all $(GSGMLS) $(GHTMLS) $(HTMLS) $(TEXTS) $(MD5S) $(TARGZS)
 
-all: mdocml
+htmls:	all $(GSGMLS) $(GHTMLS)
 
-lint: llib-lmdocml.ln
+installwww: www
+	install -m 0444 $(GHTMLS) $(HTMLS) $(TEXTS) $(STATICS) $(PREFIX)/
+	install -m 0444 mdocml-$(VERSION).tar.gz $(PREFIX)/snapshots/
+	install -m 0444 mdocml-$(VERSION).md5 $(PREFIX)/snapshots/
+	install -m 0444 mdocml-$(VERSION).tar.gz $(PREFIX)/snapshots/mdocml.tar.gz
+	install -m 0444 mdocml-$(VERSION).md5 $(PREFIX)/snapshots/mdocml.md5
 
-dist: mdocml-$(VERSION).tar.gz mdocml-port-$(VERSION).tar.gz
+install:
+	mkdir -p $(BINDIR)
+	mkdir -p $(EXAMPLEDIR)
+	mkdir -p $(MANDIR)/man1
+	mkdir -p $(MANDIR)/man7
+	$(INSTALL_PROGRAM) mandoc $(BINDIR)
+	$(INSTALL_MAN) mandoc.1 $(MANDIR)/man1
+	$(INSTALL_MAN) man.7 mdoc.7 $(MANDIR)/man7
+	$(INSTALL_DATA) example.style.css $(EXAMPLEDIR)
 
-www: all $(HTML) $(XML) $(TEXT)
+uninstall:
+	rm -f $(BINDIR)/mandoc
+	rm -f $(MANDIR)/man1/mandoc.1
+	rm -f $(MANDIR)/man7/mdoc.7
+	rm -f $(MANDIR)/man7/man.7
+	rm -f $(EXAMPLEDIR)/example.style.css
 
-regress: mdocml
-	@for f in $(FAIL); do \
-		echo "./mdocml $$f" ; \
-		./mdocml -v $$f 1>/dev/null 2>/dev/null || continue ; \
-	done
-	@for f in $(SUCCEED); do \
-		echo "./mdocml $$f" ; \
-		./mdocml -v $$f 1>/dev/null || exit 1 ; \
-	done
+$(OBJS): config.h
 
-mdocml: mdocml.o libmdocml.a
-	$(CC) $(CFLAGS) -o $@ mdocml.o libmdocml.a
+$(LNS): config.h
 
-clean:
-	rm -f $(CLEAN)
+man_macro.ln man_macro.o: man_macro.c libman.h
 
-index.html: index.7 mdocml.css
-	./mdocml -fhtml -Wall -e -o $@ index.7
+lib.ln lib.o: lib.c lib.in libmdoc.h
 
-index.xml: index.7 mdocml.css
-	./mdocml -fxml -Wall -o $@ index.7
+att.ln att.o: att.c att.in libmdoc.h
 
-index.txt: index.7
-	cp -f index.7 index.txt
+arch.ln arch.o: arch.c arch.in libmdoc.h
 
-mdocml.html: mdocml.1 mdocml.css
-	./mdocml -Wall -fhtml -e -o $@ mdocml.1
+vol.ln vol.o: vol.c vol.in libmdoc.h
 
-install:
-	mkdir -p $(PREFIX)/bin/
-	install -m 0755 mdocml $(PREFIX)/bin/
-	mkdir -p $(PREFIX)/man/man1/
-	install -m 0444 mdocml.1 $(PREFIX)/man/man1/
-	mkdir -p $(PREFIX)/share/mdocml/
-	install -m 0444 mdocml.css $(PREFIX)/share/mdocml/
+chars.ln chars.o: chars.c chars.in chars.h
 
-uninstall:
-	rm -f $(PREFIX)/bin/mdocml
-	rm -f $(PREFIX)/man/man1/mdocml.1
-	rm -f $(PREFIX)/share/mdocml/mdocml.css
+msec.ln msec.o: msec.c msec.in libmdoc.h
 
-install-www: www dist
-	install -m 0644 mdocml-$(VERSION).tar.gz $(PREFIX)/
-	install -m 0644 mdocml-$(VERSION).tar.gz $(PREFIX)/mdocml.tar.gz
-	install -m 0644 mdocml-port-$(VERSION).tar.gz $(PREFIX)/
-	install -m 0644 mdocml-port-$(VERSION).tar.gz $(PREFIX)/mdocml-port.tar.gz
-	install -m 0644 $(HTML) $(XML) $(TEXT) $(PREFIX)/
+st.ln st.o: st.c st.in libmdoc.h
 
-mdocml-$(VERSION).tar.gz: $(INSTALL)
-	mkdir -p .dist/mdocml/mdocml-$(VERSION)/
-	install -m 0644 $(INSTALL) .dist/mdocml/mdocml-$(VERSION)/
-	( cd .dist/mdocml/ && tar zcf ../../$@ mdocml-$(VERSION)/ )
-	rm -rf .dist/
+mdoc_macro.ln mdoc_macro.o: mdoc_macro.c libmdoc.h
 
-mdocml-port-$(VERSION).tar.gz: $(INSTALL)
-	mkdir -p .dist/mdocml/pkg
-	sed -e "s!@VERSION@!$(VERSION)!" Makefile.port > .dist/mdocml/Makefile
-	md5 mdocml-$(VERSION).tar.gz > .dist/mdocml/distinfo
-	rmd160 mdocml-$(VERSION).tar.gz >> .dist/mdocml/distinfo
-	sha1 mdocml-$(VERSION).tar.gz >> .dist/mdocml/distinfo
-	install -m 0644 DESCR .dist/mdocml/pkg/DESCR
-	echo @comment $$OpenBSD: Makefile,v 1.49 2008/12/10 17:40:56 kristaps Exp $$ > .dist/mdocml/pkg/PLIST
-	echo bin/mdocml >> .dist/mdocml/pkg/PLIST
-	echo share/mdocml/mdocml.css >> .dist/mdocml/pkg/PLIST
-	echo @man man/man1/mdocml.1 >> .dist/mdocml/pkg/PLIST
-	( cd .dist/ && tar zcf ../$@ mdocml/ )
-	rm -rf .dist/
+mdoc_term.ln mdoc_term.o: mdoc_term.c term.h mdoc.h
 
-llib-lmdocml.ln: mdocml.ln libmdocml.ln html.ln xml.ln roff.ln ml.ln mlg.ln compat.ln tokens.ln literals.ln tags.ln noop.ln
-	$(LINT) $(LINTFLAGS) -Cmdocml mdocml.ln libmdocml.ln html.ln xml.ln roff.ln ml.ln mlg.ln compat.ln tokens.ln literals.ln tags.ln noop.ln
+mdoc_strings.ln mdoc_strings.o: mdoc_strings.c libmdoc.h
 
-mdocml.ln: mdocml.c libmdocml.h
+man_hash.ln man_hash.o: man_hash.c libman.h
 
-mdocml.o: mdocml.c libmdocml.h
+mdoc_hash.ln mdoc_hash.o: mdoc_hash.c libmdoc.h
 
-libmdocml.a: libmdocml.o html.o xml.o roff.o ml.o mlg.o compat.o tokens.o literals.o tags.o noop.o
-	$(AR) rs $@ libmdocml.o html.o xml.o roff.o ml.o mlg.o compat.o tokens.o literals.o tags.o noop.o
+mdoc.ln mdoc.o: mdoc.c libmdoc.h
 
-xml.ln: xml.c ml.h
+man.ln man.o: man.c libman.h
 
-xml.o: xml.c ml.h
+main.ln main.o: main.c mdoc.h
 
-html.ln: html.c private.h
+compat.ln compat.o: compat.c 
 
-html.o: html.c private.h 
+term.ln term.o: term.c term.h man.h mdoc.h chars.h
 
-tags.ln: tags.c html.h 
+html.ln html.o: html.c html.h chars.h
 
-tags.o: tags.c html.h
+mdoc_html.ln mdoc_html.o: mdoc_html.c html.h mdoc.h
 
-roff.ln: roff.c private.h
+man_html.ln man_html.o: man_html.c html.h man.h out.h
 
-roff.o: roff.c private.h 
+out.ln out.o: out.c out.h
 
-libmdocml.ln: libmdocml.c private.h
+tree.ln tree.o: tree.c man.h mdoc.h
 
-libmdocml.o: libmdocml.c private.h
+mdoc_argv.ln mdoc_argv.o: mdoc_argv.c libmdoc.h
 
-ml.ln: ml.c ml.h
+man_argv.ln man_argv.o: man_argv.c libman.h
 
-ml.o: ml.c ml.h
+man_validate.ln man_validate.o: man_validate.c libman.h
 
-mlg.ln: mlg.c ml.h
+mdoc_validate.ln mdoc_validate.o: mdoc_validate.c libmdoc.h
 
-mlg.o: mlg.c ml.h
+mdoc_action.ln mdoc_action.o: mdoc_action.c libmdoc.h
 
-compat.ln: compat.c
+libmdoc.h: mdoc.h
 
-compat.o: compat.c
+ChangeLog.xml:
+	cvs2cl --xml --xml-encoding iso-8859-15 -t --noxmlns -f $@
 
-noop.ln: noop.c private.h
+ChangeLog.txt:
+	cvs2cl -t -f $@
 
-noop.o: noop.c private.h
+ChangeLog.html: ChangeLog.xml ChangeLog.xsl
+	xsltproc -o $@ ChangeLog.xsl ChangeLog.xml
 
-html.h: ml.h
+mdocml-$(VERSION).tar.gz: $(INSTALL)
+	mkdir -p .dist/mdocml/mdocml-$(VERSION)/
+	cp -f $(INSTALL) .dist/mdocml/mdocml-$(VERSION)/
+	( cd .dist/mdocml/ && tar zcf ../../$@ mdocml-$(VERSION)/ )
+	rm -rf .dist/
 
-ml.h: private.h
+llib-llibmdoc.ln: $(MDOCLNS)
+	$(LINT) -Clibmdoc $(MDOCLNS)
 
-private.h: libmdocml.h
+llib-llibman.ln: $(MANLNS)
+	$(LINT) -Clibman $(MANLNS)
 
+llib-lmandoc.ln: $(MAINLNS) llib-llibmdoc.ln
+	$(LINT) -Cmandoc $(MAINLNS) llib-llibmdoc.ln
+
+libmdoc.a: $(MDOCOBJS)
+	$(AR) rs $@ $(MDOCOBJS)
+
+libman.a: $(MANOBJS)
+	$(AR) rs $@ $(MANOBJS)
+
+mandoc: $(MAINOBJS) libmdoc.a libman.a
+	$(CC) $(CFLAGS) -o $@ $(MAINOBJS) libmdoc.a libman.a
+
+.sgml.html:
+	validate --warn $<
+	sed -e "s!@VERSION@!$(VERSION)!" -e "s!@VDATE@!$(VDATE)!" $< > $@
+
+.1.1.txt .3.3.txt .7.7.txt:
+	./mandoc $(MANDOCFLAGS) $< | col -b > $@
+
+.1.1.sgml .3.3.sgml .7.7.sgml:
+	./mandoc $(MANDOCFLAGS) $(MANDOCHTML) $< > $@
+
+.tar.gz.md5:
+	md5 $< > $@
+
+config.h: config.h.pre config.h.post
+	rm -f config.log
+	( cat config.h.pre; \
+	echo; \
+	if $(CC) $(CFLAGS) -Werror -c test-strlcat.c >> config.log 2>&1; then \
+		echo '#define HAVE_STRLCAT'; \
+		rm test-strlcat.o; \
+	fi; \
+	if $(CC) $(CFLAGS) -Werror -c test-strlcpy.c >> config.log 2>&1; then \
+		echo '#define HAVE_STRLCPY'; \
+		rm test-strlcpy.o; \
+	fi; \
+	echo; \
+	cat config.h.post \
+	) > $@