Make the calltree a bit easier to understand by giving the

[mandoc.git] / Makefile

diff --git a/Makefile b/Makefile
index 5b30f07a822efa6f1c757664094e385926192780..6e5238d57631b67c52f97e5c9b86bfb1e401641d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,19 +1,28 @@
-.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
+# $Id: Makefile,v 1.424 2014/07/13 09:39:32 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.
+
+VERSION                 = 1.13.0
+
+# === USER SETTINGS ====================================================

 
 # Specify this if you want to hard-code the operating system to appear
 # in the lower-left hand corner of -mdoc manuals.
 #
 
 # 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\""
-
-VERSION                 = 1.12.0
-VDATE           = 8 October 2011
+# CFLAGS       += -DOSNAME="\"OpenBSD 5.5\""

 
 # IFF your system supports multi-byte functions (setlocale(), wcwidth(),
 # putwchar()) AND has __STDC_ISO_10646__ (that is, wchar_t is simply a
 
 # IFF your system supports multi-byte functions (setlocale(), wcwidth(),
 # putwchar()) AND has __STDC_ISO_10646__ (that is, wchar_t is simply a


@@ -23,9 +32,23 @@ VDATE                 = 8 October 2011
 #
 CFLAGS         += -DUSE_WCHAR
 
 #
 CFLAGS         += -DUSE_WCHAR
 

-CFLAGS         += -g -DHAVE_CONFIG_H -DVERSION="\"$(VERSION)\""
+# 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
+
+# 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         += -I/usr/local/include -g -DHAVE_CONFIG_H

 CFLAGS         += -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings
 PREFIX          = /usr/local
 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
 BINDIR          = $(PREFIX)/bin
 INCLUDEDIR      = $(PREFIX)/include/mandoc
 LIBDIR          = $(PREFIX)/lib/mandoc


@@ -38,43 +61,71 @@ INSTALL_LIB  = $(INSTALL) -m 0644
 INSTALL_SOURCE  = $(INSTALL) -m 0644
 INSTALL_MAN     = $(INSTALL_DATA)
 
 INSTALL_SOURCE  = $(INSTALL) -m 0644
 INSTALL_MAN     = $(INSTALL_DATA)
 

-# 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
-DBLN            = llib-lapropos.ln llib-lmandocdb.ln llib-lman.cgi.ln
+# 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
+
+# To build man.cgi, copy cgi.h.example to cgi.h, edit it, and
+# either enable the following line or run "make man.cgi" by hand.
+#DBBIN         += man.cgi
+
+# OpenBSD has the ohash functions in libutil.
+# Comment the following line if your system doesn't.
+DBLIB          += -lutil
+
+# === END OF USER SETTINGS =============================================
+
+ALLBIN          = mandoc preconv demandoc $(DBBIN)
+
+all: $(ALLBIN)

 
 

-all: mandoc preconv demandoc $(DBBIN)
+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

 
 

-SRCS            = Makefile \
+SRCS            = LICENSE \
+                  Makefile \
+                  NEWS \
+                  TODO \

                   apropos.1 \
                   apropos.c \
                   arch.c \
                   arch.in \
                   att.c \
                   att.in \
                   apropos.1 \
                   apropos.c \
                   arch.c \
                   arch.in \
                   att.c \
                   att.in \

+                  cgi.c \

                   chars.c \
                   chars.in \
                   chars.c \
                   chars.in \

+                  compat_fgetln.c \

                   compat_getsubopt.c \
                   compat_getsubopt.c \

+                  compat_ohash.c \
+                  compat_ohash.h \
+                  compat_reallocarray.c \
+                  compat_strcasestr.c \

                   compat_strlcat.c \
                   compat_strlcpy.c \
                   compat_strlcat.c \
                   compat_strlcpy.c \

+                  compat_strnlen.c \
+                  compat_strsep.c \

                   config.h.post \
                   config.h.pre \
                   config.h.post \
                   config.h.pre \

-                  demandoc.c \
+                  configure \

                   demandoc.1 \
                   demandoc.1 \

+                  demandoc.c \

                   eqn.7 \
                   eqn.c \
                   eqn_html.c \
                   eqn_term.c \
                   example.style.css \
                   eqn.7 \
                   eqn.c \
                   eqn_html.c \
                   eqn_term.c \
                   example.style.css \

