===================================================================
RCS file: /cvs/mandoc/Makefile,v
retrieving revision 1.114
retrieving revision 1.312
diff -u -p -r1.114 -r1.312
--- mandoc/Makefile	2009/03/09 13:35:09	1.114
+++ mandoc/Makefile	2011/02/24 14:30:15	1.312
@@ -1,369 +1,346 @@
-.SUFFIXES:	.html .sgml
+.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
 
-VERSION	= 1.4.6
-VDATE	= 9 March 2009
-
+PREFIX		= /usr/local
 BINDIR		= $(PREFIX)/bin
 INCLUDEDIR	= $(PREFIX)/include
 LIBDIR		= $(PREFIX)/lib
 MANDIR		= $(PREFIX)/man
-
-INSTALL_PROGRAM	= install -m 0755
-INSTALL_DATA	= install -m 0444
-INSTALL_LIB	= install -m 0644
+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)
 
-VFLAGS  = -DVERSION=\"$(VERSION)\"
-CFLAGS += -W -Wall -Wstrict-prototypes -Wno-unused-parameter -g 
+VERSION	   = 1.10.9
+VDATE	   = 07 January 2011
 
+VFLAGS	   = -DVERSION="\"$(VERSION)\""
+WFLAGS     = -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings
+CFLAGS    += -g $(WFLAGS) $(VFLAGS) -DHAVE_CONFIG_H
+
+# 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\""
+
 LINTFLAGS += $(VFLAGS)
-CFLAGS    += $(VFLAGS)
 
-LIBLNS	= macro.ln mdoc.ln hash.ln strings.ln xstd.ln argv.ln \
-	  validate.ln action.ln lib.ln att.ln arch.ln vol.ln \
-	  msec.ln st.ln
+ROFFLNS    = roff.ln tbl.ln tbl_opts.ln tbl_layout.ln tbl_data.ln eqn.ln
 
-TREELNS	= mdoctree.ln mmain.ln 
+ROFFSRCS   = roff.c tbl.c tbl_opts.c tbl_layout.c tbl_data.c eqn.c
 
-TERMLNS	= mdoctree.ln mmain.ln term.ln
+ROFFOBJS   = roff.o tbl.o tbl_opts.o tbl_layout.o tbl_data.o eqn.o
 
-LINTLNS	= mdoclint.ln mmain.ln
+MANDOCLNS  = mandoc.ln
 
-LNS	= $(LIBLNS) $(TREELNS) $(TERMLNS)
+MANDOCSRCS = mandoc.c
 
-LLNS	= llib-llibmdoc.ln llib-lmdoctree.ln llib-lmdocterm.ln
+MANDOCOBJS = mandoc.o
 
-LIBS	= libmdoc.a
+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
 
-LIBOBJS	= macro.o mdoc.o hash.o strings.o xstd.o argv.o \
-	  validate.o action.o lib.o att.o arch.o vol.o msec.o \
-	  st.o
+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
 
-TERMOBJS= mdocterm.o mmain.o term.o
+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
 
-TREEOBJS= mdoctree.o mmain.o
+MANLNS	   = man_macro.ln man.ln man_hash.ln man_validate.ln \
+	     man_argv.ln
 
-LINTOBJS= mdoclint.o mmain.o
+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
 
-OBJS	= $(LIBOBJS) $(TERMOBJS) $(TREEOBJS) $(LINTOBJS)
+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
 
-SRCS	= macro.c mdoc.c hash.c strings.c xstd.c argv.c validate.c \
-	  action.c term.c mdoctree.c mdocterm.c mmain.c mdoclint.c
+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
 
-SCRIPTS = strings.sh
+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
 
-DATAS	= arch.in att.in lib.in msec.in st.in vol.in
+LLNS	   = llib-llibmdoc.ln llib-llibman.ln llib-lmandoc.ln \
+	     llib-llibmandoc.ln llib-llibroff.ln
 
-GEN	= lib.c att.c arch.c vol.c msec.c st.c
+LNS	   = $(MAINLNS) $(MDOCLNS) $(MANLNS) \
+	     $(MANDOCLNS) $(ROFFLNS)
 
-HEADS	= mdoc.h private.h term.h mmain.h
+LIBS	   = libmdoc.a libman.a libmandoc.a libroff.a
 
-SGMLS	= index.sgml
+OBJS	   = $(MDOCOBJS) $(MAINOBJS) $(MANOBJS) \
+	     $(MANDOCOBJS) $(ROFFOBJS)
 
