===================================================================
RCS file: /cvs/mandoc/Makefile,v
retrieving revision 1.82
retrieving revision 1.359
diff -u -p -r1.82 -r1.359
--- mandoc/Makefile	2009/02/23 22:51:10	1.82
+++ mandoc/Makefile	2011/07/22 10:50:46	1.359
@@ -1,261 +1,425 @@
-.SUFFIXES:	.html .sgml
+.PHONY: 	 clean install installwww
+.SUFFIXES:	 .sgml .html .md5 .h .h.html
+.SUFFIXES:	 .1       .3       .7       .8
+.SUFFIXES:	 .1.txt   .3.txt   .7.txt   .8.txt
+.SUFFIXES:	 .1.pdf   .3.pdf   .7.pdf   .8.pdf
+.SUFFIXES:	 .1.ps    .3.ps    .7.ps    .8.ps
+.SUFFIXES:	 .1.html  .3.html  .7.html  .8.html
+.SUFFIXES:	 .1.xhtml .3.xhtml .7.xhtml .8.xhtml
 
-VERSION	= 1.3.3
+# 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\""
 
-CFLAGS += -W -Wall -Wstrict-prototypes -Wno-unused-parameter -g 
+VERSION		 = 1.11.4
+VDATE		 = 12 July 2011
+# IFF your system supports multi-byte functions (setlocale(), wcwidth(),
+# putwchar()) AND has __STDC_ISO_10646__ (that is, wchar_t is simply a
+# UCS-4 value) should you define USE_WCHAR.  If you define it and your
+# system DOESN'T support this, -Tlocale will produce garbage.
+# If you don't define it, -Tlocale is a synonym for -Tacsii.
+CFLAGS		+= -g -DUSE_WCHAR -DHAVE_CONFIG_H -DVERSION="\"$(VERSION)\""
+CFLAGS     	+= -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings
+PREFIX		 = /usr/local
+BINDIR		 = $(PREFIX)/bin
+INCLUDEDIR	 = $(PREFIX)/include/mandoc
+LIBDIR		 = $(PREFIX)/lib/mandoc
+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_SOURCE	 = $(INSTALL) -m 0644
+INSTALL_MAN	 = $(INSTALL_DATA)
 
-LIBLNS	= macro.ln mdoc.ln hash.ln strings.ln xstd.ln argv.ln \
-	  validate.ln action.ln 
+# Linux needs -ldb to compile mandocdb.
+#DBLIB		 = -ldb
 
-TREELNS	= mdoctree.ln mmain.ln 
+all: mandoc preconv
 
-TERMLNS	= mdoctree.ln mmain.ln term.ln
+SRCS		 = Makefile \
+		   arch.c \
+		   arch.in \
+		   att.c \
+		   att.in \
+		   chars.c \
+		   chars.in \
+		   compat.c \
+		   config.h.post \
+		   config.h.pre \
+		   eqn.7 \
+		   eqn.c \
+		   eqn_term.c \
+		   example.style.css \
+		   external.png \
+		   html.c \
+		   html.h \
+		   index.css \
+		   index.sgml \
+		   lib.c \
+		   lib.in \
+		   libman.h \
+		   libmandoc.h \
+		   libmdoc.h \
+		   libroff.h \
+		   main.c \
+		   main.h \
+		   man.h \
+		   man.7 \
+		   man.c \
+		   man_hash.c \
+		   man_html.c \
+		   man_macro.c \
+		   man_term.c \
+		   man_validate.c \
+		   mandoc.1 \
+		   mandoc.3 \
+		   mandoc.c \
+		   mandoc.h \
+		   mandocdb.8 \
+		   mandocdb.c \
+		   mandoc_char.7 \
+		   mdoc.h \
+		   mdoc.7 \
+		   mdoc.c \
+		   mdoc_argv.c \
+		   mdoc_hash.c \
+		   mdoc_html.c \
+		   mdoc_macro.c \
+		   mdoc_term.c \
+		   mdoc_validate.c \
+		   msec.c \
+		   msec.in \
+		   out.c \
+		   out.h \
+		   preconv.1 \
+		   preconv.c \
+		   predefs.in \
+		   read.c \
+		   roff.7 \
+		   roff.c \
+		   st.c \
+		   st.in \
+		   style.css \
+		   tbl.7 \
+		   tbl.c \
+		   tbl_data.c \
+		   tbl_html.c \
+		   tbl_layout.c \
+		   tbl_opts.c \
+		   tbl_term.c \
+		   term.c \
+		   term.h \
+		   term_ascii.c \
+		   term_ps.c \
+		   test-mmap.c \
+		   test-strlcat.c \
+		   test-strlcpy.c \
+		   tree.c \
+		   vol.c \
+		   vol.in
 
