===================================================================
RCS file: /cvs/mandoc/Makefile,v
retrieving revision 1.95
retrieving revision 1.488.2.1
diff -u -p -r1.95 -r1.488.2.1
--- mandoc/Makefile	2009/02/28 13:49:11	1.95
+++ mandoc/Makefile	2016/07/20 14:14:07	1.488.2.1
@@ -1,304 +1,467 @@
-.SUFFIXES:	.html .sgml
+# $Id: Makefile,v 1.488.2.1 2016/07/20 14:14:07 schwarze Exp $
+#
+# Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
+# Copyright (c) 2011, 2013-2016 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.
 
-VERSION	= 1.3.10
-VDATE	= 28 February 2009
+VERSION = 1.13.4
 
-CFLAGS += -W -Wall -Wstrict-prototypes -Wno-unused-parameter -g 
+# === LIST OF FILES ====================================================
 
-LIBLNS	= macro.ln mdoc.ln hash.ln strings.ln xstd.ln argv.ln \
-	  validate.ln action.ln 
+TESTSRCS	 = test-dirent-namlen.c \
+		   test-err.c \
+		   test-fts.c \
+		   test-getline.c \
+		   test-getsubopt.c \
+		   test-isblank.c \
+		   test-mkdtemp.c \
+		   test-mmap.c \
+		   test-nanosleep.c \
+		   test-ohash.c \
+		   test-pledge.c \
+		   test-progname.c \
+		   test-reallocarray.c \
+		   test-rewb-bsd.c \
+		   test-rewb-sysv.c \
+		   test-sandbox_init.c \
+		   test-sqlite3.c \
+		   test-sqlite3_errstr.c \
+		   test-strcasestr.c \
+		   test-stringlist.c \
+		   test-strlcat.c \
+		   test-strlcpy.c \
+		   test-strptime.c \
+		   test-strsep.c \
+		   test-strtonum.c \
+		   test-vasprintf.c \
+		   test-wchar.c
 
-TREELNS	= mdoctree.ln mmain.ln 
+SRCS		 = att.c \
+		   cgi.c \
+		   chars.c \
+		   compat_err.c \
+		   compat_fts.c \
+		   compat_getline.c \
+		   compat_getsubopt.c \
+		   compat_isblank.c \
+		   compat_mkdtemp.c \
+		   compat_ohash.c \
+		   compat_progname.c \
+		   compat_reallocarray.c \
+		   compat_sqlite3_errstr.c \
+		   compat_strcasestr.c \
+		   compat_stringlist.c \
+		   compat_strlcat.c \
+		   compat_strlcpy.c \
+		   compat_strsep.c \
+		   compat_strtonum.c \
+		   compat_vasprintf.c \
+		   demandoc.c \
+		   eqn.c \
+		   eqn_html.c \
+		   eqn_term.c \
+		   html.c \
+		   lib.c \
+		   main.c \
+		   man.c \
+		   man_hash.c \
+		   man_html.c \
+		   man_macro.c \
+		   man_term.c \
+		   man_validate.c \
+		   mandoc.c \
+		   mandoc_aux.c \
+		   mandoc_ohash.c \
+		   mandocdb.c \
+		   manpage.c \
+		   manpath.c \
+		   mansearch.c \
+		   mansearch_const.c \
+		   mdoc.c \
+		   mdoc_argv.c \
+		   mdoc_hash.c \
+		   mdoc_html.c \
+		   mdoc_macro.c \
+		   mdoc_man.c \
+		   mdoc_state.c \
+		   mdoc_term.c \
+		   mdoc_validate.c \
+		   msec.c \
+		   out.c \
+		   preconv.c \
+		   read.c \
+		   roff.c \
+		   soelim.c \
+		   st.c \
+		   tag.c \
+		   tbl.c \
+		   tbl_data.c \
+		   tbl_html.c \
+		   tbl_layout.c \
+		   tbl_opts.c \
+		   tbl_term.c \
+		   term.c \
+		   term_ascii.c \
+		   term_ps.c \
+		   tree.c
 
