]> 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
Without HAVE_ERR, don't try to include <err.h>, it probably isn't there.
[mandoc.git] / Makefile
diff --git a/Makefile b/Makefile
index 381b364508c7c27571c740eddefec90df6d13265..91caa006c5fff57309ee6564bd32d762e6ace4a9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
-# $Id: Makefile,v 1.443 2014/08/21 00:42:38 schwarze Exp $
+# $Id: Makefile,v 1.476 2015/11/07 13:14:21 schwarze Exp $
 #
 # Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
 #
 # Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
-# Copyright (c) 2011, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
+# Copyright (c) 2011, 2013, 2014, 2015 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
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -15,40 +15,54 @@
 # 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.
 
-BASEBIN                 = mandoc preconv demandoc
-DBBIN           = makewhatis
-CGIBIN          = man.cgi
+VERSION = 1.13.3
+
+# === LIST OF FILES ====================================================
 
 TESTSRCS        = test-dirent-namlen.c \
 
 TESTSRCS        = test-dirent-namlen.c \
+                  test-err.c \
                   test-fgetln.c \
                   test-fts.c \
                   test-getsubopt.c \
                   test-fgetln.c \
                   test-fts.c \
                   test-getsubopt.c \
+                  test-isblank.c \
+                  test-mkdtemp.c \
                   test-mmap.c \
                   test-ohash.c \
                   test-mmap.c \
                   test-ohash.c \
+                  test-pledge.c \
+                  test-progname.c \
                   test-reallocarray.c \
                   test-sqlite3.c \
                   test-sqlite3_errstr.c \
                   test-strcasestr.c \
                   test-reallocarray.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-strlcat.c \
                   test-strlcpy.c \
                   test-strptime.c \
                   test-strsep.c \
+                  test-strtonum.c \
+                  test-vasprintf.c \
                   test-wchar.c
 
                   test-wchar.c
 
-SRCS            = arch.c \
-                  att.c \
+SRCS            = att.c \
                   cgi.c \
                   chars.c \
                   cgi.c \
                   chars.c \
+                  compat_err.c \
                   compat_fgetln.c \
                   compat_fts.c \
                   compat_getsubopt.c \
                   compat_fgetln.c \
                   compat_fts.c \
                   compat_getsubopt.c \
+                  compat_isblank.c \
+                  compat_mkdtemp.c \
                   compat_ohash.c \
                   compat_ohash.c \
+                  compat_progname.c \
                   compat_reallocarray.c \
                   compat_sqlite3_errstr.c \
                   compat_strcasestr.c \
                   compat_reallocarray.c \
                   compat_sqlite3_errstr.c \
                   compat_strcasestr.c \
+                  compat_stringlist.c \
                   compat_strlcat.c \
                   compat_strlcpy.c \
                   compat_strsep.c \
                   compat_strlcat.c \
                   compat_strlcpy.c \
                   compat_strsep.c \
+                  compat_strtonum.c \
+                  compat_vasprintf.c \
                   demandoc.c \
                   eqn.c \
                   eqn_html.c \
                   demandoc.c \
                   eqn.c \
                   eqn_html.c \
@@ -64,6 +78,7 @@ SRCS           = arch.c \
                   man_validate.c \
                   mandoc.c \
                   mandoc_aux.c \
                   man_validate.c \
                   mandoc.c \
                   mandoc_aux.c \
+                  mandoc_ohash.c \
                   mandocdb.c \
                   manpage.c \
                   manpath.c \
                   mandocdb.c \
                   manpage.c \
                   manpath.c \
@@ -75,6 +90,7 @@ SRCS           = arch.c \
                   mdoc_html.c \
                   mdoc_macro.c \
                   mdoc_man.c \
                   mdoc_html.c \
                   mdoc_macro.c \
                   mdoc_man.c \
+                  mdoc_state.c \
                   mdoc_term.c \
                   mdoc_validate.c \
                   msec.c \
                   mdoc_term.c \
                   mdoc_validate.c \
                   msec.c \
@@ -82,7 +98,9 @@ SRCS           = arch.c \
                   preconv.c \
                   read.c \
                   roff.c \
                   preconv.c \
                   read.c \
                   roff.c \
+                  soelim.c \
                   st.c \
                   st.c \
+                  tag.c \
                   tbl.c \
                   tbl_data.c \
                   tbl_html.c \
                   tbl.c \
                   tbl_data.c \
                   tbl_html.c \
