===================================================================
RCS file: /cvs/mandoc/Makefile,v
retrieving revision 1.306
retrieving revision 1.395.2.15
diff -u -p -r1.306 -r1.395.2.15
--- mandoc/Makefile	2011/01/04 10:29:41	1.306
+++ mandoc/Makefile	2014/03/23 12:04:54	1.395.2.15
@@ -1,344 +1,403 @@
-.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
+.PHONY: 	 clean install installcgi installwww
+.SUFFIXES:	 .md5 .h .h.html
+.SUFFIXES:	 .1       .3       .7       .8
+.SUFFIXES:	 .1.html  .3.html  .7.html  .8.html
 
-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)
+VERSION		 = 1.12.3
 
-VERSION	   = 1.10.8
-VDATE	   = 24 December 2010
+# === USER SETTINGS ====================================================
 
-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\""
+#
+# CFLAGS	+= -DOSNAME="\"OpenBSD 5.4\""
 
-LINTFLAGS += $(VFLAGS)
+# 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	 	+= -DUSE_WCHAR
 
-ROFFLNS    = roff.ln tbl.ln tbl_opts.ln tbl_layout.ln tbl_data.ln
+# If your system has manpath(1), uncomment this.  This is most any
+# system that's not OpenBSD or NetBSD.  If uncommented, apropos(1),
+# mandocdb(8), and man.cgi will popen(3) manpath(1) to get the MANPATH
+# variable.
+#CFLAGS		+= -DUSE_MANPATH
 
-ROFFSRCS   = roff.c tbl.c tbl_opts.c tbl_layout.c tbl_data.c
+# If your system does not support static binaries, comment this,
+# for example on Mac OS X.
+STATIC		 = -static
+# Linux requires -pthread to statically link with libdb.
+#STATIC		+= -pthread
 
-ROFFOBJS   = roff.o tbl.o tbl_opts.o tbl_layout.o tbl_data.o
+CFLAGS		+= -g -DHAVE_CONFIG_H
+CFLAGS     	+= -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings
+PREFIX		 = /usr/local
+WWWPREFIX	 = /var/www
+HTDOCDIR	 = $(WWWPREFIX)/htdocs
+CGIBINDIR	 = $(WWWPREFIX)/cgi-bin
+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)
 
-MANDOCLNS  = mandoc.ln
+# Non-BSD systems (Linux, etc.) need -ldb to compile mandocdb and
+# apropos.
+# However, if you don't have -ldb at all (or it's not native), then
+# comment out apropos and mandocdb. 
+#
+#DBLIB		 = -ldb
+DBBIN		 = apropos mandocdb man.cgi catman whatis
+DBLN		 = llib-lapropos.ln llib-lmandocdb.ln llib-lman.cgi.ln llib-lcatman.ln
 
-MANDOCSRCS = mandoc.c
+all: mandoc preconv demandoc $(DBBIN)
 
-MANDOCOBJS = mandoc.o
+TESTSRCS	 = test-betoh64.c \
+		   test-fgetln.c \
+		   test-getsubopt.c \
+		   test-mmap.c \
+		   test-strlcat.c \
+		   test-strlcpy.c \
+		   test-strnlen.c \
+		   test-strptime.c
 
-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
+SRCS		 = Makefile \
+		   NEWS \
+		   TODO \
+		   apropos.1 \
+		   apropos.c \
+		   apropos_db.c \
+		   apropos_db.h \
+		   arch.c \
+		   arch.in \
+		   att.c \
+		   att.in \
+		   catman.8 \
+		   catman.c \
+		   cgi.c \
+		   chars.c \
+		   chars.in \
+		   compat_fgetln.c \
+		   compat_getsubopt.c \
+		   compat_strcasestr.c \
+		   compat_strlcat.c \
+		   compat_strlcpy.c \
+		   compat_strnlen.c \
+		   compat_strsep.c \
+		   config.h.post \
+		   config.h.pre \
+		   configure \
+		   demandoc.1 \
+		   demandoc.c \
+		   eqn.7 \
+		   eqn.c \
+		   eqn_html.c \
+		   eqn_term.c \
+		   example.style.css \
+		   gmdiff \
+		   html.c \
+		   html.h \
+		   lib.c \
+		   lib.in \
+		   libman.h \
+		   libmandoc.h \
+		   libmdoc.h \
+		   libroff.h \
+		   main.c \
+		   main.h \
+		   man.7 \
+		   man.c \
+		   man.cgi.7 \
+		   man-cgi.css \
+		   man.h \
+		   man_hash.c \
+		   man_html.c \
+		   man_macro.c \
+		   man_term.c \
+		   man_validate.c \
+		   mandoc.1 \
+		   mandoc.3 \
+		   mandoc.c \
+		   mandoc.h \
+		   mandoc_aux.c \
+		   mandoc_aux.h \
+		   mandoc_char.7 \
+		   mandocdb.8 \
+		   mandocdb.c \
+		   mandocdb.h \
+		   manpath.c \
+		   manpath.h \
+		   mdoc.7 \
+		   mdoc.c \
+		   mdoc.h \
+		   mdoc_argv.c \
+		   mdoc_hash.c \
+		   mdoc_html.c \
+		   mdoc_macro.c \
+		   mdoc_man.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.3 \
+		   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 \
+		   tree.c \
+		   vol.c \
+		   vol.in \
+		   whatis.1 \
+		   $(TESTSRCS)
 