-TERMLNS	= mdoctree.ln mmain.ln term.ln
+DISTFILES	 = INSTALL \
+		   LICENSE \
+		   Makefile \
+		   Makefile.depend \
+		   NEWS \
+		   TODO \
+		   apropos.1 \
+		   cgi.h.example \
+		   compat_fts.h \
+		   compat_ohash.h \
+		   compat_stringlist.h \
+		   configure \
+		   configure.local.example \
+		   demandoc.1 \
+		   eqn.7 \
+		   gmdiff \
+		   html.h \
+		   lib.in \
+		   libman.h \
+		   libmandoc.h \
+		   libmdoc.h \
+		   libroff.h \
+		   main.h \
+		   makewhatis.8 \
+		   man.1 \
+		   man.7 \
+		   man.cgi.3 \
+		   man.cgi.8 \
+		   man.conf.5 \
+		   man.h \
+		   manconf.h \
+		   mandoc.1 \
+		   mandoc.3 \
+		   mandoc.css \
+		   mandoc.db.5 \
+		   mandoc.h \
+		   mandoc_aux.h \
+		   mandoc_char.7 \
+		   mandoc_escape.3 \
+		   mandoc_headers.3 \
+		   mandoc_html.3 \
+		   mandoc_malloc.3 \
+		   mandoc_ohash.h \
+		   mansearch.3 \
+		   mansearch.h \
+		   mchars_alloc.3 \
+		   mdoc.7 \
+		   mdoc.h \
+		   msec.in \
+		   out.h \
+		   predefs.in \
+		   roff.7 \
+		   roff.h \
+		   roff_int.h \
+		   soelim.1 \
+		   st.in \
+		   tag.h \
+		   tbl.3 \
+		   tbl.7 \
+		   term.h \
+		   $(SRCS) \
+		   $(TESTSRCS)
 
-LINTLNS	= mdoclint.ln mmain.ln
+LIBMAN_OBJS	 = man.o \
+		   man_hash.o \
+		   man_macro.o \
+		   man_validate.o
 
-LNS	= $(LIBLNS) $(TREELNS) $(TERMLNS)
+LIBMDOC_OBJS	 = att.o \
+		   lib.o \
+		   mdoc.o \
+		   mdoc_argv.o \
+		   mdoc_hash.o \
+		   mdoc_macro.o \
+		   mdoc_state.o \
+		   mdoc_validate.o \
+		   st.o
 
-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
 
-LIBS	= libmdoc.a
+LIBMANDOC_OBJS	 = $(LIBMAN_OBJS) \
+		   $(LIBMDOC_OBJS) \
+		   $(LIBROFF_OBJS) \
+		   chars.o \
+		   mandoc.o \
+		   mandoc_aux.o \
+		   mandoc_ohash.o \
+		   msec.o \
+		   preconv.o \
+		   read.o
 
-LIBOBJS	= macro.o mdoc.o hash.o strings.o xstd.o argv.o \
-	  validate.o action.o
+COMPAT_OBJS	 = compat_err.o \
+		   compat_fts.o \
+		   compat_getline.o \
+		   compat_getsubopt.o \
+		   compat_isblank.o \
+		   compat_mkdtemp.o \
+		   compat_ohash.o \
+		   compat_progname.o \
+		   compat_reallocarray.o \
+		   compat_sqlite3_errstr.o \
+		   compat_strcasestr.o \
+		   compat_strlcat.o \
+		   compat_strlcpy.o \
+		   compat_strsep.o \
+		   compat_strtonum.o \
+		   compat_vasprintf.o
 
-TERMOBJS= mdocterm.o mmain.o term.o
+MANDOC_HTML_OBJS = eqn_html.o \
+		   html.o \
+		   man_html.o \
+		   mdoc_html.o \
+		   tbl_html.o
 