@@ -92,9 +110,7 @@ SRCS          = arch.c \
                   term.c \
                   term_ascii.c \
                   term_ps.c \
                   term.c \
                   term_ascii.c \
                   term_ps.c \
-                  tree.c \
-                  vol.c \
-                  $(TESTSRCS)
+                  tree.c
 
 DISTFILES       = INSTALL \
                   LICENSE \
 
 DISTFILES       = INSTALL \
                   LICENSE \
@@ -103,17 +119,14 @@ DISTFILES  = INSTALL \
                   NEWS \
                   TODO \
                   apropos.1 \
                   NEWS \
                   TODO \
                   apropos.1 \
-                  arch.in \
-                  att.in \
                   cgi.h.example \
                   cgi.h.example \
-                  chars.in \
                   compat_fts.h \
                   compat_ohash.h \
                   compat_fts.h \
                   compat_ohash.h \
+                  compat_stringlist.h \
                   configure \
                   configure.local.example \
                   demandoc.1 \
                   eqn.7 \
                   configure \
                   configure.local.example \
                   demandoc.1 \
                   eqn.7 \
-                  example.style.css \
                   gmdiff \
                   html.h \
                   lib.in \
                   gmdiff \
                   html.h \
                   lib.in \
@@ -123,21 +136,24 @@ DISTFILES  = INSTALL \
                   libroff.h \
                   main.h \
                   makewhatis.8 \
                   libroff.h \
                   main.h \
                   makewhatis.8 \
-                  man-cgi.css \
                   man.1 \
                   man.7 \
                   man.cgi.8 \
                   man.1 \
                   man.7 \
                   man.cgi.8 \
+                  man.conf.5 \
                   man.h \
                   man.h \
+                  manconf.h \
                   mandoc.1 \
                   mandoc.3 \
                   mandoc.1 \
                   mandoc.3 \
+                  mandoc.css \
                   mandoc.db.5 \
                   mandoc.h \
                   mandoc_aux.h \
                   mandoc_char.7 \
                   mandoc_escape.3 \
                   mandoc.db.5 \
                   mandoc.h \
                   mandoc_aux.h \
                   mandoc_char.7 \
                   mandoc_escape.3 \
+                  mandoc_headers.3 \
                   mandoc_html.3 \
                   mandoc_malloc.3 \
                   mandoc_html.3 \
                   mandoc_malloc.3 \
-                  manpath.h \
+                  mandoc_ohash.h \
                   mansearch.3 \
                   mansearch.h \
                   mchars_alloc.3 \
                   mansearch.3 \
                   mansearch.h \
                   mchars_alloc.3 \
@@ -145,32 +161,32 @@ DISTFILES  = INSTALL \
                   mdoc.h \
                   msec.in \
                   out.h \
                   mdoc.h \
                   msec.in \
                   out.h \
-                  preconv.1 \
                   predefs.in \
                   roff.7 \
                   predefs.in \
                   roff.7 \
+                  roff.h \
+                  soelim.1 \
                   st.in \
                   st.in \
-                  style.css \
+                  tag.h \
                   tbl.3 \
                   tbl.7 \
                   term.h \
                   tbl.3 \
                   tbl.7 \
                   term.h \