-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
+LIBMAN_OBJS	 = man.o \
+		   man_hash.o \
+		   man_macro.o \
+		   man_validate.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
+LIBMDOC_OBJS	 = arch.o \
+		   att.o \
+		   lib.o \
+		   mdoc.o \
+		   mdoc_argv.o \
+		   mdoc_hash.o \
+		   mdoc_macro.o \
+		   mdoc_validate.o \
+		   st.o \
+		   vol.o
 
-MANLNS	   = man_macro.ln man.ln man_hash.ln man_validate.ln \
-	     man_argv.ln
+LIBROFF_OBJS	 = eqn.o \
+		   roff.o \
+		   tbl.o \
+		   tbl_data.o \
+		   tbl_layout.o \
+		   tbl_opts.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
+LIBMANDOC_OBJS	 = $(LIBMAN_OBJS) \
+		   $(LIBMDOC_OBJS) \
+		   $(LIBROFF_OBJS) \
+		   chars.o \
+		   mandoc.o \
+		   mandoc_aux.o \
+		   msec.o \
+		   read.o
 
-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
+COMPAT_OBJS	 = compat_fgetln.o \
+		   compat_getsubopt.o \
+		   compat_strcasestr.o \
+		   compat_strlcat.o \
+		   compat_strlcpy.o \
+		   compat_strnlen.o \
+		   compat_strsep.o
 
-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
+arch.o: arch.in
+att.o: att.in
+chars.o: chars.in
+lib.o: lib.in
+msec.o: msec.in
+roff.o: predefs.in
+st.o: st.in
+vol.o: vol.in
 
-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
+$(LIBMAN_OBJS): libman.h
+$(LIBMDOC_OBJS): libmdoc.h
+$(LIBROFF_OBJS): libroff.h
+$(LIBMANDOC_OBJS): mandoc.h mandoc_aux.h mdoc.h man.h libmandoc.h config.h
+$(COMPAT_OBJS): config.h
 
-LLNS	   = llib-llibmdoc.ln llib-llibman.ln llib-lmandoc.ln \
-	     llib-llibmandoc.ln llib-llibroff.ln
+MANDOC_HTML_OBJS = eqn_html.o \
+		   html.o \
+		   man_html.o \
+		   mdoc_html.o \
+		   tbl_html.o
+$(MANDOC_HTML_OBJS): html.h
 
-LNS	   = $(MAINLNS) $(MDOCLNS) $(MANLNS) \
-	     $(MANDOCLNS) $(ROFFLNS)
+MANDOC_MAN_OBJS  = mdoc_man.o
 
-LIBS	   = libmdoc.a libman.a libmandoc.a libroff.a
+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_OBJS): term.h
 
-OBJS	   = $(MDOCOBJS) $(MAINOBJS) $(MANOBJS) \
-	     $(MANDOCOBJS) $(ROFFOBJS)
+MANDOC_OBJS	 = $(MANDOC_HTML_OBJS) \
+		   $(MANDOC_MAN_OBJS) \
+		   $(MANDOC_TERM_OBJS) \
+		   main.o \
+		   out.o \
+		   tree.o
+$(MANDOC_OBJS): main.h mandoc.h mandoc_aux.h mdoc.h man.h config.h out.h
 
-SRCS	   = $(MDOCSRCS) $(MAINSRCS) $(MANSRCS) \
-	     $(MANDOCSRCS) $(ROFFSRCS)
+MANDOCDB_OBJS	 = mandocdb.o manpath.o
+$(MANDOCDB_OBJS): mandocdb.h mandoc.h mandoc_aux.h \
+		  mdoc.h man.h config.h manpath.h
 
