]> git.cameronkatri.com Git - mandoc.git/blobdiff - Makefile
git.ckatri.com / mandoc.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Clarifications in comments and standard output suggested by
[mandoc.git] / Makefile
diff --git a/Makefile b/Makefile
index e7c1445209a6e8e884918ae54b7e494d902ba7dc..47f37a7dffc975ff31fb56de316deae60e9c5f79 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.425 2014/08/04 23:44:29 schwarze Exp $
+# $Id: Makefile,v 1.435 2014/08/10 02:45:04 schwarze Exp $
 #
 # Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
 # Copyright (c) 2011, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
 #
 # Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
 # Copyright (c) 2011, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -15,10 +15,12 @@
 # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 # 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
+VERSION                 = 1.13.1
 
 # === USER SETTINGS ====================================================
 
 
 # === USER SETTINGS ====================================================
 
+# --- user settings relevant for all builds ----------------------------
+
 # 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.
 #
@@ -32,136 +34,136 @@ VERSION            = 1.13.0
 #
 CFLAGS         += -DUSE_WCHAR
 
 #
 CFLAGS         += -DUSE_WCHAR
 
-# 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         += -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
 MANDIR          = $(PREFIX)/man
 EXAMPLEDIR      = $(PREFIX)/share/examples/mandoc
 BINDIR          = $(PREFIX)/bin
 INCLUDEDIR      = $(PREFIX)/include/mandoc
 LIBDIR          = $(PREFIX)/lib/mandoc
 MANDIR          = $(PREFIX)/man
 EXAMPLEDIR      = $(PREFIX)/share/examples/mandoc
+
 INSTALL                 = install
 INSTALL                 = install
-INSTALL_PROGRAM         = $(INSTALL) -m 0755
+INSTALL_PROGRAM         = $(INSTALL) -m 0555
 INSTALL_DATA    = $(INSTALL) -m 0444
 INSTALL_DATA    = $(INSTALL) -m 0444
-INSTALL_LIB     = $(INSTALL) -m 0644
+INSTALL_LIB     = $(INSTALL) -m 0444
 INSTALL_SOURCE  = $(INSTALL) -m 0644
 INSTALL_MAN     = $(INSTALL_DATA)
 
 INSTALL_SOURCE  = $(INSTALL) -m 0644
 INSTALL_MAN     = $(INSTALL_DATA)
 
-# 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
+# --- user settings related to database support ------------------------
+
+# Building apropos(1) and makewhatis(8) requires both SQLite3 and fts(3).
+# To avoid those dependencies, comment the following line.
+# Be careful: the fts(3) implementation in glibc is broken on 32bit
+# machines, see: https://sourceware.org/bugzilla/show_bug.cgi?id=15838
+#
+BUILD_TARGETS  += db-build
+
+# The remaining settings in this section
+# are only relevant if db-build is enabled.
+# Otherwise, they have no effect either way.
+
+# If your system has manpath(1), uncomment this.  This is most any
+# system that's not OpenBSD or NetBSD.  If uncommented, apropos(1)
+# and makewhatis(8) will use manpath(1) to get the MANPATH variable.
+#
+#CFLAGS                += -DUSE_MANPATH
 
 
-# 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
+# On some systems, SQLite3 may be installed below /usr/local.
+# In that case, uncomment the following two lines.
+#
+#CFLAGS                += -I/usr/local/include
+#DBLIB         += -L/usr/local/lib
 
 # OpenBSD has the ohash functions in libutil.
 # Comment the following line if your system doesn't.
 
 # OpenBSD has the ohash functions in libutil.
 # Comment the following line if your system doesn't.
+#
 DBLIB          += -lutil
 
 DBLIB          += -lutil
 