-                  external.png \
+                  gmdiff \

                   html.c \
                   html.h \
                   html.c \
                   html.h \

-                  index.css \
-                  index.sgml \

                   lib.c \
                   lib.in \
                   libman.h \
                   lib.c \
                   lib.in \
                   libman.h \


@@ -83,9 +134,12 @@ SRCS                 = Makefile \
                   libroff.h \
                   main.c \
                   main.h \
                   libroff.h \
                   main.c \
                   main.h \

-                  man.h \
+                  makewhatis.8 \

                   man.7 \
                   man.c \
                   man.7 \
                   man.c \

+                  man.cgi.8 \
+                  man-cgi.css \
+                  man.h \

                   man_hash.c \
                   man_html.c \
                   man_macro.c \
                   man_hash.c \
                   man_html.c \
                   man_macro.c \


@@ -94,14 +148,22 @@ SRCS                = Makefile \
                   mandoc.1 \
                   mandoc.3 \
                   mandoc.c \
                   mandoc.1 \
                   mandoc.3 \
                   mandoc.c \

+                  mandoc.db.5 \

                   mandoc.h \
                   mandoc.h \

-                  mandocdb.8 \
-                  mandocdb.c \
-                  mandocdb.h \
+                  mandoc_aux.c \
+                  mandoc_aux.h \

                   mandoc_char.7 \
                   mandoc_char.7 \

-                  mdoc.h \
+                  mandocdb.c \
+                  manpage.c \
+                  manpath.c \
+                  manpath.h \
+                  mansearch.3 \
+                  mansearch.c \
+                  mansearch.h \
+                  mansearch_const.c \

                   mdoc.7 \
                   mdoc.c \
                   mdoc.7 \
                   mdoc.c \

+                  mdoc.h \

                   mdoc_argv.c \
                   mdoc_hash.c \
                   mdoc_html.c \
                   mdoc_argv.c \
                   mdoc_hash.c \
                   mdoc_html.c \


@@ -122,6 +184,7 @@ SRCS                 = Makefile \
                   st.c \
                   st.in \
                   style.css \
                   st.c \
                   st.in \
                   style.css \

+                  tbl.3 \

                   tbl.7 \
                   tbl.c \
                   tbl_data.c \
                   tbl.7 \
                   tbl.c \
                   tbl_data.c \


@@ -133,23 +196,15 @@ SRCS               = Makefile \
                   term.h \
                   term_ascii.c \
                   term_ps.c \
                   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 \
                   tree.c \
                   vol.c \

-                  vol.in
+                  vol.in \
+                  $(TESTSRCS)

 
 LIBMAN_OBJS     = man.o \
                   man_hash.o \
                   man_macro.o \
                   man_validate.o
 
 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 \
 
 LIBMDOC_OBJS    = arch.o \
                   att.o \


@@ -159,20 +214,8 @@ LIBMDOC_OBJS        = arch.o \
                   mdoc_hash.o \
                   mdoc_macro.o \
                   mdoc_validate.o \
                   mdoc_hash.o \
                   mdoc_macro.o \
                   mdoc_validate.o \

-                  msec.o \

                   st.o \
                   vol.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 \
 
 LIBROFF_OBJS    = eqn.o \
                   roff.o \


@@ -180,62 +223,52 @@ LIBROFF_OBJS       = eqn.o \
                   tbl_data.o \
                   tbl_layout.o \
                   tbl_opts.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 \
 
 LIBMANDOC_OBJS  = $(LIBMAN_OBJS) \
                   $(LIBMDOC_OBJS) \
                   $(LIBROFF_OBJS) \
                   chars.o \
                   mandoc.o \

+                  mandoc_aux.o \
+                  msec.o \

                   read.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_ohash.o \
+                  compat_reallocarray.o \
+                  compat_strcasestr.o \

                   compat_strlcat.o \
                   compat_strlcat.o \