-DATAS	   = arch.in att.in lib.in msec.in st.in \
-	     vol.in chars.in
+PRECONV_OBJS	 = preconv.o
+$(PRECONV_OBJS): config.h
 
-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
+APROPOS_OBJS	 = apropos.o apropos_db.o manpath.o
+$(APROPOS_OBJS): config.h mandoc.h apropos_db.h manpath.h mandocdb.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 
+CGI_OBJS	 = $(MANDOC_HTML_OBJS) \
+		   $(MANDOC_MAN_OBJS) \
+		   $(MANDOC_TERM_OBJS) \
+		   cgi.o \
+		   apropos_db.o \
+		   manpath.o \
+		   out.o \
+		   tree.o
+$(CGI_OBJS): main.h mdoc.h man.h out.h config.h mandoc.h mandoc_aux.h \
+	     apropos_db.h manpath.h mandocdb.h
 
-SGMLS	   = index.sgml
+CATMAN_OBJS	 = catman.o manpath.o
+$(CATMAN_OBJS): config.h mandoc.h manpath.h mandocdb.h
 
-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 
+DEMANDOC_OBJS	 = demandoc.o
+$(DEMANDOC_OBJS): config.h
 
-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 
+WWW_MANS	 = apropos.1.html \
+		   catman.8.html \
+		   demandoc.1.html \
+		   mandoc.1.html \
+		   whatis.1.html \
+		   mandoc.3.html \
+		   tbl.3.html \
+		   eqn.7.html \
+		   man.7.html \
+		   man.cgi.7.html \
+		   mandoc_char.7.html \
+		   mdoc.7.html \
+		   preconv.1.html \
+		   roff.7.html \
+		   tbl.7.html \
+		   mandocdb.8.html \
+		   man.h.html \
+		   mandoc.h.html \
+		   mdoc.h.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 
+$(WWW_MANS): mandoc
 
-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 
+WWW_OBJS	 = mdocml.tar.gz \
+		   mdocml.md5
 
-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 
-
-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 
-
-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 $(DOCLEAN)
+	rm -f libmandoc.a $(LIBMANDOC_OBJS)
+	rm -f mandocdb $(MANDOCDB_OBJS)
+	rm -f preconv $(PRECONV_OBJS)
+	rm -f apropos whatis $(APROPOS_OBJS)
+	rm -f man.cgi $(CGI_OBJS)
+	rm -f catman $(CATMAN_OBJS)
+	rm -f demandoc $(DEMANDOC_OBJS)
+	rm -f mandoc $(MANDOC_OBJS)
+	rm -f config.h config.log $(COMPAT_OBJS)
+	rm -f $(WWW_MANS) $(WWW_OBJS)
+	rm -rf *.dSYM
 
-dist:	mdocml-$(VERSION).tar.gz
-
-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:
+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
-	$(INSTALL_PROGRAM) mandoc $(DESTDIR)$(BINDIR)
-	$(INSTALL_MAN) mandoc.1 $(DESTDIR)$(MANDIR)/man1
-	$(INSTALL_MAN) man.7 mdoc.7 roff.7 mandoc_char.7 $(DESTDIR)$(MANDIR)/man7
+	$(INSTALL_PROGRAM) mandoc preconv demandoc $(DESTDIR)$(BINDIR)
+	$(INSTALL_LIB) libmandoc.a $(DESTDIR)$(LIBDIR)
+	$(INSTALL_LIB) man.h mdoc.h mandoc.h $(DESTDIR)$(INCLUDEDIR)
+	$(INSTALL_MAN) mandoc.1 preconv.1 demandoc.1 $(DESTDIR)$(MANDIR)/man1
+	$(INSTALL_MAN) mandoc.3 tbl.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)
 
-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/man.7
-	rm -f $(DESTDIR)$(MANDIR)/man7/mandoc_char.7
-	rm -f $(DESTDIR)$(EXAMPLEDIR)/example.style.css
+installcgi: all
+	mkdir -p $(DESTDIR)$(CGIBINDIR)
+	mkdir -p $(DESTDIR)$(HTDOCDIR)
+	$(INSTALL_PROGRAM) man.cgi $(DESTDIR)$(CGIBINDIR)
+	$(INSTALL_DATA) example.style.css $(DESTDIR)$(HTDOCDIR)/man.css
+	$(INSTALL_DATA) man-cgi.css $(DESTDIR)$(HTDOCDIR)
 