-                  vol.in \
-                  $(SRCS)
+                  $(SRCS) \
+                  $(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
 
-LIBMDOC_OBJS    = arch.o \
-                  att.o \
+LIBMDOC_OBJS    = att.o \
                   lib.o \
                   mdoc.o \
                   mdoc_argv.o \
                   mdoc_hash.o \
                   mdoc_macro.o \
                   lib.o \
                   mdoc.o \
                   mdoc_argv.o \
                   mdoc_hash.o \
                   mdoc_macro.o \
+                  mdoc_state.o \
                   mdoc_validate.o \
                   mdoc_validate.o \
-                  st.o \
-                  vol.o
+                  st.o
 
 LIBROFF_OBJS    = eqn.o \
                   roff.o \
 
 LIBROFF_OBJS    = eqn.o \
                   roff.o \
@@ -185,19 +201,27 @@ LIBMANDOC_OBJS     = $(LIBMAN_OBJS) \
                   chars.o \
                   mandoc.o \
                   mandoc_aux.o \
                   chars.o \
                   mandoc.o \
                   mandoc_aux.o \
+                  mandoc_ohash.o \
                   msec.o \
                   msec.o \
+                  preconv.o \
                   read.o
 
                   read.o
 
-COMPAT_OBJS     = compat_fgetln.o \
+COMPAT_OBJS     = compat_err.o \
+                  compat_fgetln.o \
                   compat_fts.o \
                   compat_getsubopt.o \
                   compat_fts.o \
                   compat_getsubopt.o \
+                  compat_isblank.o \
+                  compat_mkdtemp.o \
                   compat_ohash.o \
                   compat_ohash.o \
+                  compat_progname.o \
                   compat_reallocarray.o \
                   compat_sqlite3_errstr.o \
                   compat_strcasestr.o \
                   compat_strlcat.o \
                   compat_strlcpy.o \
                   compat_reallocarray.o \
                   compat_sqlite3_errstr.o \
                   compat_strcasestr.o \
                   compat_strlcat.o \
                   compat_strlcpy.o \
-                  compat_strsep.o
+                  compat_strsep.o \
+                  compat_strtonum.o \
+                  compat_vasprintf.o
 
 MANDOC_HTML_OBJS = eqn_html.o \
                   html.o \
 
 MANDOC_HTML_OBJS = eqn_html.o \
                   html.o \
@@ -215,20 +239,20 @@ MANDOC_TERM_OBJS = eqn_term.o \
                   term_ps.o \
                   tbl_term.o
 
                   term_ps.o \
                   tbl_term.o
 
-MANDOC_OBJS     = $(MANDOC_HTML_OBJS) \
+BASE_OBJS       = $(MANDOC_HTML_OBJS) \
                   $(MANDOC_MAN_OBJS) \
                   $(MANDOC_TERM_OBJS) \
                   main.o \
                   $(MANDOC_MAN_OBJS) \
                   $(MANDOC_TERM_OBJS) \
                   main.o \
+                  manpath.o \
                   out.o \
                   out.o \
+                  tag.o \
                   tree.o
 
                   tree.o
 
-MAN_OBJS        = $(MANDOC_OBJS)
+MAIN_OBJS       = $(BASE_OBJS)
 
 
-MAKEWHATIS_OBJS         = mandocdb.o mansearch_const.o manpath.o
-
-PRECONV_OBJS    = preconv.o
-
-APROPOS_OBJS    = mansearch.o mansearch_const.o manpath.o
+DB_OBJS                 = mandocdb.o \
+                  mansearch.o \
+                  mansearch_const.o
 
 CGI_OBJS        = $(MANDOC_HTML_OBJS) \
                   cgi.o \
 
 CGI_OBJS        = $(MANDOC_HTML_OBJS) \
                   cgi.o \
@@ -240,18 +264,22 @@ MANPAGE_OBJS       = manpage.o mansearch.o mansearch_const.o manpath.o
 
 DEMANDOC_OBJS   = demandoc.o
 
 
 DEMANDOC_OBJS   = demandoc.o
 
+SOELIM_OBJS     = soelim.o compat_stringlist.o
+
 WWW_MANS        = apropos.1.html \
                   demandoc.1.html \
                   man.1.html \
                   mandoc.1.html \
 WWW_MANS        = apropos.1.html \
                   demandoc.1.html \
                   man.1.html \
                   mandoc.1.html \
-                  preconv.1.html \
+                  soelim.1.html \
                   mandoc.3.html \
                   mandoc_escape.3.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 \
                   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.db.5.html \
                   eqn.7.html \
                   man.7.html \
@@ -262,33 +290,37 @@ WWW_MANS   = apropos.1.html \
                   makewhatis.8.html \
                   man.cgi.8.html \
                   man.h.html \
                   makewhatis.8.html \
                   man.cgi.8.html \
                   man.h.html \
+                  manconf.h.html \
                   mandoc.h.html \
                   mandoc_aux.h.html \
                   mandoc.h.html \
                   mandoc_aux.h.html \
-                  manpath.h.html \
                   mansearch.h.html \
                   mansearch.h.html \
-                  mdoc.h.html
+                  mdoc.h.html \
+                  roff.h.html
 
 WWW_OBJS        = mdocml.tar.gz \
                   mdocml.sha256
 
 
 WWW_OBJS        = mdocml.tar.gz \
                   mdocml.sha256
 
-include Makefile.local
+# === USER CONFIGURATION ===============================================
 
 
-INSTALL_TARGETS         = $(BUILD_TARGETS:-build=-install)
+include Makefile.local
 
 # === DEPENDENCY HANDLING ==============================================
 
 all: base-build $(BUILD_TARGETS) Makefile.local
 
 
 # === DEPENDENCY HANDLING ==============================================
 
 all: base-build $(BUILD_TARGETS) Makefile.local
 
-base-build: $(BASEBIN)
+base-build: mandoc demandoc soelim
 
 
-db-build: $(DBBIN)
-
-cgi-build: $(CGIBIN)
+cgi-build: man.cgi
 
 install: base-install $(INSTALL_TARGETS)
 
 www: $(WWW_OBJS) $(WWW_MANS)
 
 
 install: base-install $(INSTALL_TARGETS)
 
 www: $(WWW_OBJS) $(WWW_MANS)
 
+$(WWW_MANS): mandoc
+
+.PHONY: base-install cgi-install db-install install www-install
+.PHONY: clean distclean depend
+
 include Makefile.depend
 
 # === TARGETS CONTAINING SHELL COMMANDS ================================
 include Makefile.depend
 
 # === TARGETS CONTAINING SHELL COMMANDS ================================
@@ -298,51 +330,59 @@ distclean: clean
 
 clean:
        rm -f libmandoc.a $(LIBMANDOC_OBJS) $(COMPAT_OBJS)
 
 clean:
        rm -f libmandoc.a $(LIBMANDOC_OBJS) $(COMPAT_OBJS)
-       rm -f mandoc $(MANDOC_OBJS) $(APROPOS_OBJS)
-       rm -f makewhatis $(MAKEWHATIS_OBJS)
-       rm -f preconv $(PRECONV_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 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
 
 base-install: base-build
        mkdir -p $(DESTDIR)$(BINDIR)
        rm -f $(WWW_MANS) $(WWW_OBJS)
        rm -rf *.dSYM
 
 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)$(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) $(BASEBIN) $(DESTDIR)$(BINDIR)
+       $(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) libmandoc.a $(DESTDIR)$(LIBDIR)
-       $(INSTALL_LIB) man.h mandoc.h mandoc_aux.h mdoc.h \
+       $(INSTALL_LIB) man.h mandoc.h mandoc_aux.h mdoc.h roff.h \
                $(DESTDIR)$(INCLUDEDIR)
                $(DESTDIR)$(INCLUDEDIR)
-       $(INSTALL_MAN) man.1 mandoc.1 preconv.1 demandoc.1 \
-               $(DESTDIR)$(MANDIR)/man1
+       $(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) 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)
-
-db-install: db-build
+       $(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
+
+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
        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)/apropos
