===================================================================
RCS file: /cvs/mandoc/Makefile,v
retrieving revision 1.383
retrieving revision 1.395.2.12
diff -u -p -r1.383 -r1.395.2.12
--- mandoc/Makefile	2011/11/27 11:46:44	1.383
+++ mandoc/Makefile	2014/01/04 13:49:22	1.395.2.12
@@ -1,19 +1,15 @@
 .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
 
 # 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\""
 
-VERSION		 = 1.12.0
-VDATE		 = 8 October 2011
+VERSION		 = 1.12.3
+VDATE		 = 31 December 2013
 
 # IFF your system supports multi-byte functions (setlocale(), wcwidth(),
 # putwchar()) AND has __STDC_ISO_10646__ (that is, wchar_t is simply a
@@ -27,14 +23,20 @@ CFLAGS	 	+= -DUSE_WCHAR
 # 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
+#CFLAGS		+= -DUSE_MANPATH
 
-# If your system doesn't support static binaries, comment this.
-#STATIC		 = -static
+# 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
 
-CFLAGS		+= -g -DHAVE_CONFIG_H -DVERSION="\"$(VERSION)\""
+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
@@ -58,28 +60,49 @@ DBLN		 = llib-lapropos.ln llib-lmandocdb.ln llib-lman.
 
 all: mandoc preconv demandoc $(DBBIN)
 
+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
+
 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 \
-		   demandoc.c \
 		   demandoc.1 \
+		   demandoc.c \
 		   eqn.7 \
 		   eqn.c \
 		   eqn_html.c \
 		   eqn_term.c \
 		   example.style.css \
 		   external.png \
+		   gmdiff \
 		   html.c \
 		   html.h \
 		   index.css \
@@ -92,10 +115,11 @@ SRCS		 = Makefile \
 		   libroff.h \
 		   main.c \
 		   main.h \
-		   man.h \
 		   man.7 \
 		   man.c \
 		   man.cgi.7 \
+		   man-cgi.css \
+		   man.h \
 		   man_hash.c \
 		   man_html.c \
 		   man_macro.c \
@@ -105,17 +129,15 @@ SRCS		 = Makefile \
 		   mandoc.3 \
 		   mandoc.c \
 		   mandoc.h \
+		   mandoc_char.7 \
 		   mandocdb.8 \
 		   mandocdb.c \
 		   mandocdb.h \
-		   mandoc_char.7 \
 		   manpath.c \
 		   manpath.h \
-		   catman.c \
-		   catman.8 \
-		   mdoc.h \
 		   mdoc.7 \
 		   mdoc.c \
+		   mdoc.h \
 		   mdoc_argv.c \
 		   mdoc_hash.c \
 		   mdoc_html.c \
@@ -136,6 +158,7 @@ SRCS		 = Makefile \
 		   st.c \
 		   st.in \
 		   style.css \
+		   tbl.3 \
 		   tbl.7 \
 		   tbl.c \
 		   tbl_data.c \
@@ -147,23 +170,16 @@ SRCS		 = Makefile \
 		   term.h \
 		   term_ascii.c \
 		   term_ps.c \
-		   test-getsubopt.c \
-		   test-mmap.c \
-		   test-strlcat.c \
-		   test-strlcpy.c \
-		   test-strptime.c \
 		   tree.c \
 		   vol.c \
-		   vol.in
+		   vol.in \
+		   whatis.1 \
+		   $(TESTSRCS)
 
 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
 
 LIBMDOC_OBJS	 = arch.o \
 		   att.o \
@@ -173,20 +189,8 @@ LIBMDOC_OBJS	 = arch.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
 
 LIBROFF_OBJS	 = eqn.o \
 		   roff.o \
@@ -194,62 +198,46 @@ LIBROFF_OBJS	 = eqn.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
 
 LIBMANDOC_OBJS	 = $(LIBMAN_OBJS) \
 		   $(LIBMDOC_OBJS) \
 		   $(LIBROFF_OBJS) \
 		   chars.o \
 		   mandoc.o \