+SBINDIR                 = $(PREFIX)/sbin
+
+# --- user settings related to man.cgi ---------------------------------
+
+# To build man.cgi, copy cgi.h.example to cgi.h, edit it,
+# and enable the following line.
+# Obviously, this requires that db-build is enabled, too.
+#
+#BUILD_TARGETS += cgi-build
+
+# The remaining settings in this section
+# are only relevant if cgi-build is enabled.
+# Otherwise, they have no effect either way.
+
+# If your system does not support static binaries, comment this,
+# for example on Mac OS X.
+#
+STATIC          = -static
+
+# Linux requires -pthread for statical linking.
+#
+#STATIC                += -pthread
+
+WWWPREFIX       = /var/www
+HTDOCDIR        = $(WWWPREFIX)/htdocs
+CGIBINDIR       = $(WWWPREFIX)/cgi-bin
+
 # === END OF USER SETTINGS =============================================
 
 # === END OF USER SETTINGS =============================================
 
-ALLBIN          = mandoc preconv demandoc $(DBBIN)
+INSTALL_TARGETS         = $(BUILD_TARGETS:-build=-install)
+
+BASEBIN                 = mandoc preconv demandoc
+DBBIN           = apropos makewhatis
+CGIBIN          = man.cgi
 
 
-all: $(ALLBIN)
+DBLIB          += -lsqlite3
 
 TESTSRCS        = test-fgetln.c \
                   test-getsubopt.c \
                   test-mmap.c \
                   test-ohash.c \
                   test-reallocarray.c \
 
 TESTSRCS        = test-fgetln.c \
                   test-getsubopt.c \
                   test-mmap.c \
                   test-ohash.c \
                   test-reallocarray.c \
+                  test-sqlite3_errstr.c \
+                  test-strcasestr.c \
                   test-strlcat.c \
                   test-strlcpy.c \
                   test-strlcat.c \
                   test-strlcpy.c \
-                  test-strptime.c
+                  test-strptime.c \
+                  test-strsep.c
 
 
-SRCS            = LICENSE \
-                  Makefile \
-                  NEWS \
-                  TODO \
-                  apropos.1 \
-                  apropos.c \
+SRCS            = apropos.c \
                   arch.c \
                   arch.c \
-                  arch.in \
                   att.c \
                   att.c \
-                  att.in \
                   cgi.c \
                   chars.c \
                   cgi.c \
                   chars.c \
-                  chars.in \
                   compat_fgetln.c \
                   compat_getsubopt.c \
                   compat_ohash.c \
                   compat_fgetln.c \
                   compat_getsubopt.c \
                   compat_ohash.c \
-                  compat_ohash.h \
                   compat_reallocarray.c \
                   compat_reallocarray.c \
+                  compat_sqlite3_errstr.c \
                   compat_strcasestr.c \
                   compat_strlcat.c \
                   compat_strlcpy.c \
                   compat_strsep.c \
                   compat_strcasestr.c \
                   compat_strlcat.c \
                   compat_strlcpy.c \
                   compat_strsep.c \
-                  config.h.post \
-                  config.h.pre \
-                  configure \
-                  demandoc.1 \
                   demandoc.c \
                   demandoc.c \
-                  eqn.7 \
                   eqn.c \
                   eqn_html.c \
                   eqn_term.c \
                   eqn.c \
                   eqn_html.c \
                   eqn_term.c \
-                  example.style.css \
-                  gmdiff \
                   html.c \
                   html.c \
-                  html.h \
                   lib.c \
                   lib.c \
-                  lib.in \
-                  libman.h \
-                  libmandoc.h \
-                  libmdoc.h \
-                  libroff.h \
                   main.c \
                   main.c \
-                  main.h \
-                  makewhatis.8 \
-                  man.7 \
                   man.c \
                   man.c \
-                  man.cgi.8 \
-                  man-cgi.css \
-                  man.h \
                   man_hash.c \
                   man_html.c \
                   man_macro.c \
                   man_term.c \
                   man_validate.c \
                   man_hash.c \
                   man_html.c \
                   man_macro.c \
                   man_term.c \
                   man_validate.c \