-$(OBJS): config.h
+installwww: $(WWW_MANS) $(WWW_OBJS)
+	mkdir -p $(DESTDIR)$(HTDOCDIR)/snapshots
+	$(INSTALL_DATA) $(WWW_MANS) style.css $(DESTDIR)$(HTDOCDIR)
+	$(INSTALL_DATA) $(WWW_OBJS) $(DESTDIR)$(HTDOCDIR)/snapshots
+	$(INSTALL_DATA) mdocml.tar.gz \
+		$(DESTDIR)$(HTDOCDIR)/snapshots/mdocml-$(VERSION).tar.gz
+	$(INSTALL_DATA) mdocml.md5 \
+		$(DESTDIR)$(HTDOCDIR)/snapshots/mdocml-$(VERSION).md5
 
-$(LNS): config.h
+libmandoc.a: $(COMPAT_OBJS) $(LIBMANDOC_OBJS)
+	$(AR) rs $@ $(COMPAT_OBJS) $(LIBMANDOC_OBJS)
 
-man_macro.ln man_macro.o: man_macro.c libman.h
+mandoc: $(MANDOC_OBJS) libmandoc.a
+	$(CC) $(LDFLAGS) -o $@ $(MANDOC_OBJS) libmandoc.a
 
-lib.ln lib.o: lib.c lib.in libmdoc.h
+mandocdb: $(MANDOCDB_OBJS) libmandoc.a
+	$(CC) $(LDFLAGS) -o $@ $(MANDOCDB_OBJS) libmandoc.a $(DBLIB)
 
-att.ln att.o: att.c att.in libmdoc.h
+preconv: $(PRECONV_OBJS)
+	$(CC) $(LDFLAGS) -o $@ $(PRECONV_OBJS)
 
-arch.ln arch.o: arch.c arch.in libmdoc.h
+whatis: apropos
+	cp -f apropos whatis
 
-vol.ln vol.o: vol.c vol.in libmdoc.h
+apropos: $(APROPOS_OBJS) libmandoc.a
+	$(CC) $(LDFLAGS) -o $@ $(APROPOS_OBJS) libmandoc.a $(DBLIB)
 
-chars.ln chars.o: chars.c chars.in chars.h
+catman: $(CATMAN_OBJS) libmandoc.a
+	$(CC) $(LDFLAGS) -o $@ $(CATMAN_OBJS) libmandoc.a $(DBLIB)
 
-msec.ln msec.o: msec.c msec.in libmdoc.h
+man.cgi: $(CGI_OBJS) libmandoc.a
+	$(CC) $(LDFLAGS) $(STATIC) -o $@ $(CGI_OBJS) libmandoc.a $(DBLIB)
 
-st.ln st.o: st.c st.in libmdoc.h
+demandoc: $(DEMANDOC_OBJS) libmandoc.a
+	$(CC) $(LDFLAGS) -o $@ $(DEMANDOC_OBJS) libmandoc.a
 
-mdoc_macro.ln mdoc_macro.o: mdoc_macro.c libmdoc.h
+mdocml.md5: mdocml.tar.gz
+	md5 mdocml.tar.gz >$@
 
-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)/ )
+mdocml.tar.gz: $(SRCS)
+	mkdir -p .dist/mdocml-$(VERSION)/
+	$(INSTALL_SOURCE) $(SRCS) .dist/mdocml-$(VERSION)
+	chmod 755 .dist/mdocml-$(VERSION)/configure
+	( cd .dist/ && tar zcf ../$@ mdocml-$(VERSION) )
 	rm -rf .dist/
 
-llib-llibmdoc.ln: $(MDOCLNS)
-	$(LINT) -Clibmdoc $(MDOCLNS)
+config.h: configure config.h.pre config.h.post $(TESTSRCS)
+	rm -f config.log
+	CC="$(CC)" CFLAGS="$(CFLAGS)" VERSION="$(VERSION)" ./configure
 
-llib-llibman.ln: $(MANLNS)
-	$(LINT) -Clibman $(MANLNS)
-
-llib-llibmandoc.ln: $(MANDOCLNS)
-	$(LINT) -Clibmandoc $(MANDOCLNS)
-
-llib-llibroff.ln: $(ROFFLNS)
-	$(LINT) -Clibroff $(ROFFLNS)
-
-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
-
-libmdoc.a: $(MDOCOBJS)
-	$(AR) rs $@ $(MDOCOBJS)
-
-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 --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 -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 \
-	) > $@
+.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 $< >$@