-TREEOBJS= mdoctree.o mmain.o
+MANDOC_MAN_OBJS  = mdoc_man.o
 
-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
 
-OBJS	= $(LIBOBJS) $(TERMOBJS) $(TREEOBJS)
+BASE_OBJS	 = $(MANDOC_HTML_OBJS) \
+		   $(MANDOC_MAN_OBJS) \
+		   $(MANDOC_TERM_OBJS) \
+		   main.o \
+		   manpath.o \
+		   out.o \
+		   tag.o \
+		   tree.o
 
-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
+MAIN_OBJS	 = $(BASE_OBJS)
 
-HEADS	= mdoc.h private.h term.h mmain.h
+DB_OBJS		 = mandocdb.o \
+		   mansearch.o \
+		   mansearch_const.o
 
-SGMLS	= index.sgml
+CGI_OBJS	 = $(MANDOC_HTML_OBJS) \
+		   cgi.o \
+		   mansearch.o \
+		   mansearch_const.o \
+		   out.o
 
-HTMLS	= index.html
+MANPAGE_OBJS	 = manpage.o mansearch.o mansearch_const.o manpath.o
 
-STATICS	= style.css external.png
+DEMANDOC_OBJS	 = demandoc.o
 
-TARGZS	= mdocml-$(VERSION).tar.gz mdocml-oport-$(VERSION).tar.gz \
-	  mdocml-nport-$(VERSION).tar.gz
+SOELIM_OBJS	 = soelim.o \
+		   compat_err.o \
+		   compat_getline.o \
+		   compat_progname.o \
+		   compat_reallocarray.o \
+		   compat_stringlist.o
 
-MANS	= mdoctree.1 mdocterm.1 mdoclint.1 mdoc.3
+WWW_MANS	 = apropos.1.html \
+		   demandoc.1.html \
+		   man.1.html \
+		   mandoc.1.html \
+		   soelim.1.html \
+		   mandoc.3.html \
+		   mandoc_escape.3.html \
+		   mandoc_headers.3.html \
+		   mandoc_html.3.html \
+		   mandoc_malloc.3.html \
+		   mansearch.3.html \
+		   mchars_alloc.3.html \
+		   tbl.3.html \
+		   man.conf.5.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.cgi.3.html \
+		   man.cgi.8.html \
+		   man.h.html \
+		   manconf.h.html \
+		   mandoc.h.html \
+		   mandoc_aux.h.html \
+		   mansearch.h.html \
+		   mdoc.h.html \
+		   roff.h.html
 
-BINS	= mdocterm mdoctree mdoclint
+WWW_OBJS	 = mdocml.tar.gz \
+		   mdocml.sha256
 
-CLEAN	= $(BINS) $(LNS) $(LLNS) $(LIBS) $(OBJS) $(HTMLS) \
-	  $(TARGZS)
+# === USER CONFIGURATION ===============================================
 
-INSTALL	= $(SRCS) $(HEADS) Makefile DESCR $(MANS) $(SGMLS) \
-	  $(STATICS) Makefile.netbsd Makefile.openbsd
+include Makefile.local
 
-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.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
+# === DEPENDENCY HANDLING ==============================================
 
-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/test.list.07 \
-	  regress/test.sh.01 \
-	  regress/test.sh.02 \
-	  regress/test.escape.00 \
-	  regress/test.escape.05 \
-	  regress/test.escape.10
+all: base-build $(BUILD_TARGETS) Makefile.local
 
-REGRESS	= $(FAIL) $(SUCCEED)
+base-build: mandoc demandoc soelim
 
-all:	$(BINS)
+cgi-build: man.cgi
 
-lint:	$(LLNS)
+install: base-install $(INSTALL_TARGETS)
 
-clean:
-	rm -f $(CLEAN)
+www: $(WWW_OBJS) $(WWW_MANS)
 