-                  compat_strlcpy.o
-COMPAT_LNS      = compat_getsubopt.ln \
-                  compat_strlcat.ln \
-                  compat_strlcpy.ln
-
-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
-
-$(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
-
-$(COMPAT_OBJS) $(COMPAT_LNS): config.h
+                  compat_strlcpy.o \
+                  compat_strnlen.o \
+                  compat_strsep.o
+
+# === DEPENDENCY HANDLING ==============================================
+
+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
+cgi.o: cgi.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

 
 MANDOC_HTML_OBJS = eqn_html.o \
                   html.o \
                   man_html.o \
                   mdoc_html.o \
                   tbl_html.o
 
 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_OBJS  = mdoc_man.o

-MANDOC_MAN_LNS   = mdoc_man.ln

 
 MANDOC_TERM_OBJS = eqn_term.o \
                   man_term.o \
 
 MANDOC_TERM_OBJS = eqn_term.o \
                   man_term.o \


@@ -244,13 +277,7 @@ MANDOC_TERM_OBJS = eqn_term.o \
                   term_ascii.o \
                   term_ps.o \
                   tbl_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) \
 
 MANDOC_OBJS     = $(MANDOC_HTML_OBJS) \
                   $(MANDOC_MAN_OBJS) \


@@ -258,139 +285,74 @@ MANDOC_OBJS       = $(MANDOC_HTML_OBJS) \
                   main.o \
                   out.o \
                   tree.o
                   main.o \
                   out.o \
                   tree.o