-LINTLNS	= mdoclint.ln mmain.ln
+LIBMAN_OBJS	 = man.o \
+		   man_hash.o \
+		   man_macro.o \
+		   man_validate.o
+LIBMAN_LNS	 = man.ln \
+		   man_hash.ln \
+		   man_macro.ln \
+		   man_validate.ln
 
-LNS	= $(LIBLNS) $(TREELNS) $(TERMLNS)
+LIBMDOC_OBJS	 = arch.o \
+		   att.o \
+		   lib.o \
+		   mdoc.o \
+		   mdoc_argv.o \
+		   mdoc_hash.o \
+		   mdoc_macro.o \
+		   mdoc_validate.o \
+		   msec.o \
+		   st.o \
+		   vol.o
+LIBMDOC_LNS	 = arch.ln \
+		   att.ln \
+		   lib.ln \
+		   mdoc.ln \
+		   mdoc_argv.ln \
+		   mdoc_hash.ln \
+		   mdoc_macro.ln \
+		   mdoc_validate.ln \
+		   msec.ln \
+		   st.ln \
+		   vol.ln
 
-LLNS	= llib-llibmdoc.ln llib-lmdoctree.ln llib-lmdocterm.ln
+LIBROFF_OBJS	 = eqn.o \
+		   roff.o \
+		   tbl.o \
+		   tbl_data.o \
+		   tbl_layout.o \
+		   tbl_opts.o
+LIBROFF_LNS	 = eqn.ln \
+		   roff.ln \
+		   tbl.ln \
+		   tbl_data.ln \
+		   tbl_layout.ln \
+		   tbl_opts.ln
 
-LIBS	= libmdoc.a
+LIBMANDOC_OBJS	 = $(LIBMAN_OBJS) \
+		   $(LIBMDOC_OBJS) \
+		   $(LIBROFF_OBJS) \
+		   chars.o \
+		   mandoc.o \
+		   read.o
+LIBMANDOC_LNS	 = $(LIBMAN_LNS) \
+		   $(LIBMDOC_LNS) \
+		   $(LIBROFF_LNS) \
+		   chars.ln \
+		   mandoc.ln \
+		   read.ln
 
-LIBOBJS	= macro.o mdoc.o hash.o strings.o xstd.o argv.o \
-	  validate.o action.o
+arch.o arch.ln: arch.in
+att.o att.ln: att.in
+chars.o chars.ln: chars.in
+lib.o lib.ln: lib.in
+msec.o msec.ln: msec.in
+roff.o roff.ln: predefs.in
+st.o st.ln: st.in
+vol.o vol.ln: vol.in
 
-TERMOBJS= mdocterm.o mmain.o term.o
+$(LIBMAN_OBJS) $(LIBMAN_LNS): libman.h
+$(LIBMDOC_OBJS) $(LIBMDOC_LNS): libmdoc.h
+$(LIBROFF_OBJS) $(LIBROFF_LNS): libroff.h
+$(LIBMANDOC_OBJS) $(LIBMANDOC_LNS): mandoc.h mdoc.h man.h libmandoc.h config.h
 
-TREEOBJS= mdoctree.o mmain.o
+MANDOC_HTML_OBJS = html.o \
+		   man_html.o \
+		   mdoc_html.o \
+		   tbl_html.o
+MANDOC_HTML_LNS	 = html.ln \
+		   man_html.ln \
+		   mdoc_html.ln \
+		   tbl_html.ln
 