-cleanlint:
-	rm -f $(LNS) $(LLNS)
+$(WWW_MANS): mandoc
 
-dist:	mdocml-$(VERSION).tar.gz
+.PHONY: base-install cgi-install db-install install www-install
+.PHONY: clean distclean depend
 
-port:	mdocml-oport-$(VERSION).tar.gz mdocml-nport-$(VERSION).tar.gz
+include Makefile.depend
 
-www:	$(HTMLS) $(TARGZS)
+# === TARGETS CONTAINING SHELL COMMANDS ================================
 
-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
+distclean: clean
+	rm -f Makefile.local config.h config.h.old config.log config.log.old
 
-regress: mdoclint
-	@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
+clean:
+	rm -f libmandoc.a $(LIBMANDOC_OBJS) $(COMPAT_OBJS)
+	rm -f mandoc $(BASE_OBJS) $(DB_OBJS)
+	rm -f man.cgi $(CGI_OBJS)
+	rm -f manpage $(MANPAGE_OBJS)
+	rm -f demandoc $(DEMANDOC_OBJS)
+	rm -f soelim $(SOELIM_OBJS)
+	rm -f $(WWW_MANS) $(WWW_OBJS)
+	rm -rf *.dSYM
 
-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/
+base-install: base-build
+	mkdir -p $(DESTDIR)$(BINDIR)
+	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) mandoc demandoc $(DESTDIR)$(BINDIR)
+	$(INSTALL_PROGRAM) soelim $(DESTDIR)$(BINDIR)/$(BINM_SOELIM)
+	ln -f $(DESTDIR)$(BINDIR)/mandoc $(DESTDIR)$(BINDIR)/$(BINM_MAN)
+	$(INSTALL_LIB) libmandoc.a $(DESTDIR)$(LIBDIR)
+	$(INSTALL_LIB) man.h mandoc.h mandoc_aux.h mdoc.h roff.h \
+		$(DESTDIR)$(INCLUDEDIR)
+	$(INSTALL_MAN) mandoc.1 demandoc.1 $(DESTDIR)$(MANDIR)/man1
+	$(INSTALL_MAN) soelim.1 $(DESTDIR)$(MANDIR)/man1/$(BINM_SOELIM).1
+	$(INSTALL_MAN) man.1 $(DESTDIR)$(MANDIR)/man1/$(BINM_MAN).1
+	$(INSTALL_MAN) mandoc.3 mandoc_escape.3 mandoc_malloc.3 \
+		mchars_alloc.3 tbl.3 $(DESTDIR)$(MANDIR)/man3
+	$(INSTALL_MAN) man.conf.5 $(DESTDIR)$(MANDIR)/man5/${MANM_MANCONF}.5
+	$(INSTALL_MAN) man.7 $(DESTDIR)$(MANDIR)/man7/${MANM_MAN}.7
+	$(INSTALL_MAN) mdoc.7 $(DESTDIR)$(MANDIR)/man7/${MANM_MDOC}.7
+	$(INSTALL_MAN) roff.7 $(DESTDIR)$(MANDIR)/man7/${MANM_ROFF}.7
+	$(INSTALL_MAN) eqn.7 $(DESTDIR)$(MANDIR)/man7/${MANM_EQN}.7
+	$(INSTALL_MAN) tbl.7 $(DESTDIR)$(MANDIR)/man7/${MANM_TBL}.7
+	$(INSTALL_MAN) mandoc_char.7 $(DESTDIR)$(MANDIR)/man7
 