-       ln -f $(DESTDIR)$(BINDIR)/mandoc $(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
+       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) mansearch.3 $(DESTDIR)$(MANDIR)/man3
        $(INSTALL_MAN) mandoc.db.5 $(DESTDIR)$(MANDIR)/man5
-       $(INSTALL_MAN) makewhatis.8 $(DESTDIR)$(MANDIR)/man8
+       $(INSTALL_MAN) makewhatis.8 \
+               $(DESTDIR)$(MANDIR)/man8/$(BINM_MAKEWHATIS).8
 
 cgi-install: cgi-build
        mkdir -p $(DESTDIR)$(CGIBINDIR)
 
 cgi-install: cgi-build
        mkdir -p $(DESTDIR)$(CGIBINDIR)
@@ -350,42 +390,19 @@ cgi-install: cgi-build
        mkdir -p $(DESTDIR)$(WWWPREFIX)/man/mandoc/man1
        mkdir -p $(DESTDIR)$(WWWPREFIX)/man/mandoc/man8
        $(INSTALL_PROGRAM) man.cgi $(DESTDIR)$(CGIBINDIR)
        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_DATA) mandoc.css $(DESTDIR)$(HTDOCDIR)
        $(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/
 
-www-install: www
-       mkdir -p $(DESTDIR)$(HTDOCDIR)/snapshots
-       $(INSTALL_DATA) $(WWW_MANS) style.css $(DESTDIR)$(HTDOCDIR)
-       $(INSTALL_DATA) $(WWW_OBJS) $(DESTDIR)$(HTDOCDIR)/snapshots
-       $(INSTALL_DATA) mdocml.tar.gz \
-               $(DESTDIR)$(HTDOCDIR)/snapshots/mdocml-$(VERSION).tar.gz
-       $(INSTALL_DATA) mdocml.sha256 \
-               $(DESTDIR)$(HTDOCDIR)/snapshots/mdocml-$(VERSION).sha256
-
 Makefile.local config.h: configure ${TESTSRCS}
        @echo "$@ is out of date; please run ./configure"
        @exit 1
 
 Makefile.local config.h: configure ${TESTSRCS}
        @echo "$@ is out of date; please run ./configure"
        @exit 1
 
-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
-
 libmandoc.a: $(COMPAT_OBJS) $(LIBMANDOC_OBJS)
        $(AR) rs $@ $(COMPAT_OBJS) $(LIBMANDOC_OBJS)
 
 libmandoc.a: $(COMPAT_OBJS) $(LIBMANDOC_OBJS)
        $(AR) rs $@ $(COMPAT_OBJS) $(LIBMANDOC_OBJS)
 
-mandoc: $(MAN_OBJS) libmandoc.a
-       $(CC) $(LDFLAGS) -o $@ $(MAN_OBJS) libmandoc.a $(DBLIB)
-
-makewhatis: $(MAKEWHATIS_OBJS) libmandoc.a
-       $(CC) $(LDFLAGS) -o $@ $(MAKEWHATIS_OBJS) libmandoc.a $(DBLIB)
-
-preconv: $(PRECONV_OBJS)
-       $(CC) $(LDFLAGS) -o $@ $(PRECONV_OBJS)
+mandoc: $(MAIN_OBJS) libmandoc.a
+       $(CC) $(LDFLAGS) -o $@ $(MAIN_OBJS) libmandoc.a $(DBLIB)
 
 manpage: $(MANPAGE_OBJS) libmandoc.a
        $(CC) $(LDFLAGS) -o $@ $(MANPAGE_OBJS) libmandoc.a $(DBLIB)
 
 manpage: $(MANPAGE_OBJS) libmandoc.a
        $(CC) $(LDFLAGS) -o $@ $(MANPAGE_OBJS) libmandoc.a $(DBLIB)
@@ -394,7 +411,28 @@ man.cgi: $(CGI_OBJS) libmandoc.a
        $(CC) $(LDFLAGS) $(STATIC) -o $@ $(CGI_OBJS) libmandoc.a $(DBLIB)
 
 demandoc: $(DEMANDOC_OBJS) libmandoc.a
        $(CC) $(LDFLAGS) $(STATIC) -o $@ $(CGI_OBJS) libmandoc.a $(DBLIB)
 
 demandoc: $(DEMANDOC_OBJS) libmandoc.a
-       $(CC) $(LDFLAGS) -o $@ $(DEMANDOC_OBJS) libmandoc.a
+       $(CC) $(LDFLAGS) -o $@ $(DEMANDOC_OBJS) libmandoc.a $(DBLIB)
+
+soelim: $(SOELIM_OBJS) compat_reallocarray.o
+       $(CC) $(LDFLAGS) -o $@ $(SOELIM_OBJS) compat_reallocarray.o
+
+# --- maintainer targets ---
+
+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
+
+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
 
 mdocml.sha256: mdocml.tar.gz
        sha256 mdocml.tar.gz > $@
 
 mdocml.sha256: mdocml.tar.gz
        sha256 mdocml.tar.gz > $@
@@ -406,8 +444,8 @@ mdocml.tar.gz: $(DISTFILES)
        ( cd .dist/ && tar zcf ../$@ mdocml-$(VERSION) )
        rm -rf .dist/
 
        ( cd .dist/ && tar zcf ../$@ mdocml-$(VERSION) )
        rm -rf .dist/
 
-.PHONY:         base-install cgi-install db-install install www-install
-.PHONY:         clean distclean depend
+# === SUFFIX RULES =====================================================
+
 .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
 
@@ -416,4 +454,4 @@ mdocml.tar.gz: $(DISTFILES)
 
 .1.1.html .3.3.html .5.5.html .7.7.html .8.8.html: mandoc
        ./mandoc -Thtml -Wall,stop \
 
 .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 $< > $@
+               -Ostyle=mandoc.css,man=%N.%S.html,includes=%I.html $< > $@
A git conversion mirror of mandoc.bsd.lv