-                  mandoc.1 \
-                  mandoc.3 \
                   mandoc.c \
                   mandoc.c \
-                  mandoc.db.5 \
-                  mandoc.h \
                   mandoc_aux.c \
                   mandoc_aux.c \
-                  mandoc_aux.h \
-                  mandoc_char.7 \
                   mandocdb.c \
                   manpage.c \
                   manpath.c \
                   mandocdb.c \
                   manpage.c \
                   manpath.c \
-                  manpath.h \
-                  mansearch.3 \
                   mansearch.c \
                   mansearch.c \
-                  mansearch.h \
                   mansearch_const.c \
                   mansearch_const.c \
-                  mdoc.7 \
                   mdoc.c \
                   mdoc.c \
-                  mdoc.h \
                   mdoc_argv.c \
                   mdoc_hash.c \
                   mdoc_html.c \
                   mdoc_argv.c \
                   mdoc_hash.c \
                   mdoc_html.c \
@@ -170,20 +172,11 @@ SRCS               = LICENSE \
                   mdoc_term.c \
                   mdoc_validate.c \
                   msec.c \
                   mdoc_term.c \
                   mdoc_validate.c \
                   msec.c \
-                  msec.in \
                   out.c \
                   out.c \
-                  out.h \
-                  preconv.1 \
                   preconv.c \
                   preconv.c \
-                  predefs.in \
                   read.c \
                   read.c \
-                  roff.7 \
                   roff.c \
                   st.c \
                   roff.c \
                   st.c \
-                  st.in \
-                  style.css \
-                  tbl.3 \
-                  tbl.7 \
                   tbl.c \
                   tbl_data.c \
                   tbl_html.c \
                   tbl.c \
                   tbl_data.c \
                   tbl_html.c \
@@ -191,14 +184,71 @@ SRCS               = LICENSE \
                   tbl_opts.c \
                   tbl_term.c \
                   term.c \
                   tbl_opts.c \
                   tbl_term.c \
                   term.c \
-                  term.h \
                   term_ascii.c \
                   term_ps.c \
                   tree.c \
                   vol.c \
                   term_ascii.c \
                   term_ps.c \
                   tree.c \
                   vol.c \
-                  vol.in \
                   $(TESTSRCS)
 
                   $(TESTSRCS)
 
+DISTFILES       = INSTALL \
+                  LICENSE \
+                  Makefile \
+                  Makefile.depend \
+                  NEWS \
+                  TODO \
+                  apropos.1 \
+                  arch.in \
+                  att.in \
+                  cgi.h.example \
+                  chars.in \
+                  compat_ohash.h \
+                  config.h.post \
+                  config.h.pre \
+                  configure \
+                  demandoc.1 \
+                  eqn.7 \
+                  example.style.css \
+                  gmdiff \
+                  html.h \
+                  lib.in \
+                  libman.h \
+                  libmandoc.h \
+                  libmdoc.h \
+                  libroff.h \
+                  main.h \
+                  makewhatis.8 \
+                  man-cgi.css \
+                  man.7 \
+                  man.cgi.8 \
+                  man.h \
+                  mandoc.1 \
+                  mandoc.3 \
+                  mandoc.db.5 \
+                  mandoc.h \
+                  mandoc_aux.h \
+                  mandoc_char.7 \
+                  mandoc_escape.3 \
+                  mandoc_html.3 \
+                  mandoc_malloc.3 \
+                  manpath.h \
+                  mansearch.3 \
+                  mansearch.h \
+                  mchars_alloc.3 \
+                  mdoc.7 \
+                  mdoc.h \
+                  msec.in \
+                  out.h \
+                  preconv.1 \
+                  predefs.in \
+                  roff.7 \
+                  st.in \
+                  style.css \
+                  tbl.3 \
+                  tbl.7 \
+                  term.h \
+                  vol.in \
+                  $(SRCS)
+
 LIBMAN_OBJS     = man.o \
                   man_hash.o \
                   man_macro.o \
 LIBMAN_OBJS     = man.o \
                   man_hash.o \
                   man_macro.o \