-LINTOBJS= mdoclint.o mmain.o
+MANDOC_TERM_OBJS = eqn_term.o \
+		   man_term.o \
+		   mdoc_term.o \
+		   term.o \
+		   term_ascii.o \
+		   term_ps.o \
+		   tbl_term.o
+MANDOC_TERM_LNS	 = eqn_term.ln \
+		   man_term.ln \
+		   mdoc_term.ln \
+		   term.ln \
+		   term_ascii.ln \
+		   term_ps.ln \
+		   tbl_term.ln
 
-OBJS	= $(LIBOBJS) $(TERMOBJS) $(TREEOBJS)
+MANDOC_OBJS	 = $(MANDOC_HTML_OBJS) \
+		   $(MANDOC_TERM_OBJS) \
+		   main.o \
+		   out.o \
+		   tree.o
+MANDOC_LNS	 = $(MANDOC_HTML_LNS) \
+		   $(MANDOC_TERM_LNS) \
+		   main.ln \
+		   out.ln \
+		   tree.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
+$(MANDOC_HTML_OBJS) $(MANDOC_HTML_LNS): html.h
+$(MANDOC_TERM_OBJS) $(MANDOC_TERM_LNS): term.h
+$(MANDOC_OBJS) $(MANDOC_LNS): main.h mandoc.h mdoc.h man.h config.h out.h
 
-HEADS	= mdoc.h private.h term.h mmain.h
+compat.o compat.ln: config.h
 
-SGMLS	= index.sgml
+MANDOCDB_OBJS	 = mandocdb.o
+MANDOCDB_LNS	 = mandocdb.ln
 
-HTMLS	= index.html
+$(MANDOCDB_OBJS) $(MANDOCDB_LNS): mandoc.h mdoc.h man.h config.h
 
-STATICS	= style.css external.png
+PRECONV_OBJS	 = preconv.o
+PRECONV_LNS	 = preconv.ln
 
-TARGZS	= mdocml-$(VERSION).tar.gz mdocml-oport-$(VERSION).tar.gz
+$(PRECONV_OBJS) $(PRECONV_LNS): config.h
 
-MANS	= mdoctree.1 mdocterm.1 mdoclint.1 mdoc.3
+INDEX_MANS	 = mandoc.1.html \
+		   mandoc.1.xhtml \
+		   mandoc.1.ps \
+		   mandoc.1.pdf \
+		   mandoc.1.txt \
+		   mandoc.3.html \
+		   mandoc.3.xhtml \
+		   mandoc.3.ps \
+		   mandoc.3.pdf \
+		   mandoc.3.txt \
+		   eqn.7.html \
+		   eqn.7.xhtml \
+		   eqn.7.ps \
+		   eqn.7.pdf \
+		   eqn.7.txt \
+		   man.7.html \
+		   man.7.xhtml \
+		   man.7.ps \
+		   man.7.pdf \
+		   man.7.txt \
+		   mandoc_char.7.html \
+		   mandoc_char.7.xhtml \
+		   mandoc_char.7.ps \
+		   mandoc_char.7.pdf \
+		   mandoc_char.7.txt \
+		   mdoc.7.html \
+		   mdoc.7.xhtml \
+		   mdoc.7.ps \
+		   mdoc.7.pdf \
+		   mdoc.7.txt \
+		   preconv.1.html \
+		   preconv.1.xhtml \
+		   preconv.1.ps \
+		   preconv.1.pdf \
+		   preconv.1.txt \
+		   roff.7.html \
+		   roff.7.xhtml \
+		   roff.7.ps \
+		   roff.7.pdf \
+		   roff.7.txt \
+		   tbl.7.html \
+		   tbl.7.xhtml \
+		   tbl.7.ps \
+		   tbl.7.pdf \
+		   tbl.7.txt \
+		   mandocdb.8.html \
+		   mandocdb.8.xhtml \
+		   mandocdb.8.ps \
+		   mandocdb.8.pdf \
+		   mandocdb.8.txt
 
-BINS	= mdocterm mdoctree mdoclint
+$(INDEX_MANS): mandoc
 
-CLEAN	= $(BINS) $(LNS) $(LLNS) $(LIBS) $(OBJS) $(HTMLS) \
-	  $(TARGZS)
+INDEX_OBJS	 = $(INDEX_MANS) \
+		   man.h.html \
+		   mandoc.h.html \
+		   mdoc.h.html \
+		   mdocml.tar.gz \
+		   mdocml.md5
 