-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
+db-install: base-build
+	mkdir -p $(DESTDIR)$(BINDIR)
+	mkdir -p $(DESTDIR)$(SBINDIR)
+	mkdir -p $(DESTDIR)$(MANDIR)/man1
+	mkdir -p $(DESTDIR)$(MANDIR)/man3
+	mkdir -p $(DESTDIR)$(MANDIR)/man5
+	mkdir -p $(DESTDIR)$(MANDIR)/man8
+	ln -f $(DESTDIR)$(BINDIR)/mandoc $(DESTDIR)$(BINDIR)/$(BINM_APROPOS)
+	ln -f $(DESTDIR)$(BINDIR)/mandoc $(DESTDIR)$(BINDIR)/$(BINM_WHATIS)
+	ln -f $(DESTDIR)$(BINDIR)/mandoc \
+		$(DESTDIR)$(SBINDIR)/$(BINM_MAKEWHATIS)
+	$(INSTALL_MAN) apropos.1 $(DESTDIR)$(MANDIR)/man1/$(BINM_APROPOS).1
+	ln -f $(DESTDIR)$(MANDIR)/man1/$(BINM_APROPOS).1 \
+		$(DESTDIR)$(MANDIR)/man1/$(BINM_WHATIS).1
+	$(INSTALL_MAN) mansearch.3 $(DESTDIR)$(MANDIR)/man3
+	$(INSTALL_MAN) mandoc.db.5 $(DESTDIR)$(MANDIR)/man5
+	$(INSTALL_MAN) makewhatis.8 \
+		$(DESTDIR)$(MANDIR)/man8/$(BINM_MAKEWHATIS).8
 
-macro.ln: macro.c private.h
-macro.o: macro.c private.h
+cgi-install: cgi-build
+	mkdir -p $(DESTDIR)$(CGIBINDIR)
+	mkdir -p $(DESTDIR)$(HTDOCDIR)
+	$(INSTALL_PROGRAM) man.cgi $(DESTDIR)$(CGIBINDIR)
+	$(INSTALL_DATA) mandoc.css $(DESTDIR)$(HTDOCDIR)
 
-term.ln: term.c term.h 
-term.o: term.c term.h
+Makefile.local config.h: configure ${TESTSRCS}
+	@echo "$@ is out of date; please run ./configure"
+	@exit 1
 
-strings.ln: strings.c private.h
-strings.o: strings.c private.h
+libmandoc.a: $(COMPAT_OBJS) $(LIBMANDOC_OBJS)
+	ar rs $@ $(COMPAT_OBJS) $(LIBMANDOC_OBJS)
 
-hash.ln: hash.c private.h
-hash.o: hash.c private.h
+mandoc: $(MAIN_OBJS) libmandoc.a
+	$(CC) -o $@ $(LDFLAGS) $(MAIN_OBJS) libmandoc.a $(LDADD)
 
-mdoc.ln: mdoc.c private.h
-mdoc.o: mdoc.c private.h
+manpage: $(MANPAGE_OBJS) libmandoc.a
+	$(CC) -o $@ $(LDFLAGS) $(MANPAGE_OBJS) libmandoc.a $(LDADD)
 
-mdocterm.ln: mdocterm.c mmain.h
-mdocterm.o: mdocterm.c mmain.h
+man.cgi: $(CGI_OBJS) libmandoc.a
+	$(CC) $(STATIC) -o $@ $(LDFLAGS) $(CGI_OBJS) libmandoc.a $(LDADD)
 
-mdoclint.ln: mdoclint.c mmain.h
-mdoclint.o: mdoclint.c mmain.h
+demandoc: $(DEMANDOC_OBJS) libmandoc.a
+	$(CC) -o $@ $(LDFLAGS) $(DEMANDOC_OBJS) libmandoc.a $(LDADD)
 
-mdoctree.ln: mdoctree.c mmain.h
-mdoctree.o: mdoctree.c mmain.h
+soelim: $(SOELIM_OBJS)
+	$(CC) -o $@ $(LDFLAGS) $(SOELIM_OBJS)
 
-xstd.ln: xstd.c private.h
-xstd.o: xstd.c private.h
+# --- maintainer targets ---
 