@@ -235,35 +285,17 @@ COMPAT_OBJS        = compat_fgetln.o \
                   compat_getsubopt.o \
                   compat_ohash.o \
                   compat_reallocarray.o \
                   compat_getsubopt.o \
                   compat_ohash.o \
                   compat_reallocarray.o \
+                  compat_sqlite3_errstr.o \
                   compat_strcasestr.o \
                   compat_strlcat.o \
                   compat_strlcpy.o \
                   compat_strsep.o
 
                   compat_strcasestr.o \
                   compat_strlcat.o \
                   compat_strlcpy.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_OBJS): html.h
 
 MANDOC_MAN_OBJS  = mdoc_man.o
 
 
 MANDOC_MAN_OBJS  = mdoc_man.o
 
@@ -274,7 +306,6 @@ 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_OBJS): term.h
 
 MANDOC_OBJS     = $(MANDOC_HTML_OBJS) \
                   $(MANDOC_MAN_OBJS) \
 
 MANDOC_OBJS     = $(MANDOC_HTML_OBJS) \
                   $(MANDOC_MAN_OBJS) \
@@ -282,38 +313,33 @@ MANDOC_OBJS        = $(MANDOC_HTML_OBJS) \
                   main.o \
                   out.o \
                   tree.o
                   main.o \
                   out.o \
                   tree.o
-$(MANDOC_OBJS): main.h mandoc.h mandoc_aux.h mdoc.h man.h config.h out.h
 
 MAKEWHATIS_OBJS         = mandocdb.o mansearch_const.o manpath.o
 
 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_OBJS): config.h
 
 APROPOS_OBJS    = apropos.o mansearch.o mansearch_const.o manpath.o
 
 APROPOS_OBJS    = apropos.o mansearch.o mansearch_const.o manpath.o
-$(APROPOS_OBJS): config.h mandoc.h mandoc_aux.h manpath.h mansearch.h
 
 CGI_OBJS        = $(MANDOC_HTML_OBJS) \
                   cgi.o \
                   mansearch.o \
                   mansearch_const.o \
                   out.o
 
 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
 
 MANPAGE_OBJS    = manpage.o mansearch.o mansearch_const.o manpath.o
 
 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_OBJS): config.h mandoc.h man.h mdoc.h
 
 WWW_MANS        = apropos.1.html \
                   demandoc.1.html \
                   mandoc.1.html \
                   preconv.1.html \
                   mandoc.3.html \
 
 WWW_MANS        = apropos.1.html \
                   demandoc.1.html \
                   mandoc.1.html \
                   preconv.1.html \
                   mandoc.3.html \
+                  mandoc_escape.3.html \
+                  mandoc_html.3.html \
+                  mandoc_malloc.3.html \
                   mansearch.3.html \
                   mansearch.3.html \
+                  mchars_alloc.3.html \
                   tbl.3.html \
                   mandoc.db.5.html \
                   eqn.7.html \
                   tbl.3.html \
                   mandoc.db.5.html \
                   eqn.7.html \
@@ -334,8 +360,22 @@ WWW_MANS    = apropos.1.html \
 WWW_OBJS        = mdocml.tar.gz \
                   mdocml.sha256
 
 WWW_OBJS        = mdocml.tar.gz \
                   mdocml.sha256
 
+# === DEPENDENCY HANDLING ==============================================
+
+all: base-build $(BUILD_TARGETS)
+
+base-build: $(BASEBIN)
+
+db-build: $(DBBIN)
+
+cgi-build: $(CGIBIN)
+
+install: base-install $(INSTALL_TARGETS)
+
 www: $(WWW_OBJS) $(WWW_MANS)
 
 www: $(WWW_OBJS) $(WWW_MANS)
 