-HTMLS	= index.html
+SRCS	   = $(MDOCSRCS) $(MAINSRCS) $(MANSRCS) \
+	     $(MANDOCSRCS) $(ROFFSRCS)
 
-STATICS	= style.css external.png
+DATAS	   = arch.in att.in lib.in msec.in st.in \
+	     vol.in chars.in
 
-TARGZS	= mdocml-$(VERSION).tar.gz mdocml-oport-$(VERSION).tar.gz \
-	  mdocml-nport-$(VERSION).tar.gz
+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
 
-MANS	= mdoctree.1 mdocterm.1 mdoclint.1 mdoc.3
+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
 
-BINS	= mdocterm mdoctree mdoclint
+SGMLS	   = index.sgml
 
-CLEAN	= $(BINS) $(LNS) $(LLNS) $(LIBS) $(OBJS) $(HTMLS) \
-	  $(TARGZS) $(GEN)
+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
 
-INSTALL	= $(SRCS) $(HEADS) Makefile DESCR $(MANS) $(SGMLS) \
-	  $(STATICS) $(SCRIPTS) Makefile.netbsd Makefile.openbsd \
-	  $(DATAS)
+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
 
-FAIL	= regress/test.empty \
-	  regress/test.prologue.00 \
-	  regress/test.prologue.01 \
-	  regress/test.prologue.02 \
-	  regress/test.prologue.03 \
-	  regress/test.prologue.04 \
-	  regress/test.prologue.06 \
-	  regress/test.prologue.19 \
-	  regress/test.prologue.23 \
-	  regress/test.prologue.24 \
-	  regress/test.prologue.27 \
-	  regress/test.prologue.28 \
-	  regress/test.prologue.30 \
-	  regress/test.prologue.31 \
-	  regress/test.prologue.32 \
-	  regress/test.sh.03 \
-	  regress/test.escape.01 \
-	  regress/test.escape.02 \
-	  regress/test.escape.03 \
-	  regress/test.escape.04 \
-	  regress/test.escape.06 \
-	  regress/test.escape.07 \
-	  regress/test.escape.08 \
-	  regress/test.escape.09 \
-	  regress/test.escape.11 \
-	  regress/test.escape.12 \
-	  regress/test.escape.14 \
-	  regress/test.argv.01 \
-	  regress/test.argv.02
+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
 
-SUCCEED	= regress/test.prologue.05 \
-	  regress/test.prologue.07 \
-	  regress/test.prologue.08 \
-	  regress/test.prologue.09 \
-	  regress/test.prologue.10 \
-	  regress/test.prologue.11 \
-	  regress/test.prologue.12 \
-	  regress/test.prologue.13 \
-	  regress/test.prologue.14 \
-	  regress/test.prologue.15 \
-	  regress/test.prologue.16 \
-	  regress/test.prologue.17 \
-	  regress/test.prologue.18 \
-	  regress/test.prologue.20 \
-	  regress/test.prologue.21 \
-	  regress/test.prologue.22 \
-	  regress/test.prologue.25 \
-	  regress/test.prologue.26 \
-	  regress/test.prologue.29 \
-	  regress/test.prologue.33 \
-	  regress/test.sh.00 \
-	  regress/test.name.00 \
-	  regress/test.name.01 \
-	  regress/test.name.02 \
-	  regress/test.name.03 \
-	  regress/test.list.00 \
-	  regress/test.list.01 \
-	  regress/test.list.02 \
-	  regress/test.list.03 \
-	  regress/test.list.04 \
-	  regress/test.list.05 \
-	  regress/test.list.06 \
-	  regress/test.list.07 \
-	  regress/test.sh.01 \
-	  regress/test.sh.02 \
-	  regress/test.escape.00 \
-	  regress/test.escape.05 \
-	  regress/test.escape.10 \
-	  regress/test.escape.13 \
-	  regress/test.argv.00
+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
 
-REGRESS	= $(FAIL) $(SUCCEED)
+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)
 
-cleanlint:
-	rm -f $(LNS) $(LLNS)
-
 dist:	mdocml-$(VERSION).tar.gz
 
-port:	mdocml-oport-$(VERSION).tar.gz mdocml-nport-$(VERSION).tar.gz
+www:	all $(GSGMLS) $(HTMLS) $(XHTMLS) $(TEXTS) $(MD5S) $(TARGZS) $(PSS) $(PDFS)
 
-www:	$(HTMLS) $(TARGZS)
+ps:	$(PSS)
 
+pdf:	$(PDFS)
+
 installwww: www