-argv.ln: argv.c private.h
-argv.o: argv.c private.h
+www-install: www
+	mkdir -p $(HTDOCDIR)/snapshots
+	$(INSTALL_DATA) $(WWW_MANS) mandoc.css $(HTDOCDIR)
+	$(INSTALL_DATA) $(WWW_OBJS) $(HTDOCDIR)/snapshots
+	$(INSTALL_DATA) mdocml.tar.gz \
+		$(HTDOCDIR)/snapshots/mdocml-$(VERSION).tar.gz
+	$(INSTALL_DATA) mdocml.sha256 \
+		$(HTDOCDIR)/snapshots/mdocml-$(VERSION).sha256
 
-validate.ln: validate.c private.h
-validate.o: validate.c private.h
+depend: config.h
+	mkdep -f Makefile.depend $(CFLAGS) $(SRCS)
+	perl -e 'undef $$/; $$_ = <>; s|/usr/include/\S+||g; \
+		s|\\\n||g; s|  +| |g; s| $$||mg; print;' \
+		Makefile.depend > Makefile.tmp
+	mv Makefile.tmp Makefile.depend
 
-action.ln: action.c private.h
-action.o: action.c private.h
+dist: mdocml.sha256
 
-mmain.ln: mmain.c mmain.h
-mmain.o: mmain.c mmain.h
+mdocml.sha256: mdocml.tar.gz
+	sha256 mdocml.tar.gz > $@
 
-private.h: mdoc.h
-
-mmain.h: mdoc.h
-
-term.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/ )
+mdocml.tar.gz: $(DISTFILES)
+	mkdir -p .dist/mdocml-$(VERSION)/
+	$(INSTALL) -m 0644 $(DISTFILES) .dist/mdocml-$(VERSION)
+	chmod 755 .dist/mdocml-$(VERSION)/configure
+	( cd .dist/ && tar zcf ../$@ mdocml-$(VERSION) )
 	rm -rf .dist/
 
-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.95 2009/02/28 13:49:11 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/
+# === SUFFIX RULES =====================================================
 
-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/
+.SUFFIXES:	 .1       .3       .5       .7       .8       .h
+.SUFFIXES:	 .1.html  .3.html  .5.html  .7.html  .8.html  .h.html
 
-llib-llibmdoc.ln: $(LIBLNS)
-	$(LINT) $(LINTFLAGS) -Clibmdoc $(LIBLNS)
+.h.h.html:
+	highlight -I $< > $@
 
-llib-lmdoctree.ln: $(TREELNS) llib-llibmdoc.ln
-	$(LINT) $(LINTFLAGS) -Cmdoctree $(TREELNS) llib-llibmdoc.ln
-
-llib-lmdocterm.ln: $(TERMLNS) llib-llibmdoc.ln
-	$(LINT) $(LINTFLAGS) -Cmdocterm $(TERMLNS) llib-llibmdoc.ln
-
-libmdoc.a: $(LIBOBJS)
-	$(AR) rs $@ $(LIBOBJS)
-
-mdocterm: $(TERMOBJS) libmdoc.a
-	$(CC) $(CFLAGS) -o $@ $(TERMOBJS) libmdoc.a 
-
-mdoctree: $(TREEOBJS) libmdoc.a
-	$(CC) $(CFLAGS) -o $@ $(TREEOBJS) libmdoc.a 
-
-mdoclint: $(LINTOBJS) libmdoc.a
-	$(CC) $(CFLAGS) -o $@ $(LINTOBJS) libmdoc.a 
-
-.sgml.html:
-	validate $<
-	sed -e "s!@VERSION@!$(VERSION)!" -e "s!@VDATE@!$(VDATE)!" $< > $@
-
+.1.1.html .3.3.html .5.5.html .7.7.html .8.8.html: mandoc
+	./mandoc -Thtml -Wall,stop \
+		-Ostyle=mandoc.css,man=%N.%S.html,includes=%I.html $< > $@