-MANDOC_LNS      = $(MANDOC_HTML_LNS) \
-                  $(MANDOC_MAN_LNS) \
-                  $(MANDOC_TERM_LNS) \
-                  main.ln \
-                  out.ln \
-                  tree.ln
-
-$(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
-MANDOCDB_LNS    = mandocdb.ln
+$(MANDOC_OBJS): main.h mandoc.h mandoc_aux.h mdoc.h man.h config.h out.h

 
 

-$(MANDOCDB_OBJS) $(MANDOCDB_LNS): mandocdb.h mandoc.h mdoc.h man.h config.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

 
 PRECONV_OBJS    = preconv.o
 
 PRECONV_OBJS    = preconv.o

-PRECONV_LNS     = preconv.ln
+$(PRECONV_OBJS): config.h

 
 

-$(PRECONV_OBJS) $(PRECONV_LNS): config.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

 
 

-APROPOS_OBJS    = apropos.o apropos_db.o
-APROPOS_LNS     = apropos.ln apropos_db.ln
+CGI_OBJS        = $(MANDOC_HTML_OBJS) \
+                  cgi.o \
+                  mansearch.o \
+                  mansearch_const.o \
+                  out.o
+$(CGI_OBJS): main.h out.h config.h mandoc.h mandoc_aux.h \
+            manpath.h mansearch.h

 
 

-$(APROPOS_OBJS) $(APROPOS_LNS): config.h mandoc.h mandocdb.h apropos_db.h
-
-CGI_OBJS        = cgi.o apropos_db.o
-CGI_LNS                 = cgi.ln apropos_db.ln
-
-$(CGI_OBJS) $(CGI_LNS): config.h mandoc.h mandocdb.h apropos_db.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

 
 DEMANDOC_OBJS   = demandoc.o
 
 DEMANDOC_OBJS   = demandoc.o

-DEMANDOC_LNS    = demandoc.ln
+$(DEMANDOC_OBJS): config.h mandoc.h man.h mdoc.h

 
 

-$(DEMANDOC_OBJS) $(DEMANDOC_LNS): config.h
-
-INDEX_MANS      = apropos.1.html \
-                  apropos.1.xhtml \
-                  apropos.1.ps \
-                  apropos.1.pdf \
-                  apropos.1.txt \
+WWW_MANS        = apropos.1.html \

                   demandoc.1.html \
                   demandoc.1.html \

-                  demandoc.1.xhtml \
-                  demandoc.1.ps \
-                  demandoc.1.pdf \
-                  demandoc.1.txt \

                   mandoc.1.html \
                   mandoc.1.html \

-                  mandoc.1.xhtml \
-                  mandoc.1.ps \
-                  mandoc.1.pdf \
-                  mandoc.1.txt \
+                  preconv.1.html \

                   mandoc.3.html \
                   mandoc.3.html \

-                  mandoc.3.xhtml \
-                  mandoc.3.ps \
-                  mandoc.3.pdf \
-                  mandoc.3.txt \
+                  mansearch.3.html \
+                  tbl.3.html \
+                  mandoc.db.5.html \

                   eqn.7.html \
                   eqn.7.html \

-                  eqn.7.xhtml \
-                  eqn.7.ps \
-                  eqn.7.pdf \
-                  eqn.7.txt \

                   man.7.html \
                   man.7.html \

-                  man.7.xhtml \
-                  man.7.ps \
-                  man.7.pdf \
-                  man.7.txt \

                   mandoc_char.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.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.html \

-                  roff.7.xhtml \
-                  roff.7.ps \
-                  roff.7.pdf \
-                  roff.7.txt \

                   tbl.7.html \
                   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
-
-$(INDEX_MANS): mandoc
-
-INDEX_OBJS      = $(INDEX_MANS) \
+                  makewhatis.8.html \
+                  man.cgi.8.html \

                   man.h.html \
                   mandoc.h.html \
                   man.h.html \
                   mandoc.h.html \

-                  mdoc.h.html \
-                  mdocml.tar.gz \
-                  mdocml.md5
+                  mandoc_aux.h.html \
+                  manpath.h.html \
+                  mansearch.h.html \
+                  mdoc.h.html
+
+WWW_OBJS        = mdocml.tar.gz \
+                  mdocml.sha256

 
 

-www: index.html
+www: $(WWW_OBJS) $(WWW_MANS)

 
 

-lint: llib-lmandoc.ln llib-lpreconv.ln llib-ldemandoc.ln $(DBLN)
+# === TARGETS CONTAINING SHELL COMMANDS ================================

 
 clean:
        rm -f libmandoc.a $(LIBMANDOC_OBJS)
 
 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 apropos $(APROPOS_OBJS)

-       rm -f llib-lapropos.ln $(APROPOS_LNS)
+       rm -f makewhatis $(MAKEWHATIS_OBJS)
+       rm -f preconv $(PRECONV_OBJS)

        rm -f man.cgi $(CGI_OBJS)
        rm -f man.cgi $(CGI_OBJS)

-       rm -f llib-lman.cgi.ln $(CGI_LNS)
+       rm -f manpage $(MANPAGE_OBJS)

        rm -f demandoc $(DEMANDOC_OBJS)
        rm -f demandoc $(DEMANDOC_OBJS)

-       rm -f llib-ldemandoc.ln $(DEMANDOC_LNS)

        rm -f mandoc $(MANDOC_OBJS)
        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 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 -f config.h config.log $(COMPAT_OBJS)
+       rm -f $(WWW_MANS) $(WWW_OBJS)
+       rm -rf *.dSYM

 
 install: all
        mkdir -p $(DESTDIR)$(BINDIR)
 
 install: all
        mkdir -p $(DESTDIR)$(BINDIR)


@@ -399,157 +361,83 @@ install: all
        mkdir -p $(DESTDIR)$(INCLUDEDIR)
        mkdir -p $(DESTDIR)$(MANDIR)/man1
        mkdir -p $(DESTDIR)$(MANDIR)/man3
        mkdir -p $(DESTDIR)$(INCLUDEDIR)
        mkdir -p $(DESTDIR)$(MANDIR)/man1
        mkdir -p $(DESTDIR)$(MANDIR)/man3

+       mkdir -p $(DESTDIR)$(MANDIR)/man5

        mkdir -p $(DESTDIR)$(MANDIR)/man7
        mkdir -p $(DESTDIR)$(MANDIR)/man7

-       mkdir -p $(DESTDIR)$(MANDIR)/man8
-       $(INSTALL_PROGRAM) mandoc preconv demandoc $(DESTDIR)$(BINDIR)
+       $(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_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) man.7 mdoc.7 roff.7 eqn.7 tbl.7 mandoc_char.7 $(DESTDIR)$(MANDIR)/man7
+       $(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)
 
        $(INSTALL_DATA) example.style.css $(DESTDIR)$(EXAMPLEDIR)
 

+installcgi: all
+       mkdir -p $(DESTDIR)$(CGIBINDIR)
+       mkdir -p $(DESTDIR)$(HTDOCDIR)
+       mkdir -p $(DESTDIR)$(WWWPREFIX)/man/mandoc/man1
+       mkdir -p $(DESTDIR)$(WWWPREFIX)/man/mandoc/man8
+       $(INSTALL_PROGRAM) man.cgi $(DESTDIR)$(CGIBINDIR)
+       $(INSTALL_DATA) example.style.css $(DESTDIR)$(HTDOCDIR)/man.css
+       $(INSTALL_DATA) man-cgi.css $(DESTDIR)$(HTDOCDIR)
+       $(INSTALL_MAN) apropos.1 $(DESTDIR)$(WWWPREFIX)/man/mandoc/man1/
+       $(INSTALL_MAN) man.cgi.8 $(DESTDIR)$(WWWPREFIX)/man/mandoc/man8/
+

 installwww: www
 installwww: www

-       mkdir -p $(PREFIX)/snapshots
-       mkdir -p $(PREFIX)/binaries
-       $(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
+       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

 
 libmandoc.a: $(COMPAT_OBJS) $(LIBMANDOC_OBJS)
        $(AR) rs $@ $(COMPAT_OBJS) $(LIBMANDOC_OBJS)
 
 
 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
 
 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
+makewhatis: $(MAKEWHATIS_OBJS) libmandoc.a
+       $(CC) $(LDFLAGS) -o $@ $(MAKEWHATIS_OBJS) libmandoc.a $(DBLIB)

 
 preconv: $(PRECONV_OBJS)
        $(CC) $(LDFLAGS) -o $@ $(PRECONV_OBJS)
 
 
 preconv: $(PRECONV_OBJS)
        $(CC) $(LDFLAGS) -o $@ $(PRECONV_OBJS)
 

-llib-lpreconv.ln: $(PRECONV_LNS) llib-llibmandoc.ln
-       $(LINT) $(LINTFLAGS) -Cpreconv $(PRECONV_LNS) llib-llibmandoc.ln
+manpage: $(MANPAGE_OBJS) libmandoc.a
+       $(CC) $(LDFLAGS) -o $@ $(MANPAGE_OBJS) libmandoc.a $(DBLIB)

 
 apropos: $(APROPOS_OBJS) libmandoc.a
        $(CC) $(LDFLAGS) -o $@ $(APROPOS_OBJS) libmandoc.a $(DBLIB)
 
 
 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
-

 man.cgi: $(CGI_OBJS) libmandoc.a
 man.cgi: $(CGI_OBJS) libmandoc.a

-       $(CC) $(LDFLAGS) -o $@ $(CGI_OBJS) libmandoc.a $(DBLIB)
-
-llib-lman.cgi.ln: $(CGI_LNS) llib-llibmandoc.ln
-       $(LINT) $(LINTFLAGS) -Cman.cgi $(CGI_LNS) llib-llibmandoc.ln
+       $(CC) $(LDFLAGS) $(STATIC) -o $@ $(CGI_OBJS) libmandoc.a $(DBLIB)

 
 demandoc: $(DEMANDOC_OBJS) libmandoc.a
        $(CC) $(LDFLAGS) -o $@ $(DEMANDOC_OBJS) libmandoc.a
 
 
 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 >$@
+mdocml.sha256: mdocml.tar.gz
+       sha256 mdocml.tar.gz > $@

 
 mdocml.tar.gz: $(SRCS)
        mkdir -p .dist/mdocml-$(VERSION)/
        $(INSTALL_SOURCE) $(SRCS) .dist/mdocml-$(VERSION)
 
 mdocml.tar.gz: $(SRCS)
        mkdir -p .dist/mdocml-$(VERSION)/
        $(INSTALL_SOURCE) $(SRCS) .dist/mdocml-$(VERSION)

-       ( cd .dist/ && tar zcf ../$@ ./ )
+       chmod 755 .dist/mdocml-$(VERSION)/configure
+       ( cd .dist/ && tar zcf ../$@ mdocml-$(VERSION) )

        rm -rf .dist/
 
        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
        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 \
-       ) > $@
-
-.h.h.html:
-       highlight -I $< >$@
-
-.1.1.txt .3.3.txt .7.7.txt .8.8.txt:
-       ./mandoc -Tascii -Wall,stop $< | col -b >$@
+       CC="$(CC)" CFLAGS="$(CFLAGS)" VERSION="$(VERSION)" ./configure

 
 

-.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 $< >$@
+.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

 
 

-.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 $< >$@
+.h.h.html:
+       highlight -I $< > $@

 
 

-.sgml.html:
-       validate --warn $<
-       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=style.css,man=%N.%S.html,includes=%I.html $< > $@