-	install -m 0444 $(HTMLS) $(STATICS) $(PREFIX)/
-	install -m 0444 mdocml-$(VERSION).tar.gz $(PREFIX)/snapshots/
-	install -m 0444 mdocml-$(VERSION).tar.gz $(PREFIX)/snapshots/mdocml.tar.gz
-	install -m 0444 mdocml-oport-$(VERSION).tar.gz $(PREFIX)/ports-openbsd/
-	install -m 0444 mdocml-oport-$(VERSION).tar.gz $(PREFIX)/ports-openbsd/mdocml.tar.gz
-	install -m 0444 mdocml-nport-$(VERSION).tar.gz $(PREFIX)/ports-netbsd/
-	install -m 0444 mdocml-nport-$(VERSION).tar.gz $(PREFIX)/ports-netbsd/mdocml.tar.gz
+	$(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
 
-regress: mdoclint $(FAIL) $(SUCCEED)
-	@for f in $(FAIL); do \
-		echo "./mdoclint $$f" ; \
-		./mdoclint $$f 2>/dev/null || continue ; exit 1 ; done
-	@for f in $(SUCCEED); do \
-		echo "./mdoclint $$f" ; \
-		./mdoclint $$f 2>/dev/null || exit 1 ; done
-
 install:
-	mkdir -p $(BINDIR)
-	mkdir -p $(INCLUDEDIR)
-	mkdir -p $(LIBDIR)/lib
-	mkdir -p $(MANDIR)/man1
-	mkdir -p $(MANDIR)/man3
-	$(INSTALL_PROGRAM) mdocterm $(BINDIR)
-	$(INSTALL_PROGRAM) mdoctree $(BINDIR)
-	$(INSTALL_PROGRAM) mdoclint $(BINDIR)
-	$(INSTALL_MAN) mdocterm.1 $(MANDIR)/man1
-	$(INSTALL_MAN) mdoctree.1 $(MANDIR)/man1
-	$(INSTALL_MAN) mdoclint.1 $(MANDIR)/man1
-	$(INSTALL_MAN) mdoc.3 $(MANDIR)/man3
-	$(INSTALL_LIB) libmdoc.a $(LIBDIR)
-	$(INSTALL_DATA) mdoc.h $(INCLUDEDIR)
+	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 $(BINDIR)/mdocterm
-	rm -f $(BINDIR)/mdoctree
-	rm -f $(BINDIR)/mdoclint
-	rm -f $(MANDIR)/man1/mdocterm.1
-	rm -f $(MANDIR)/man1/mdoctree.1
-	rm -f $(MANDIR)/man1/mdoclint.1
-	rm -f $(MANDIR)/man3/mdoc.3
-	rm -f $(LIBDIR)/libmdoc.a
-	rm -f $(INCLUDEDIR)/mdoc.h
+	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
 
-lib.ln: lib.c private.h
-lib.o: lib.c private.h
+$(OBJS): config.h
 
-att.ln: att.c private.h
-att.o: att.c private.h
+$(LNS): config.h
 
-arch.ln: arch.c private.h
-arch.o: arch.c private.h
+man_macro.ln man_macro.o: man_macro.c libman.h
 
-vol.ln: vol.c private.h
-vol.o: vol.c private.h
+lib.ln lib.o: lib.c lib.in libmdoc.h
 
-msec.ln: msec.c private.h
-msec.o: msec.c private.h
+att.ln att.o: att.c att.in libmdoc.h
 
-st.ln: st.c private.h
-st.o: st.c private.h
+arch.ln arch.o: arch.c arch.in libmdoc.h
 
-lib.c: lib.in strings.sh
-	sh strings.sh -o $@ lib lib.in
+vol.ln vol.o: vol.c vol.in libmdoc.h
 
-st.c: st.in strings.sh
-	sh strings.sh -o $@ st st.in
+chars.ln chars.o: chars.c chars.in chars.h
 
-msec.c: msec.in strings.sh
-	sh strings.sh -o $@ msec msec.in
+msec.ln msec.o: msec.c msec.in libmdoc.h
 
-att.c: att.in strings.sh
-	sh strings.sh -o $@ att att.in
+st.ln st.o: st.c st.in libmdoc.h
 
-arch.c: arch.in strings.sh
-	sh strings.sh -o $@ arch arch.in
+mdoc_macro.ln mdoc_macro.o: mdoc_macro.c libmdoc.h
 
-vol.c: vol.in strings.sh
-	sh strings.sh -o $@ vol vol.in
+mdoc_term.ln mdoc_term.o: mdoc_term.c term.h mdoc.h
 
-macro.ln: macro.c private.h
-macro.o: macro.c private.h
+mdoc_strings.ln mdoc_strings.o: mdoc_strings.c libmdoc.h
 
-term.ln: term.c term.h 
-term.o: term.c term.h
+man_hash.ln man_hash.o: man_hash.c libman.h
 
-strings.ln: strings.c private.h
-strings.o: strings.c private.h
+mdoc_hash.ln mdoc_hash.o: mdoc_hash.c libmdoc.h
 
-hash.ln: hash.c private.h
-hash.o: hash.c private.h
+mdoc.ln mdoc.o: mdoc.c libmdoc.h
 
-mdoc.ln: mdoc.c private.h
-mdoc.o: mdoc.c private.h
+man.ln man.o: man.c libman.h
 
-mdocterm.ln: mdocterm.c mmain.h
-mdocterm.o: mdocterm.c mmain.h
+main.ln main.o: main.c mdoc.h man.h roff.h
 
-mdoclint.ln: mdoclint.c mmain.h
-mdoclint.o: mdoclint.c mmain.h
+compat.ln compat.o: compat.c 
 
-mdoctree.ln: mdoctree.c mmain.h
-mdoctree.o: mdoctree.c mmain.h
+term.ln term.o: term.c term.h man.h mdoc.h chars.h
 
-xstd.ln: xstd.c private.h
-xstd.o: xstd.c private.h
+term_ps.ln term_ps.o: term_ps.c term.h main.h
 
-argv.ln: argv.c private.h
-argv.o: argv.c private.h
+term_ascii.ln term_ascii.o: term_ascii.c term.h main.h
 
-validate.ln: validate.c private.h
-validate.o: validate.c private.h
+html.ln html.o: html.c html.h chars.h
 
-action.ln: action.c private.h
-action.o: action.c private.h
+mdoc_html.ln mdoc_html.o: mdoc_html.c html.h mdoc.h
 
-mmain.ln: mmain.c mmain.h
-mmain.o: mmain.c mmain.h
+man_html.ln man_html.o: man_html.c html.h man.h out.h
 
-private.h: mdoc.h
+out.ln out.o: out.c out.h
 
-mmain.h: mdoc.h
+mandoc.ln mandoc.o: mandoc.c libmandoc.h
 
-term.h: mdoc.h
+tree.ln tree.o: tree.c man.h mdoc.h
 
-mdocml-nport-$(VERSION).tar.gz: mdocml-$(VERSION).tar.gz Makefile.netbsd DESCR
-	mkdir -p .dist/mdocml/
-	sed -e "s!@VERSION@!$(VERSION)!" Makefile.netbsd > \
-		.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/
-	echo @comment $$NetBSD$$ > .dist/mdocml/PLIST
-	echo bin/mdocterm >> .dist/mdocml/PLIST
-	echo bin/mdoctree >> .dist/mdocml/PLIST
-	echo bin/mdoclint >> .dist/mdocml/PLIST
-	echo lib/libmdoc.a >> .dist/mdocml/PLIST
-	echo include/mdoc.h >> .dist/mdocml/PLIST
-	echo man/man1/mdoctree.1 >> .dist/mdocml/PLIST
-	echo man/man1/mdocterm.1 >> .dist/mdocml/PLIST
-	echo man/man1/mdoclint.1 >> .dist/mdocml/PLIST
-	echo man/man3/mdoc.3 >> .dist/mdocml/PLIST
-	( cd .dist/ && tar zcf ../$@ mdocml/ )
-	rm -rf .dist/
+mdoc_argv.ln mdoc_argv.o: mdoc_argv.c libmdoc.h
 
-mdocml-oport-$(VERSION).tar.gz: mdocml-$(VERSION).tar.gz Makefile.openbsd DESCR
-	mkdir -p .dist/mdocml/pkg
-	sed -e "s!@VERSION@!$(VERSION)!" Makefile.openbsd > \
-		.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.114 2009/03/09 13:35:09 kristaps Exp $$ > .dist/mdocml/pkg/PLIST
-	echo bin/mdocterm >> .dist/mdocml/pkg/PLIST
-	echo bin/mdoctree >> .dist/mdocml/pkg/PLIST
-	echo bin/mdoclint >> .dist/mdocml/pkg/PLIST
-	echo lib/libmdoc.a >> .dist/mdocml/pkg/PLIST
-	echo include/mdoc.h >> .dist/mdocml/pkg/PLIST
-	echo @man man/man1/mdoctree.1 >> .dist/mdocml/pkg/PLIST
-	echo @man man/man1/mdocterm.1 >> .dist/mdocml/pkg/PLIST
-	echo @man man/man1/mdoclint.1 >> .dist/mdocml/pkg/PLIST
-	echo @man man/man3/mdoc.3 >> .dist/mdocml/pkg/PLIST
-	( cd .dist/ && tar zcf ../$@ mdocml/ )
-	rm -rf .dist/
+man_argv.ln man_argv.o: man_argv.c libman.h
 
-mdocml-$(VERSION).tar.gz: $(INSTALL)
+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)/
-	mkdir -p .dist/mdocml/mdocml-$(VERSION)/regress/
-	install -m 0644 $(INSTALL) .dist/mdocml/mdocml-$(VERSION)/
-	install -m 0644 $(REGRESS) .dist/mdocml/mdocml-$(VERSION)/regress/
+	cp -f $(DOINSTALL) .dist/mdocml/mdocml-$(VERSION)/
 	( cd .dist/mdocml/ && tar zcf ../../$@ mdocml-$(VERSION)/ )
 	rm -rf .dist/
 