-INSTALL	= $(SRCS) $(HEADS) Makefile Makefile.port DESCR $(MANS) \
-	  $(SGMLS) $(STATICS)
+www: index.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.13 \
-	  regress/test.prologue.15 \
-	  regress/test.prologue.16 \
-	  regress/test.prologue.18 \
-	  regress/test.prologue.19 \
-	  regress/test.prologue.21 \
-	  regress/test.prologue.22 \
-	  regress/test.prologue.23 \
-	  regress/test.prologue.24 \
-	  regress/test.prologue.25 \
-	  regress/test.prologue.26 \
-	  regress/test.prologue.27 \
-	  regress/test.prologue.28 \
-	  regress/test.prologue.29 \
-	  regress/test.prologue.30 \
-	  regress/test.prologue.31 \
-	  regress/test.prologue.32 \
-	  regress/test.prologue.33 \
-	  regress/test.sh.01 \
-	  regress/test.sh.02 \
-	  regress/test.sh.03
+lint: llib-llibmandoc.ln llib-lmandoc.ln llib-lpreconv.ln
 
-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.14 \
-	  regress/test.prologue.17 \
-	  regress/test.prologue.20 \
-	  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	= $(FAIL) $(SUCCEED)
-
-all:	$(BINS)
-
-lint:	$(LLNS)
-
 clean:
-	rm -f $(CLEAN)
+	rm -f libmandoc.a $(LIBMANDOC_OBJS)
+	rm -f llib-llibmandoc.ln $(LIBMANDOC_LNS)
+	rm -f mandocdb $(MANDOCDB_OBJS)
+	rm -f llib-lmandocdb.ln $(MANDOCDB_LNS)
+	rm -f preconv $(PRECONV_OBJS)
+	rm -f llib-lpreconv.ln $(PRECONV_LNS)
+	rm -f mandoc $(MANDOC_OBJS)
+	rm -f llib-lmandoc.ln $(MANDOC_LNS)
+	rm -f config.h config.log compat.o compat.ln
+	rm -f mdocml.tar.gz
+	rm -f index.html $(INDEX_OBJS)
 
-dist:	mdocml-$(VERSION).tar.gz
+install: all
+	mkdir -p $(DESTDIR)$(BINDIR)
+	mkdir -p $(DESTDIR)$(EXAMPLEDIR)
+	mkdir -p $(DESTDIR)$(LIBDIR)
+	mkdir -p $(DESTDIR)$(INCLUDEDIR)
+	mkdir -p $(DESTDIR)$(MANDIR)/man1
+	mkdir -p $(DESTDIR)$(MANDIR)/man3
+	mkdir -p $(DESTDIR)$(MANDIR)/man7
+	mkdir -p $(DESTDIR)$(MANDIR)/man8
+	$(INSTALL_PROGRAM) mandoc preconv $(DESTDIR)$(BINDIR)
+	$(INSTALL_LIB) libmandoc.a $(DESTDIR)$(LIBDIR)
+	$(INSTALL_LIB) man.h mdoc.h mandoc.h $(DESTDIR)$(INCLUDEDIR)
+	$(INSTALL_MAN) mandoc.1 preconv.1 $(DESTDIR)$(MANDIR)/man1
+	$(INSTALL_MAN) mandoc.3 $(DESTDIR)$(MANDIR)/man3
+	$(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)
 
-port:	mdocml-oport-$(VERSION).tar.gz
-
-www:	$(HTMLS) $(TARGZS)
-
 installwww: www
