===================================================================
RCS file: /cvs/mandoc/Makefile,v
retrieving revision 1.226
retrieving revision 1.420
diff -u -p -r1.226 -r1.420
--- mandoc/Makefile	2009/10/13 10:21:24	1.226
+++ mandoc/Makefile	2014/06/20 02:55:49	1.420
@@ -1,256 +1,420 @@
-.SUFFIXES:	.html .xml .sgml .1 .3 .7 .md5 .tar.gz .1.txt .3.txt .7.txt .1.sgml .3.sgml .7.sgml
+# $Id: Makefile,v 1.420 2014/06/20 02:55:49 schwarze Exp $
+#
+# Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
+# Copyright (c) 2011, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
+#
+# Permission to use, copy, modify, and distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-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
-INSTALL_MAN	= $(INSTALL_DATA)
+VERSION		 = 1.13.0
 
-VERSION	   = 1.9.8
-VDATE	   = 10 October 2009
+# === USER SETTINGS ====================================================
 
-VFLAGS     = -DVERSION=\"$(VERSION)\"
-CFLAGS    += -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings -g
-CFLAGS    += $(VFLAGS)
-LINTFLAGS += $(VFLAGS)
+# 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 5.5\""
 
-MANDOCFLAGS	= -Wall -fstrict
-MANDOCHTML	= -Thtml -ostyle=style.css,man=%N.%S.html,includes=%I.html
+# 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
 
-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
+# If your system has manpath(1), uncomment this.  This is most any
+# system that's not OpenBSD or NetBSD.  If uncommented, manpage(1) and
+# makewhatis(8) will use manpath(1) to get the MANPATH variable.
+#CFLAGS		+= -DUSE_MANPATH
 
-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
+# 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
 
-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
+CFLAGS		+= -I/usr/local/include -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)
 
-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
-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 $(GSGMLS)
-XSLS	   = ChangeLog.xsl
-HTMLS	   = index.html 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
-CLEAN	   = $(BINS) $(LNS) $(LLNS) $(LIBS) $(OBJS) $(HTMLS) \
-	     $(TARGZS) tags $(MD5S) $(XMLS) $(TEXTS) $(GSGMLS)
-INSTALL	   = $(SRCS) $(HEADS) Makefile $(MANS) $(SGMLS) $(STATICS) \
-	     $(DATAS) $(XSLS) $(EXAMPLES)
+# If you want to build without database support, for example to avoid
+# the dependency on SQLite3, comment the following two lines.
+DBLIB		 = -L/usr/local/lib -lsqlite3
+DBBIN		 = makewhatis manpage apropos
 
-all:	$(BINS)
+# OpenBSD has the ohash functions in libutil.
+# Comment the following line if your system doesn't.
+DBLIB		+= -lutil
 
-lint:	$(LLNS)
+# === END OF USER SETTINGS =============================================
 
-clean:
-	rm -f $(CLEAN)
+ALLBIN		 = mandoc preconv demandoc $(DBBIN)
 
-cleanlint:
-	rm -f $(LNS) $(LLNS)
+all: $(ALLBIN)
 
-dist:	mdocml-$(VERSION).tar.gz
+TESTSRCS	 = test-fgetln.c \
+		   test-getsubopt.c \
+		   test-mmap.c \
+		   test-ohash.c \
+		   test-reallocarray.c \
+		   test-strlcat.c \
+		   test-strlcpy.c \
+		   test-strnlen.c \
+		   test-strptime.c
 