+		   msec.o \
 		   read.o
-LIBMANDOC_LNS	 = $(LIBMAN_LNS) \
-		   $(LIBMDOC_LNS) \
-		   $(LIBROFF_LNS) \
-		   chars.ln \
-		   mandoc.ln \
-		   read.ln
 
-COMPAT_OBJS	 = compat_getsubopt.o \
+COMPAT_OBJS	 = compat_fgetln.o \
+		   compat_getsubopt.o \
+		   compat_strcasestr.o \
 		   compat_strlcat.o \
-		   compat_strlcpy.o
-COMPAT_LNS	 = compat_getsubopt.ln \
-		   compat_strlcat.ln \
-		   compat_strlcpy.ln
+		   compat_strlcpy.o \
+		   compat_strnlen.o \
+		   compat_strsep.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
+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
 
-$(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
+$(LIBMAN_OBJS): libman.h
+$(LIBMDOC_OBJS): libmdoc.h
+$(LIBROFF_OBJS): libroff.h
+$(LIBMANDOC_OBJS): mandoc.h mdoc.h man.h libmandoc.h config.h
+$(COMPAT_OBJS): config.h
 
-$(COMPAT_OBJS) $(COMPAT_LNS): config.h
-
 MANDOC_HTML_OBJS = eqn_html.o \
 		   html.o \
 		   man_html.o \
 		   mdoc_html.o \
 		   tbl_html.o
-MANDOC_HTML_LNS	 = eqn_html.ln \
-		   html.ln \
-		   man_html.ln \
-		   mdoc_html.ln \
-		   tbl_html.ln
+$(MANDOC_HTML_OBJS): html.h
 
 MANDOC_MAN_OBJS  = mdoc_man.o
-MANDOC_MAN_LNS   = mdoc_man.ln
 
 MANDOC_TERM_OBJS = eqn_term.o \
 		   man_term.o \
@@ -258,13 +246,7 @@ MANDOC_TERM_OBJS = eqn_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
+$(MANDOC_TERM_OBJS): term.h
 
 MANDOC_OBJS	 = $(MANDOC_HTML_OBJS) \
 		   $(MANDOC_MAN_OBJS) \
@@ -272,32 +254,17 @@ MANDOC_OBJS	 = $(MANDOC_HTML_OBJS) \
 		   main.o \
 		   out.o \
 		   tree.o
-MANDOC_LNS	 = $(MANDOC_HTML_LNS) \
-		   $(MANDOC_MAN_LNS) \
-		   $(MANDOC_TERM_LNS) \
-		   main.ln \
-		   out.ln \
-		   tree.ln
+$(MANDOC_OBJS): main.h mandoc.h mdoc.h man.h config.h out.h
 
-$(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
-
 MANDOCDB_OBJS	 = mandocdb.o manpath.o
-MANDOCDB_LNS	 = mandocdb.ln manpath.ln
+$(MANDOCDB_OBJS): mandocdb.h mandoc.h mdoc.h man.h config.h manpath.h
 
-$(MANDOCDB_OBJS) $(MANDOCDB_LNS): mandocdb.h mandoc.h mdoc.h man.h config.h manpath.h
-
 PRECONV_OBJS	 = preconv.o
-PRECONV_LNS	 = preconv.ln
+$(PRECONV_OBJS): config.h
 
-$(PRECONV_OBJS) $(PRECONV_LNS): config.h
-
 APROPOS_OBJS	 = apropos.o apropos_db.o manpath.o
-APROPOS_LNS	 = apropos.ln apropos_db.ln manpath.ln
+$(APROPOS_OBJS): config.h mandoc.h apropos_db.h manpath.h mandocdb.h
 
-$(APROPOS_OBJS) $(APROPOS_LNS): config.h mandoc.h apropos_db.h manpath.h mandocdb.h
-
 CGI_OBJS	 = $(MANDOC_HTML_OBJS) \
 		   $(MANDOC_MAN_OBJS) \
 		   $(MANDOC_TERM_OBJS) \
@@ -306,88 +273,30 @@ CGI_OBJS	 = $(MANDOC_HTML_OBJS) \
 		   manpath.o \
 		   out.o \
 		   tree.o
+$(CGI_OBJS): main.h mdoc.h man.h out.h config.h mandoc.h apropos_db.h manpath.h mandocdb.h
 
-CGI_LNS	 	 = $(MANDOC_HTML_LNS) \
-		   $(MANDOC_MAN_LNS) \
-		   $(MANDOC_TERM_LNS) \
-		   cgi.ln \
-		   apropos_db.ln \
-		   manpath.ln \
-		   out.ln \
-		   tree.ln
-
-$(CGI_OBJS) $(CGI_LNS): main.h mdoc.h man.h out.h config.h mandoc.h apropos_db.h manpath.h mandocdb.h
-
 CATMAN_OBJS	 = catman.o manpath.o
-CATMAN_LNS 	 = catman.ln manpath.ln
+$(CATMAN_OBJS): config.h mandoc.h manpath.h mandocdb.h
 
-$(CATMAN_OBJS) $(CATMAN_LNS): config.h mandoc.h manpath.h 
-
 DEMANDOC_OBJS	 = demandoc.o
-DEMANDOC_LNS	 = demandoc.ln
+$(DEMANDOC_OBJS): config.h
 
-$(DEMANDOC_OBJS) $(DEMANDOC_LNS): config.h
-
 INDEX_MANS	 = apropos.1.html \
-		   apropos.1.xhtml \
-		   apropos.1.ps \
-		   apropos.1.pdf \
-		   apropos.1.txt \
+		   catman.8.html \
 		   demandoc.1.html \
-		   demandoc.1.xhtml \
-		   demandoc.1.ps \
-		   demandoc.1.pdf \
-		   demandoc.1.txt \
 		   mandoc.1.html \
-		   mandoc.1.xhtml \
-		   mandoc.1.ps \
-		   mandoc.1.pdf \
-		   mandoc.1.txt \
+		   whatis.1.html \
 		   mandoc.3.html \
-		   mandoc.3.xhtml \
-		   mandoc.3.ps \
-		   mandoc.3.pdf \
-		   mandoc.3.txt \
+		   tbl.3.html \
 		   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 \
+		   man.cgi.7.html \
 		   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
+		   mandocdb.8.html
 
 $(INDEX_MANS): mandoc
 
@@ -400,33 +309,19 @@ INDEX_OBJS	 = $(INDEX_MANS) \
 
 www: index.html
 
-lint: llib-lmandoc.ln llib-lpreconv.ln llib-ldemandoc.ln $(DBLN)
-
 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 apropos $(APROPOS_OBJS)
-	rm -f llib-lapropos.ln $(APROPOS_LNS)
+	rm -f apropos whatis $(APROPOS_OBJS)
 	rm -f man.cgi $(CGI_OBJS)
-	rm -f llib-lman.cgi.ln $(CGI_LNS)
 	rm -f catman $(CATMAN_OBJS)
-	rm -f llib-lcatman.ln $(CATMAN_LNS)
 	rm -f demandoc $(DEMANDOC_OBJS)
-	rm -f llib-ldemandoc.ln $(DEMANDOC_LNS)
 	rm -f mandoc $(MANDOC_OBJS)
-	rm -f llib-lmandoc.ln $(MANDOC_LNS)
-	rm -f config.h config.log $(COMPAT_OBJS) $(COMPAT_LNS)
-	rm -f mdocml.tar.gz mdocml-win32.zip mdocml-win64.zip mdocml-macosx.zip
+	rm -f config.h config.log $(COMPAT_OBJS)
+	rm -f mdocml.tar.gz
 	rm -f index.html $(INDEX_OBJS)
-	rm -rf test-strlcpy.DSYM
-	rm -rf test-strlcat.DSYM 
-	rm -rf test-strptime.DSYM 
-	rm -rf test-mmap.DSYM 
-	rm -rf test-getsubopt.DSYM
+	rm -rf *.dSYM
 
 install: all
 	mkdir -p $(DESTDIR)$(BINDIR)
@@ -436,15 +331,21 @@ install: all
 	mkdir -p $(DESTDIR)$(MANDIR)/man1
 	mkdir -p $(DESTDIR)$(MANDIR)/man3
 	mkdir -p $(DESTDIR)$(MANDIR)/man7
-	mkdir -p $(DESTDIR)$(MANDIR)/man8
 	$(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 $(DESTDIR)$(MANDIR)/man3
+	$(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)
 
+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)
+
 installwww: www
 	mkdir -p $(PREFIX)/snapshots
 	mkdir -p $(PREFIX)/binaries
@@ -459,54 +360,30 @@ installwww: www
 libmandoc.a: $(COMPAT_OBJS) $(LIBMANDOC_OBJS)
 	$(AR) rs $@ $(COMPAT_OBJS) $(LIBMANDOC_OBJS)
 
-llib-llibmandoc.ln: $(COMPAT_LNS) $(LIBMANDOC_LNS)
-	$(LINT) $(LINTFLAGS) -Clibmandoc $(COMPAT_LNS) $(LIBMANDOC_LNS)
-
 mandoc: $(MANDOC_OBJS) libmandoc.a
 	$(CC) $(LDFLAGS) -o $@ $(MANDOC_OBJS) libmandoc.a
 
-llib-lmandoc.ln: $(MANDOC_LNS) llib-llibmandoc.ln
-	$(LINT) $(LINTFLAGS) -Cmandoc $(MANDOC_LNS) llib-llibmandoc.ln
-
 mandocdb: $(MANDOCDB_OBJS) libmandoc.a
 	$(CC) $(LDFLAGS) -o $@ $(MANDOCDB_OBJS) libmandoc.a $(DBLIB)
 
-llib-lmandocdb.ln: $(MANDOCDB_LNS) llib-llibmandoc.ln
-	$(LINT) $(LINTFLAGS) -Cmandocdb $(MANDOCDB_LNS) llib-llibmandoc.ln
-
 preconv: $(PRECONV_OBJS)
 	$(CC) $(LDFLAGS) -o $@ $(PRECONV_OBJS)
 
-llib-lpreconv.ln: $(PRECONV_LNS) llib-llibmandoc.ln
-	$(LINT) $(LINTFLAGS) -Cpreconv $(PRECONV_LNS) llib-llibmandoc.ln
-
 whatis: apropos
 	cp -f apropos whatis
 
 apropos: $(APROPOS_OBJS) libmandoc.a
 	$(CC) $(LDFLAGS) -o $@ $(APROPOS_OBJS) libmandoc.a $(DBLIB)
 
-llib-lapropos.ln: $(APROPOS_LNS) llib-llibmandoc.ln
-	$(LINT) $(LINTFLAGS) -Capropos $(APROPOS_LNS) llib-llibmandoc.ln
-
 catman: $(CATMAN_OBJS) libmandoc.a
 	$(CC) $(LDFLAGS) -o $@ $(CATMAN_OBJS) libmandoc.a $(DBLIB)
 
-llib-lcatman.ln: $(CATMAN_LNS) llib-llibmandoc.ln
-	$(LINT) $(LINTFLAGS) -Ccatman $(CATMAN_LNS) llib-llibmandoc.ln
-
 man.cgi: $(CGI_OBJS) libmandoc.a
 	$(CC) $(LDFLAGS) $(STATIC) -o $@ $(CGI_OBJS) libmandoc.a $(DBLIB)
 
-llib-lman.cgi.ln: $(CGI_LNS) llib-llibmandoc.ln
-	$(LINT) $(LINTFLAGS) -Cman.cgi $(CGI_LNS) llib-llibmandoc.ln
-
 demandoc: $(DEMANDOC_OBJS) libmandoc.a
 	$(CC) $(LDFLAGS) -o $@ $(DEMANDOC_OBJS) libmandoc.a
 
-llib-ldemandoc.ln: $(DEMANDOC_LNS) llib-llibmandoc.ln
-	$(LINT) $(LINTFLAGS) -Cdemandoc $(DEMANDOC_LNS) llib-llibmandoc.ln
-
 mdocml.md5: mdocml.tar.gz
 	md5 mdocml.tar.gz >$@
 
@@ -516,84 +393,17 @@ mdocml.tar.gz: $(SRCS)
 	( cd .dist/ && tar zcf ../$@ ./ )
 	rm -rf .dist/
 
-mdocml-win32.zip: $(SRCS)
-	mkdir -p .win32/mdocml-$(VERSION)/
-	$(INSTALL_SOURCE) $(SRCS) .win32
-	cp .win32/Makefile .win32/Makefile.old
-	egrep -v -e DUSE_WCHAR -e ^DBBIN .win32/Makefile.old >.win32/Makefile
-	( cd .win32; \
-		CC=i686-w64-mingw32-gcc AR=i686-w64-mingw32-ar CFLAGS='-DOSNAME=\"Windows\"' make; \
-		make install PREFIX=mdocml-$(VERSION) ; \
-		zip -r ../$@ mdocml-$(VERSION) )
-	rm -rf .win32
-
-mdocml-win64.zip: $(SRCS)
-	mkdir -p .win64/mdocml-$(VERSION)/
-	$(INSTALL_SOURCE) $(SRCS) .win64
-	cp .win64/Makefile .win64/Makefile.old
-	egrep -v -e DUSE_WCHAR -e ^DBBIN .win64/Makefile.old >.win64/Makefile
-	( cd .win64; \
-		CC=x86_64-w64-mingw32-gcc AR=x86_64-w64-mingw32-ar CFLAGS='-DOSNAME=\"Windows\"' make; \
-		make install PREFIX=mdocml-$(VERSION) ; \
-		zip -r ../$@ mdocml-$(VERSION) )
-	rm -rf .win64
-
-mdocml-macosx.zip: $(SRCS)
-	mkdir -p .macosx/mdocml-$(VERSION)/
-	$(INSTALL_SOURCE) $(SRCS) .macosx
-	( cd .macosx; \
-		CFLAGS="-arch i386 -arch x86_64 -arch ppc" LDFLAGS="-arch i386 -arch x86_64 -arch ppc" make; \
-		make install PREFIX=mdocml-$(VERSION) ; \
-		zip -r ../$@ mdocml-$(VERSION) )
-	rm -rf .macosx
-
 index.html: $(INDEX_OBJS)
 
-config.h: config.h.pre config.h.post
+config.h: configure config.h.pre config.h.post $(TESTSRCS)
 	rm -f config.log
-	( cat config.h.pre; \
-	  echo; \
-	  if $(CC) $(CFLAGS) -Werror -o test-strptime test-strptime.c >> config.log 2>&1; then \
-		echo '#define HAVE_STRPTIME'; \
-		rm test-strptime; \
-	  fi; \
-	  if $(CC) $(CFLAGS) -Werror -o test-getsubopt test-getsubopt.c >> config.log 2>&1; then \
-		echo '#define HAVE_GETSUBOPT'; \
-		rm test-getsubopt; \
-	  fi; \
-	  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 \
-	) > $@
+	CC="$(CC)" CFLAGS="$(CFLAGS)" VERSION="$(VERSION)" ./configure
 
 .h.h.html:
 	highlight -I $< >$@
 
-.1.1.txt .3.3.txt .7.7.txt .8.8.txt:
-	./mandoc -Tascii -Wall,stop $< | col -b >$@
-
 .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 $< >$@
-
-.1.1.ps .3.3.ps .7.7.ps .8.8.ps:
-	./mandoc -Tps -Wall,stop $< >$@
-
-.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 $< >$@
-
-.1.1.pdf .3.3.pdf .7.7.pdf .8.8.pdf:
-	./mandoc -Tpdf -Wall,stop $< >$@
 
 .sgml.html:
 	validate --warn $<