-llib-llibmdoc.ln: $(LIBLNS)
-	$(LINT) $(LINTFLAGS) -Clibmdoc $(LIBLNS)
+llib-llibmdoc.ln: $(MDOCLNS)
+	$(LINT) -Clibmdoc $(MDOCLNS)
 
-llib-lmdoctree.ln: $(TREELNS) llib-llibmdoc.ln
-	$(LINT) $(LINTFLAGS) -Cmdoctree $(TREELNS) llib-llibmdoc.ln
+llib-llibman.ln: $(MANLNS)
+	$(LINT) -Clibman $(MANLNS)
 
-llib-lmdocterm.ln: $(TERMLNS) llib-llibmdoc.ln
-	$(LINT) $(LINTFLAGS) -Cmdocterm $(TERMLNS) llib-llibmdoc.ln
+llib-llibmandoc.ln: $(MANDOCLNS)
+	$(LINT) -Clibmandoc $(MANDOCLNS)
 
-libmdoc.a: $(LIBOBJS)
-	$(AR) rs $@ $(LIBOBJS)
+llib-llibroff.ln: $(ROFFLNS)
+	$(LINT) -Clibroff $(ROFFLNS)
 
-mdocterm: $(TERMOBJS) libmdoc.a
-	$(CC) $(CFLAGS) -o $@ $(TERMOBJS) libmdoc.a 
+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
 