-www:	all $(HTMLS) $(TEXTS) $(MD5S) $(TARGZS)
+SRCS		 = LICENSE \
+		   Makefile \
+		   NEWS \
+		   TODO \
+		   apropos.1 \
+		   apropos.c \
+		   arch.c \
+		   arch.in \
+		   att.c \
+		   att.in \
+		   cgi.c \
+		   chars.c \
+		   chars.in \
+		   compat_fgetln.c \
+		   compat_getsubopt.c \
+		   compat_ohash.c \
+		   compat_ohash.h \
+		   compat_reallocarray.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 \
+		   makewhatis.8 \
+		   man.7 \
+		   man.c \
+		   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.db.5 \
+		   mandoc.h \
+		   mandoc_aux.c \
+		   mandoc_aux.h \
+		   mandoc_char.7 \
+		   mandocdb.c \
+		   manpage.c \
+		   manpath.c \
+		   manpath.h \
+		   mansearch.3 \
+		   mansearch.c \
+		   mansearch.h \
+		   mansearch_const.c \
+		   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 \
+		   $(TESTSRCS)
 
-installwww: www
-	install -m 0444 $(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
+LIBMAN_OBJS	 = man.o \
+		   man_hash.o \
+		   man_macro.o \
+		   man_validate.o
 
-install:
-	mkdir -p $(BINDIR)
-	mkdir -p $(MANDIR)/man1
-	mkdir -p $(MANDIR)/man7
-	$(INSTALL_PROGRAM) mandoc $(BINDIR)
-	$(INSTALL_MAN) mandoc.1 $(MANDIR)/man1
-	$(INSTALL_MAN) mdoc.7 $(MANDIR)/man7
+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
 
-uninstall:
-	rm -f $(BINDIR)/mandoc
-	rm -f $(MANDIR)/man1/mandoc.1
-	rm -f $(MANDIR)/man7/mdoc.7
+LIBROFF_OBJS	 = eqn.o \
+		   roff.o \
+		   tbl.o \
+		   tbl_data.o \
+		   tbl_layout.o \
+		   tbl_opts.o
 
-man_macro.ln: man_macro.c libman.h
-man_macro.o: man_macro.c libman.h
+LIBMANDOC_OBJS	 = $(LIBMAN_OBJS) \
+		   $(LIBMDOC_OBJS) \
+		   $(LIBROFF_OBJS) \
+		   chars.o \
+		   mandoc.o \
+		   mandoc_aux.o \
+		   msec.o \
+		   read.o
 
-lib.ln: lib.c lib.in libmdoc.h
-lib.o: lib.c lib.in libmdoc.h
+COMPAT_OBJS	 = compat_fgetln.o \
+		   compat_getsubopt.o \
+		   compat_ohash.o \
+		   compat_reallocarray.o \
+		   compat_strcasestr.o \
+		   compat_strlcat.o \
+		   compat_strlcpy.o \
+		   compat_strnlen.o \
+		   compat_strsep.o
 
-att.ln: att.c att.in libmdoc.h
-att.o: att.c att.in libmdoc.h
+# === DEPENDENCY HANDLING ==============================================
 
-arch.ln: arch.c arch.in libmdoc.h
-arch.o: arch.c arch.in libmdoc.h
+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
 
-vol.ln: vol.c vol.in libmdoc.h
-vol.o: vol.c vol.in libmdoc.h
+$(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 compat_ohash.h
 
-chars.ln: chars.c chars.in chars.h
-chars.o: chars.c chars.in chars.h
+MANDOC_HTML_OBJS = eqn_html.o \
+		   html.o \
+		   man_html.o \
+		   mdoc_html.o \
+		   tbl_html.o
+$(MANDOC_HTML_OBJS): html.h
 
-msec.ln: msec.c msec.in libmdoc.h
-msec.o: msec.c msec.in libmdoc.h
+MANDOC_MAN_OBJS  = mdoc_man.o
 
-st.ln: st.c st.in libmdoc.h
-st.o: st.c st.in libmdoc.h
+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
 
-mdoc_macro.ln: mdoc_macro.c libmdoc.h
-mdoc_macro.o: mdoc_macro.c libmdoc.h
+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
 
-mdoc_term.ln: mdoc_term.c term.h mdoc.h
-mdoc_term.o: mdoc_term.c term.h mdoc.h
+MAKEWHATIS_OBJS	 = mandocdb.o mansearch_const.o manpath.o
+$(MAKEWHATIS_OBJS): mansearch.h mandoc.h mandoc_aux.h \
+		  mdoc.h man.h config.h manpath.h
 
-mdoc_strings.ln: mdoc_strings.c libmdoc.h
-mdoc_strings.o: mdoc_strings.c libmdoc.h
+PRECONV_OBJS	 = preconv.o
+$(PRECONV_OBJS): config.h
 
-man_hash.ln: man_hash.c libman.h
-man_hash.o: man_hash.c libman.h
+APROPOS_OBJS	 = apropos.o mansearch.o mansearch_const.o manpath.o
+$(APROPOS_OBJS): config.h mandoc.h mandoc_aux.h manpath.h mansearch.h
 
-mdoc_hash.ln: mdoc_hash.c libmdoc.h
-mdoc_hash.o: mdoc_hash.c libmdoc.h
+MANPAGE_OBJS	 = manpage.o mansearch.o mansearch_const.o manpath.o
+$(MANPAGE_OBJS): config.h mandoc.h mandoc_aux.h manpath.h mansearch.h
 
-mdoc.ln: mdoc.c libmdoc.h
-mdoc.o: mdoc.c libmdoc.h
+DEMANDOC_OBJS	 = demandoc.o
+$(DEMANDOC_OBJS): config.h mandoc.h man.h mdoc.h
 
-man.ln: man.c libman.h
-man.o: man.c libman.h
+WWW_MANS	 = apropos.1.html \
+		   demandoc.1.html \
+		   mandoc.1.html \
+		   preconv.1.html \
+		   mandoc.3.html \
+		   mansearch.3.html \
+		   tbl.3.html \
+		   mandoc.db.5.html \
+		   eqn.7.html \
+		   man.7.html \
+		   mandoc_char.7.html \
+		   mdoc.7.html \
+		   roff.7.html \
+		   tbl.7.html \
+		   makewhatis.8.html \
+		   man.h.html \
+		   mandoc.h.html \
+		   mandoc_aux.h.html \
+		   manpath.h.html \
+		   mansearch.h.html \
+		   mdoc.h.html
 
-main.ln: main.c mdoc.h
-main.o: main.c mdoc.h
+WWW_OBJS	 = mdocml.tar.gz \
+		   mdocml.sha256
 
-compat.ln: compat.c 
-compat.o: compat.c
+www: $(WWW_OBJS) $(WWW_MANS)
 
-term.ln: term.c term.h man.h mdoc.h chars.h
-term.o: term.c term.h man.h mdoc.h chars.h
+# === TARGETS CONTAINING SHELL COMMANDS ================================
 
-html.ln: html.c html.h chars.h
-html.o: html.c html.h chars.h
+clean:
+	rm -f libmandoc.a $(LIBMANDOC_OBJS)
+	rm -f apropos $(APROPOS_OBJS)
+	rm -f makewhatis $(MAKEWHATIS_OBJS)
+	rm -f preconv $(PRECONV_OBJS)
+	rm -f manpage $(MANPAGE_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
 
-mdoc_html.ln: mdoc_html.c html.h mdoc.h
-mdoc_html.o: mdoc_html.c html.h mdoc.h
+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)/man5
+	mkdir -p $(DESTDIR)$(MANDIR)/man7
+	$(INSTALL_PROGRAM) $(ALLBIN) $(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 mansearch.3 tbl.3 $(DESTDIR)$(MANDIR)/man3
+	$(INSTALL_MAN) mandoc.db.5 $(DESTDIR)$(MANDIR)/man5
+	$(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)
 
-man_html.ln: man_html.c html.h man.h out.h
-man_html.o: man_html.c html.h man.h out.h
+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)
 
-out.ln: out.c out.h
-out.o: out.c out.h
+installwww: www
+	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.sha256 \
+		$(DESTDIR)$(HTDOCDIR)/snapshots/mdocml-$(VERSION).sha256
 
-tree.ln: tree.c man.h mdoc.h
-tree.o: tree.c man.h mdoc.h
+libmandoc.a: $(COMPAT_OBJS) $(LIBMANDOC_OBJS)
+	$(AR) rs $@ $(COMPAT_OBJS) $(LIBMANDOC_OBJS)
 
-mdoc_argv.ln: mdoc_argv.c libmdoc.h
-mdoc_argv.o: mdoc_argv.c libmdoc.h
+mandoc: $(MANDOC_OBJS) libmandoc.a
+	$(CC) $(LDFLAGS) -o $@ $(MANDOC_OBJS) libmandoc.a
 
-man_argv.ln: man_argv.c libman.h
-man_argv.o: man_argv.c libman.h
+makewhatis: $(MAKEWHATIS_OBJS) libmandoc.a
+	$(CC) $(LDFLAGS) -o $@ $(MAKEWHATIS_OBJS) libmandoc.a $(DBLIB)
 
-man_validate.ln: man_validate.c libman.h
-man_validate.o: man_validate.c libman.h
+preconv: $(PRECONV_OBJS)
+	$(CC) $(LDFLAGS) -o $@ $(PRECONV_OBJS)
 
-mdoc_validate.ln: mdoc_validate.c libmdoc.h
-mdoc_validate.o: mdoc_validate.c libmdoc.h
+manpage: $(MANPAGE_OBJS) libmandoc.a
+	$(CC) $(LDFLAGS) -o $@ $(MANPAGE_OBJS) libmandoc.a $(DBLIB)
 
-mdoc_action.ln: mdoc_action.c libmdoc.h
-mdoc_action.o: mdoc_action.c libmdoc.h
+apropos: $(APROPOS_OBJS) libmandoc.a
+	$(CC) $(LDFLAGS) -o $@ $(APROPOS_OBJS) libmandoc.a $(DBLIB)
 
-libmdoc.h: mdoc.h
+demandoc: $(DEMANDOC_OBJS) libmandoc.a
+	$(CC) $(LDFLAGS) -o $@ $(DEMANDOC_OBJS) libmandoc.a
 
-ChangeLog.xml:
-	cvs2cl --xml --xml-encoding iso-8859-15 -t --noxmlns -f $@
+mdocml.sha256: mdocml.tar.gz
+	sha256 mdocml.tar.gz > $@
 
-ChangeLog.txt:
-	cvs2cl -t -f $@
-
-ChangeLog.html: ChangeLog.xml ChangeLog.xsl
-	xsltproc -o $@ ChangeLog.xsl ChangeLog.xml
-
-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)/ )
+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)
+.PHONY: 	 clean install installcgi installwww
+.SUFFIXES:	 .1       .3       .5       .7       .8       .h
+.SUFFIXES:	 .1.html  .3.html  .5.html  .7.html  .8.html  .h.html
 