-	install -m 0444 $(HTMLS) $(STATICS) $(PREFIX)/
-	install -m 0444 mdocml-$(VERSION).tar.gz $(PREFIX)/snapshots/
-	install -m 0444 mdocml-oport-$(VERSION).tar.gz $(PREFIX)/ports-openbsd/
-	install -m 0444 mdocml-$(VERSION).tar.gz $(PREFIX)/snapshots/mdocml.tar.gz
-	install -m 0444 mdocml-oport-$(VERSION).tar.gz $(PREFIX)/ports-openbsd/mdocml.tar.gz
+	mkdir -p $(PREFIX)/snapshots
+	$(INSTALL_DATA) index.html external.png index.css $(PREFIX)
+	$(INSTALL_DATA) $(INDEX_MANS) style.css $(PREFIX)
+	$(INSTALL_DATA) mandoc.h.html man.h.html mdoc.h.html $(PREFIX)
+	$(INSTALL_DATA) mdocml.tar.gz $(PREFIX)/snapshots
+	$(INSTALL_DATA) mdocml.md5 $(PREFIX)/snapshots
+	$(INSTALL_DATA) mdocml.tar.gz $(PREFIX)/snapshots/mdocml-$(VERSION).tar.gz
+	$(INSTALL_DATA) mdocml.md5 $(PREFIX)/snapshots/mdocml-$(VERSION).md5
 
-regress::
-	@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
+libmandoc.a: compat.o $(LIBMANDOC_OBJS)
+	$(AR) rs $@ compat.o $(LIBMANDOC_OBJS)
 
-install:
-	mkdir -p $(PREFIX)/bin/
-	mkdir -p $(PREFIX)/include/mdoc/
-	mkdir -p $(PREFIX)/lib/
-	mkdir -p $(PREFIX)/man/man1/
-	install -m 0755 mdocterm $(PREFIX)/bin/
-	install -m 0755 mdoctree $(PREFIX)/bin/
-	install -m 0755 mdoclint $(PREFIX)/bin/
-	install -m 0444 mdocterm.1 $(PREFIX)/man/man1/
-	install -m 0444 mdoctree.1 $(PREFIX)/man/man1/
-	install -m 0444 mdoclint.1 $(PREFIX)/man/man1/
-	install -m 0444 mdoc.3 $(PREFIX)/man/man3/
-	install -m 0644 libmdoc.a $(PREFIX)/lib/
-	install -m 0444 mdoc.h $(PREFIX)/include/
+llib-llibmandoc.ln: compat.ln $(LIBMANDOC_LNS)
+	$(LINT) $(LINTFLAGS) -Clibmandoc compat.ln $(LIBMANDOC_LNS)
 
-uninstall:
-	rm -f $(PREFIX)/bin/mdocterm
-	rm -f $(PREFIX)/bin/mdoctree
-	rm -f $(PREFIX)/bin/mdoclint
-	rm -f $(PREFIX)/man/man1/mdocterm.1
-	rm -f $(PREFIX)/man/man1/mdoctree.1
-	rm -f $(PREFIX)/man/man1/mdoclint.1
-	rm -f $(PREFIX)/man/man3/mdoc.3
-	rm -f $(PREFIX)/lib/libmdoc.a
-	rm -f $(PREFIX)/include/mdoc.h
+mandoc: $(MANDOC_OBJS) libmandoc.a
+	$(CC) -o $@ $(MANDOC_OBJS) libmandoc.a
 
-macro.ln: macro.c private.h
-macro.o: macro.c private.h
+llib-lmandoc.ln: $(MANDOC_LNS)
+	$(LINT) $(LINTFLAGS) -Cmandoc $(MANDOC_LNS)
 
-term.ln: term.c term.h 
-term.o: term.c term.h
+mandocdb: $(MANDOCDB_OBJS) libmandoc.a
+	$(CC) -o $@ $(MANDOCDB_OBJS) libmandoc.a $(DBLIB)
 
-strings.ln: strings.c private.h
-strings.o: strings.c private.h
+llib-lmandocdb.ln: $(MANDOCDB_LNS)
+	$(LINT) $(LINTFLAGS) -Cmandocdb $(MANDOCDB_LNS)
 
-hash.ln: hash.c private.h
-hash.o: hash.c private.h
+preconv: $(PRECONV_OBJS)
+	$(CC) -o $@ $(PRECONV_OBJS)
 
-mdoc.ln: mdoc.c private.h
-mdoc.o: mdoc.c private.h
+llib-lpreconv.ln: $(PRECONV_LNS)
+	$(LINT) $(LINTFLAGS) -Cpreconv $(PRECONV_LNS)
 
-mdocterm.ln: mdocterm.c mmain.h
-mdocterm.o: mdocterm.c mmain.h
+mdocml.md5: mdocml.tar.gz
+	md5 mdocml.tar.gz >$@
 