-mdoctree: $(TREEOBJS) libmdoc.a
-	$(CC) $(CFLAGS) -o $@ $(TREEOBJS) libmdoc.a 
+libmdoc.a: $(MDOCOBJS)
+	$(AR) rs $@ $(MDOCOBJS)
 
-mdoclint: $(LINTOBJS) libmdoc.a
-	$(CC) $(CFLAGS) -o $@ $(LINTOBJS) libmdoc.a 
+libman.a: $(MANOBJS)
+	$(AR) rs $@ $(MANOBJS)
 
+libmandoc.a: $(MANDOCOBJS)
+	$(AR) rs $@ $(MANDOCOBJS)
+
+libroff.a: $(ROFFOBJS)
+	$(AR) rs $@ $(ROFFOBJS)
+
+mandoc: $(MAINOBJS) libroff.a libmdoc.a libman.a libmandoc.a
+	$(CC) $(CFLAGS) -o $@ $(MAINOBJS) libroff.a libmdoc.a libman.a libmandoc.a
+
 .sgml.html:
-	validate $<
+	validate --warn $<
 	sed -e "s!@VERSION@!$(VERSION)!" -e "s!@VDATE@!$(VDATE)!" $< > $@
 
+.1.1.txt .3.3.txt .7.7.txt:
+	./mandoc -Tascii -Wall,stop $< | col -b > $@
+
+.1.1.sgml .3.3.sgml .7.7.sgml:
+	./mandoc -Thtml -Wall,stop -Ostyle=style.css,man=%N.%S.html,includes=%I.html $< > $@
+
+.1.1.ps .3.3.ps .7.7.ps:
+	./mandoc -Tps -Wall,stop $< > $@
+
+.1.1.xhtml .3.3.xhtml .7.7.xhtml:
+	./mandoc -Txhtml -Wall,stop -Ostyle=style.css,man=%N.%S.xhtml,includes=%I.html $< > $@
+
+.1.1.pdf .3.3.pdf .7.7.pdf:
+	./mandoc -Tpdf -Wall,stop $< > $@
+
+.tar.gz.md5:
+	md5 $< > $@
+
+.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 \
+	) > $@