-llib-lmandoc.ln: $(MAINLNS) llib-llibmdoc.ln
-	$(LINT) -Cmandoc $(MAINLNS) llib-llibmdoc.ln
+.h.h.html:
+	highlight -I $< > $@
 
-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 $<
-	sed -e "s!@VERSION@!$(VERSION)!" -e "s!@VDATE@!$(VDATE)!" $< > $@
-
-.1.1.txt:
-	./mandoc $(MANDOCFLAGS) $< | col -b > $@
-
-.1.1.sgml:
-	./mandoc $(MANDOCFLAGS) $(MANDOCHTML) $< > $@
-
-.3.3.txt:
-	./mandoc $(MANDOCFLAGS) $< | col -b > $@
-
-.3.3.sgml:
-	./mandoc $(MANDOCFLAGS) $(MANDOCHTML) $< > $@
-
-.7.7.txt:
-	./mandoc $(MANDOCFLAGS) $< | col -b > $@
-
-.7.7.sgml:
-	./mandoc $(MANDOCFLAGS) $(MANDOCHTML) $< > $@
-
-.tar.gz.md5:
-	md5 $< > $@
+.1.1.html .3.3.html .5.5.html .7.7.html .8.8.html: mandoc
+	./mandoc -Thtml -Wall,stop \
+		-Ostyle=style.css,man=%N.%S.html,includes=%I.html $< > $@