-mdoclint.ln: mdoclint.c mmain.h
-mdoclint.o: mdoclint.c mmain.h
-
-mdoctree.ln: mdoctree.c mmain.h
-mdoctree.o: mdoctree.c mmain.h
-
-xstd.ln: xstd.c private.h
-xstd.o: xstd.c private.h
-
-argv.ln: argv.c private.h
-argv.o: argv.c private.h
-
-validate.ln: validate.c private.h
-validate.o: validate.c private.h
-
-action.ln: action.c private.h
-action.o: action.c private.h
-
-mmain.ln: mmain.c mmain.h
-mmain.o: mmain.c mmain.h
-
-private.h: mdoc.h
-
-mmain.h: mdoc.h
-
-term.h: mdoc.h
-
-mdocml-oport-$(VERSION).tar.gz: mdocml-$(VERSION).tar.gz Makefile.port DESCR
-	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.82 2009/02/23 22:51:10 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/ )
+mdocml.tar.gz: $(SRCS)
+	mkdir -p .dist/mdocml-$(VERSION)/
+	$(INSTALL_SOURCE) $(SRCS) .dist/mdocml-$(VERSION)
+	( cd .dist/ && tar zcf ../$@ ./ )
 	rm -rf .dist/
 
-mdocml-$(VERSION).tar.gz: $(INSTALL)
-	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/
-	( cd .dist/mdocml/ && tar zcf ../../$@ mdocml-$(VERSION)/ )
-	rm -rf .dist/
+index.html: $(INDEX_OBJS)
 
-llib-llibmdoc.ln: $(LIBLNS)
-	$(LINT) $(LINTFLAGS) -Clibmdoc $(LIBLNS)
+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-mmap test-mmap.c >> config.log 2>&1; then \
+		echo '#define HAVE_MMAP'; \
+		rm test-mmap; \
+	  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 \
+	) > $@
 
-llib-lmdoctree.ln: $(TREELNS) llib-llibmdoc.ln
-	$(LINT) $(LINTFLAGS) -Cmdoctree $(TREELNS) llib-llibmdoc.ln
+.h.h.html:
+	highlight -I $< >$@
 
-llib-lmdocterm.ln: $(TERMLNS) llib-llibmdoc.ln
-	$(LINT) $(LINTFLAGS) -Cmdocterm $(TERMLNS) llib-llibmdoc.ln
+.1.1.txt .3.3.txt .7.7.txt .8.8.txt:
+	./mandoc -Tascii -Wall,stop $< | col -b >$@
 
-libmdoc.a: $(LIBOBJS)
-	$(AR) rs $@ $(LIBOBJS)
+.1.1.html .3.3.html .7.7.html .8.8.html:
+	./mandoc -Thtml -Wall,stop -Ostyle=style.css,man=%N.%S.html,includes=%I.html $< >$@
 
-mdocterm: $(TERMOBJS) libmdoc.a
-	$(CC) $(CFLAGS) -o $@ $(TERMOBJS) libmdoc.a 
+.1.1.ps .3.3.ps .7.7.ps .8.8.ps:
+	./mandoc -Tps -Wall,stop $< >$@
 
-mdoctree: $(TREEOBJS) libmdoc.a
-	$(CC) $(CFLAGS) -o $@ $(TREEOBJS) libmdoc.a 
+.1.1.xhtml .3.3.xhtml .7.7.xhtml .8.8.xhtml:
+	./mandoc -Txhtml -Wall,stop -Ostyle=style.css,man=%N.%S.xhtml,includes=%I.html $< >$@
 
-mdoclint: $(LINTOBJS) libmdoc.a
-	$(CC) $(CFLAGS) -o $@ $(LINTOBJS) libmdoc.a 
+.1.1.pdf .3.3.pdf .7.7.pdf .8.8.pdf:
+	./mandoc -Tpdf -Wall,stop $< >$@
 
 .sgml.html:
-	validate $<
-	cp -f $< $@
+	validate --warn $<
+	sed -e "s!@VERSION@!$(VERSION)!" -e "s!@VDATE@!$(VDATE)!" $< >$@