+include Makefile.depend
+
 # === TARGETS CONTAINING SHELL COMMANDS ================================
 
 clean:
 # === TARGETS CONTAINING SHELL COMMANDS ================================
 
 clean:
@@ -351,26 +391,43 @@ clean:
        rm -f $(WWW_MANS) $(WWW_OBJS)
        rm -rf *.dSYM
 
        rm -f $(WWW_MANS) $(WWW_OBJS)
        rm -rf *.dSYM
 
-install: all
+base-install: base-build
        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)$(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
        mkdir -p $(DESTDIR)$(MANDIR)/man7
-       $(INSTALL_PROGRAM) $(ALLBIN) $(DESTDIR)$(BINDIR)
+       $(INSTALL_PROGRAM) $(BASEBIN) $(DESTDIR)$(BINDIR)
        $(INSTALL_LIB) libmandoc.a $(DESTDIR)$(LIBDIR)
        $(INSTALL_LIB) libmandoc.a $(DESTDIR)$(LIBDIR)
-       $(INSTALL_LIB) man.h mdoc.h mandoc.h $(DESTDIR)$(INCLUDEDIR)
+       $(INSTALL_LIB) man.h mandoc.h mandoc_aux.h mdoc.h \
+               $(DESTDIR)$(INCLUDEDIR)
        $(INSTALL_MAN) mandoc.1 preconv.1 demandoc.1 $(DESTDIR)$(MANDIR)/man1
        $(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) mandoc.3 mandoc_escape.3 mandoc_malloc.3 \
+               mchars_alloc.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)
 
        $(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
+db-install: db-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
+       $(INSTALL_PROGRAM) apropos $(DESTDIR)$(BINDIR)
+       ln -f $(DESTDIR)$(BINDIR)/apropos $(DESTDIR)$(BINDIR)/whatis
+       $(INSTALL_PROGRAM) makewhatis $(DESTDIR)$(SBINDIR)
+       $(INSTALL_MAN) apropos.1 $(DESTDIR)$(MANDIR)/man1
+       ln -f $(DESTDIR)$(MANDIR)/man1/apropos.1 \
+               $(DESTDIR)$(MANDIR)/man1/whatis.1
+       $(INSTALL_MAN) mansearch.3 $(DESTDIR)$(MANDIR)/man3
+       $(INSTALL_MAN) mandoc.db.5 $(DESTDIR)$(MANDIR)/man5
+       $(INSTALL_MAN) makewhatis.8 $(DESTDIR)$(MANDIR)/man8
+
+cgi-install: cgi-build
        mkdir -p $(DESTDIR)$(CGIBINDIR)
        mkdir -p $(DESTDIR)$(HTDOCDIR)
        mkdir -p $(DESTDIR)$(WWWPREFIX)/man/mandoc/man1
        mkdir -p $(DESTDIR)$(CGIBINDIR)
        mkdir -p $(DESTDIR)$(HTDOCDIR)
        mkdir -p $(DESTDIR)$(WWWPREFIX)/man/mandoc/man1
@@ -381,7 +438,7 @@ installcgi: all
        $(INSTALL_MAN) apropos.1 $(DESTDIR)$(WWWPREFIX)/man/mandoc/man1/
        $(INSTALL_MAN) man.cgi.8 $(DESTDIR)$(WWWPREFIX)/man/mandoc/man8/
 
        $(INSTALL_MAN) apropos.1 $(DESTDIR)$(WWWPREFIX)/man/mandoc/man1/
        $(INSTALL_MAN) man.cgi.8 $(DESTDIR)$(WWWPREFIX)/man/mandoc/man8/
 
-installwww: www
+www-install: www
        mkdir -p $(DESTDIR)$(HTDOCDIR)/snapshots
        $(INSTALL_DATA) $(WWW_MANS) style.css $(DESTDIR)$(HTDOCDIR)
        $(INSTALL_DATA) $(WWW_OBJS) $(DESTDIR)$(HTDOCDIR)/snapshots
        mkdir -p $(DESTDIR)$(HTDOCDIR)/snapshots
        $(INSTALL_DATA) $(WWW_MANS) style.css $(DESTDIR)$(HTDOCDIR)
        $(INSTALL_DATA) $(WWW_OBJS) $(DESTDIR)$(HTDOCDIR)/snapshots
@@ -390,6 +447,12 @@ installwww: www
        $(INSTALL_DATA) mdocml.sha256 \
                $(DESTDIR)$(HTDOCDIR)/snapshots/mdocml-$(VERSION).sha256
 
        $(INSTALL_DATA) mdocml.sha256 \
                $(DESTDIR)$(HTDOCDIR)/snapshots/mdocml-$(VERSION).sha256
 
+depend: config.h
+       mkdep -f Makefile.depend $(CFLAGS) $(SRCS)
+       perl -e 'undef $$/; $$_ = <>; s|/usr/include/\S+||g; \
+               s|\\\n||g; s|  +| |g; print;' Makefile.depend > Makefile.tmp
+       mv Makefile.tmp Makefile.depend
+
 libmandoc.a: $(COMPAT_OBJS) $(LIBMANDOC_OBJS)
        $(AR) rs $@ $(COMPAT_OBJS) $(LIBMANDOC_OBJS)
 
 libmandoc.a: $(COMPAT_OBJS) $(LIBMANDOC_OBJS)
        $(AR) rs $@ $(COMPAT_OBJS) $(LIBMANDOC_OBJS)
 
@@ -417,18 +480,20 @@ demandoc: $(DEMANDOC_OBJS) libmandoc.a
 mdocml.sha256: mdocml.tar.gz
        sha256 mdocml.tar.gz > $@
 
 mdocml.sha256: mdocml.tar.gz
        sha256 mdocml.tar.gz > $@
 
-mdocml.tar.gz: $(SRCS)
+mdocml.tar.gz: $(DISTFILES)
        mkdir -p .dist/mdocml-$(VERSION)/
        mkdir -p .dist/mdocml-$(VERSION)/
-       $(INSTALL_SOURCE) $(SRCS) .dist/mdocml-$(VERSION)
+       $(INSTALL_SOURCE) $(DISTFILES) .dist/mdocml-$(VERSION)
        chmod 755 .dist/mdocml-$(VERSION)/configure
        ( cd .dist/ && tar zcf ../$@ mdocml-$(VERSION) )
        rm -rf .dist/
 
 config.h: configure config.h.pre config.h.post $(TESTSRCS)
        rm -f config.log
        chmod 755 .dist/mdocml-$(VERSION)/configure
        ( cd .dist/ && tar zcf ../$@ mdocml-$(VERSION) )
        rm -rf .dist/
 
 config.h: configure config.h.pre config.h.post $(TESTSRCS)
        rm -f config.log
-       CC="$(CC)" CFLAGS="$(CFLAGS)" VERSION="$(VERSION)" ./configure
+       CC="$(CC)" CFLAGS="$(CFLAGS)" DBLIB="$(DBLIB)" \
+               VERSION="$(VERSION)" ./configure
 
 
-.PHONY:         clean install installcgi installwww
+.PHONY:         base-install cgi-install db-install install www-install
+.PHONY:         clean depend
 .SUFFIXES:      .1       .3       .5       .7       .8       .h
 .SUFFIXES:      .1.html  .3.html  .5.html  .7.html  .8.html  .h.html
 
 .SUFFIXES:      .1       .3       .5       .7       .8       .h
 .SUFFIXES:      .1.html  .3.html  .5.html  .7.html  .8.html  .h.html
 
A git conversion mirror of mandoc.bsd.lv