]> 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
Implement line breaking of the generated HTML code at space characters
[mandoc.git] / Makefile
diff --git a/Makefile b/Makefile
index d26058da26ab82577f33ac528e7d4e09db2761b8..5c2657c39a950d6016e2c3a5c6fd90573a906cda 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
-# $Id: Makefile,v 1.467 2015/10/11 21:12:54 schwarze Exp $
+# $Id: Makefile,v 1.493 2016/11/19 15:24:51 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, 2015 Ingo Schwarze <schwarze@openbsd.org>
+# 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
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -15,23 +15,29 @@
 # 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.3
+VERSION = 1.14.0
 
 # === LIST OF FILES ====================================================
 
 
 # === LIST OF FILES ====================================================
 
-TESTSRCS        = test-dirent-namlen.c \
+TESTSRCS        = test-be32toh.c \
+                  test-dirent-namlen.c \
+                  test-EFTYPE.c \
                   test-err.c \
                   test-err.c \
-                  test-fgetln.c \
                   test-fts.c \
                   test-fts.c \
+                  test-getline.c \
                   test-getsubopt.c \
                   test-isblank.c \
                   test-mkdtemp.c \
                   test-getsubopt.c \
                   test-isblank.c \
                   test-mkdtemp.c \
-                  test-mmap.c \
+                  test-nanosleep.c \
+                  test-ntohl.c \
                   test-ohash.c \
                   test-ohash.c \
+                  test-PATH_MAX.c \
+                  test-pledge.c \
                   test-progname.c \
                   test-reallocarray.c \
                   test-progname.c \
                   test-reallocarray.c \
-                  test-sqlite3.c \
-                  test-sqlite3_errstr.c \
+                  test-rewb-bsd.c \
+                  test-rewb-sysv.c \
+                  test-sandbox_init.c \
                   test-strcasestr.c \
                   test-stringlist.c \
                   test-strlcat.c \
                   test-strcasestr.c \
                   test-stringlist.c \
                   test-strlcat.c \
@@ -46,14 +52,14 @@ SRCS                 = att.c \
                   cgi.c \
                   chars.c \
                   compat_err.c \
                   cgi.c \
                   chars.c \
                   compat_err.c \
-                  compat_fgetln.c \
                   compat_fts.c \
                   compat_fts.c \
+                  compat_getline.c \
                   compat_getsubopt.c \
                   compat_isblank.c \
                   compat_mkdtemp.c \
                   compat_ohash.c \
                   compat_getsubopt.c \
                   compat_isblank.c \
                   compat_mkdtemp.c \
                   compat_ohash.c \
+                  compat_progname.c \
                   compat_reallocarray.c \
                   compat_reallocarray.c \
-                  compat_sqlite3_errstr.c \
                   compat_strcasestr.c \
                   compat_stringlist.c \
                   compat_strlcat.c \
                   compat_strcasestr.c \
                   compat_stringlist.c \
                   compat_strlcat.c \
@@ -61,6 +67,12 @@ SRCS          = att.c \
                   compat_strsep.c \
                   compat_strtonum.c \
                   compat_vasprintf.c \
                   compat_strsep.c \
                   compat_strtonum.c \
                   compat_vasprintf.c \
+                  dba.c \
+                  dba_array.c \
+                  dba_read.c \
+                  dba_write.c \
+                  dbm.c \
+                  dbm_map.c \
                   demandoc.c \
                   eqn.c \
                   eqn_html.c \
                   demandoc.c \
                   eqn.c \
                   eqn_html.c \
@@ -76,17 +88,18 @@ SRCS                 = att.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 \
                   mansearch.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.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 \
                   mdoc_term.c \
                   mdoc_validate.c \
                   msec.c \
@@ -116,15 +129,18 @@ DISTFILES  = INSTALL \
                   TODO \
                   apropos.1 \
                   cgi.h.example \
                   TODO \
                   apropos.1 \
                   cgi.h.example \
-                  chars.in \
                   compat_fts.h \
                   compat_ohash.h \
                   compat_stringlist.h \
                   configure \
                   configure.local.example \
                   compat_fts.h \
                   compat_ohash.h \
                   compat_stringlist.h \
                   configure \
                   configure.local.example \
+                  dba.h \
+                  dba_array.h \
+                  dba_write.h \
+                  dbm.h \
+                  dbm_map.h \
                   demandoc.1 \
                   eqn.7 \
                   demandoc.1 \
                   eqn.7 \
-                  example.style.css \
                   gmdiff \
                   html.h \
                   lib.in \
                   gmdiff \
                   html.h \
                   lib.in \
@@ -134,15 +150,16 @@ DISTFILES  = INSTALL \
                   libroff.h \
                   main.h \
                   makewhatis.8 \
                   libroff.h \
                   main.h \
                   makewhatis.8 \
-                  man-cgi.css \
                   man.1 \
                   man.7 \
                   man.1 \
                   man.7 \
+                  man.cgi.3 \
                   man.cgi.8 \
                   man.conf.5 \
                   man.h \
                   manconf.h \
                   mandoc.1 \
                   mandoc.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.db.5 \
                   mandoc.h \
                   mandoc_aux.h \
@@ -151,6 +168,7 @@ DISTFILES    = INSTALL \
                   mandoc_headers.3 \
                   mandoc_html.3 \
                   mandoc_malloc.3 \
                   mandoc_headers.3 \
                   mandoc_html.3 \
                   mandoc_malloc.3 \
+                  mandoc_ohash.h \
                   mansearch.3 \
                   mansearch.h \
                   mchars_alloc.3 \
                   mansearch.3 \
                   mansearch.h \
                   mchars_alloc.3 \
@@ -161,9 +179,9 @@ DISTFILES    = INSTALL \
                   predefs.in \
                   roff.7 \
                   roff.h \
                   predefs.in \
                   roff.7 \
                   roff.h \
+                  roff_int.h \
                   soelim.1 \
                   st.in \
                   soelim.1 \
                   st.in \
-                  style.css \
                   tag.h \
                   tbl.3 \
                   tbl.7 \
                   tag.h \
                   tbl.3 \
                   tbl.7 \
@@ -182,6 +200,7 @@ LIBMDOC_OBJS         = att.o \
                   mdoc_argv.o \
                   mdoc_hash.o \
                   mdoc_macro.o \
                   mdoc_argv.o \
                   mdoc_hash.o \
                   mdoc_macro.o \
+                  mdoc_state.o \
                   mdoc_validate.o \
                   st.o
 
                   mdoc_validate.o \
                   st.o
 
@@ -198,19 +217,20 @@ LIBMANDOC_OBJS     = $(LIBMAN_OBJS) \
                   chars.o \
                   mandoc.o \
                   mandoc_aux.o \
                   chars.o \
                   mandoc.o \
                   mandoc_aux.o \
+                  mandoc_ohash.o \
                   msec.o \
                   preconv.o \
                   read.o
 
 COMPAT_OBJS     = compat_err.o \
                   msec.o \
                   preconv.o \
                   read.o
 
 COMPAT_OBJS     = compat_err.o \
-                  compat_fgetln.o \
                   compat_fts.o \
                   compat_fts.o \
+                  compat_getline.o \
                   compat_getsubopt.o \
                   compat_isblank.o \
                   compat_mkdtemp.o \
                   compat_ohash.o \
                   compat_getsubopt.o \
                   compat_isblank.o \
                   compat_mkdtemp.o \
                   compat_ohash.o \
+                  compat_progname.o \
                   compat_reallocarray.o \
                   compat_reallocarray.o \
-                  compat_sqlite3_errstr.o \
                   compat_strcasestr.o \
                   compat_strlcat.o \
                   compat_strlcpy.o \
                   compat_strcasestr.o \
                   compat_strlcat.o \
                   compat_strlcpy.o \
@@ -234,32 +254,44 @@ MANDOC_TERM_OBJS = eqn_term.o \
                   term_ps.o \
                   tbl_term.o
 
                   term_ps.o \
                   tbl_term.o
 
-BASE_OBJS       = $(MANDOC_HTML_OBJS) \
+DBM_OBJS        = dbm.o \
+                  dbm_map.o \
+                  mansearch.o
+
+DBA_OBJS        = dba.o \
+                  dba_array.o \
+                  dba_read.o \
+                  dba_write.o \
+                  mandocdb.o
+
+MAIN_OBJS       = $(MANDOC_HTML_OBJS) \
                   $(MANDOC_MAN_OBJS) \
                   $(MANDOC_TERM_OBJS) \
                   $(MANDOC_MAN_OBJS) \
                   $(MANDOC_TERM_OBJS) \
+                  $(DBM_OBJS) \
+                  $(DBA_OBJS) \
                   main.o \
                   manpath.o \
                   out.o \
                   tag.o \
                   tree.o
 
                   main.o \
                   manpath.o \
                   out.o \
                   tag.o \
                   tree.o
 
-MAIN_OBJS       = $(BASE_OBJS)
-
-DB_OBJS                 = mandocdb.o \
-                  mansearch.o \
-                  mansearch_const.o
-
 CGI_OBJS        = $(MANDOC_HTML_OBJS) \
 CGI_OBJS        = $(MANDOC_HTML_OBJS) \
+                  $(DBM_OBJS) \
                   cgi.o \
                   cgi.o \
-                  mansearch.o \
-                  mansearch_const.o \
                   out.o
 
                   out.o
 
-MANPAGE_OBJS    = manpage.o mansearch.o mansearch_const.o manpath.o
+MANPAGE_OBJS    = $(DBM_OBJS) \
+                  manpage.o \
+                  manpath.o
 
 DEMANDOC_OBJS   = demandoc.o
 
 
 DEMANDOC_OBJS   = demandoc.o
 
-SOELIM_OBJS     = soelim.o compat_stringlist.o
+SOELIM_OBJS     = soelim.o \
+                  compat_err.o \
+                  compat_getline.o \
+                  compat_progname.o \
+                  compat_reallocarray.o \
+                  compat_stringlist.o
 
 WWW_MANS        = apropos.1.html \
                   demandoc.1.html \
 
 WWW_MANS        = apropos.1.html \
                   demandoc.1.html \
@@ -283,6 +315,7 @@ WWW_MANS     = apropos.1.html \
                   roff.7.html \
                   tbl.7.html \
                   makewhatis.8.html \
                   roff.7.html \
                   tbl.7.html \
                   makewhatis.8.html \
+                  man.cgi.3.html \
                   man.cgi.8.html \
                   man.h.html \
                   manconf.h.html \
                   man.cgi.8.html \
                   man.h.html \
                   manconf.h.html \
@@ -313,7 +346,7 @@ www: $(WWW_OBJS) $(WWW_MANS)
 
 $(WWW_MANS): mandoc
 
 
 $(WWW_MANS): mandoc
 
-.PHONY: base-install cgi-install db-install install www-install
+.PHONY: base-install cgi-install install www-install
 .PHONY: clean distclean depend
 
 include Makefile.depend
 .PHONY: clean distclean depend
 
 include Makefile.depend
@@ -325,7 +358,7 @@ distclean: clean
 
 clean:
        rm -f libmandoc.a $(LIBMANDOC_OBJS) $(COMPAT_OBJS)
 
 clean:
        rm -f libmandoc.a $(LIBMANDOC_OBJS) $(COMPAT_OBJS)
-       rm -f mandoc $(BASE_OBJS) $(DB_OBJS)
+       rm -f mandoc $(MAIN_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)
@@ -334,89 +367,79 @@ clean:
        rm -rf *.dSYM
 
 base-install: base-build
        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)$(MANDIR)/man5
-       mkdir -p $(DESTDIR)$(MANDIR)/man7
-       $(INSTALL_PROGRAM) mandoc demandoc soelim $(DESTDIR)$(BINDIR)
-       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 soelim.1 $(DESTDIR)$(MANDIR)/man1
-       $(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
-       $(INSTALL_DATA) example.style.css $(DESTDIR)$(EXAMPLEDIR)
-
-db-install: base-build
        mkdir -p $(DESTDIR)$(BINDIR)
        mkdir -p $(DESTDIR)$(SBINDIR)
        mkdir -p $(DESTDIR)$(MANDIR)/man1
        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)/man5
+       mkdir -p $(DESTDIR)$(MANDIR)/man7
        mkdir -p $(DESTDIR)$(MANDIR)/man8
        mkdir -p $(DESTDIR)$(MANDIR)/man8
+       $(INSTALL_PROGRAM) mandoc demandoc $(DESTDIR)$(BINDIR)
+       $(INSTALL_PROGRAM) soelim $(DESTDIR)$(BINDIR)/$(BINM_SOELIM)
+       ln -f $(DESTDIR)$(BINDIR)/mandoc $(DESTDIR)$(BINDIR)/$(BINM_MAN)
        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)
        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) 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) apropos.1 $(DESTDIR)$(MANDIR)/man1/$(BINM_APROPOS).1
        ln -f $(DESTDIR)$(MANDIR)/man1/$(BINM_APROPOS).1 \
                $(DESTDIR)$(MANDIR)/man1/$(BINM_WHATIS).1
        $(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) man.conf.5 $(DESTDIR)$(MANDIR)/man5/${MANM_MANCONF}.5
        $(INSTALL_MAN) mandoc.db.5 $(DESTDIR)$(MANDIR)/man5
        $(INSTALL_MAN) mandoc.db.5 $(DESTDIR)$(MANDIR)/man5
+       $(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
        $(INSTALL_MAN) makewhatis.8 \
                $(DESTDIR)$(MANDIR)/man8/$(BINM_MAKEWHATIS).8
 
        $(INSTALL_MAN) makewhatis.8 \
                $(DESTDIR)$(MANDIR)/man8/$(BINM_MAKEWHATIS).8
 
+lib-install: base-build
+       mkdir -p $(DESTDIR)$(LIBDIR)
+       mkdir -p $(DESTDIR)$(INCLUDEDIR)
+       mkdir -p $(DESTDIR)$(MANDIR)/man3
+       $(INSTALL_LIB) libmandoc.a $(DESTDIR)$(LIBDIR)
+       $(INSTALL_LIB) man.h mandoc.h mandoc_aux.h mdoc.h roff.h \
+               $(DESTDIR)$(INCLUDEDIR)
+       $(INSTALL_MAN) mandoc.3 mandoc_escape.3 mandoc_malloc.3 \
+               mansearch.3 mchars_alloc.3 tbl.3 $(DESTDIR)$(MANDIR)/man3
+
 cgi-install: cgi-build
        mkdir -p $(DESTDIR)$(CGIBINDIR)
        mkdir -p $(DESTDIR)$(HTDOCDIR)
 cgi-install: cgi-build
        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_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/
+       $(INSTALL_DATA) mandoc.css $(DESTDIR)$(HTDOCDIR)
 
 Makefile.local config.h: configure ${TESTSRCS}
        @echo "$@ is out of date; please run ./configure"
        @exit 1
 
 libmandoc.a: $(COMPAT_OBJS) $(LIBMANDOC_OBJS)
 
 Makefile.local config.h: configure ${TESTSRCS}
        @echo "$@ is out of date; please run ./configure"
        @exit 1
 
 libmandoc.a: $(COMPAT_OBJS) $(LIBMANDOC_OBJS)
-       $(AR) rs $@ $(COMPAT_OBJS) $(LIBMANDOC_OBJS)
+       ar rs $@ $(COMPAT_OBJS) $(LIBMANDOC_OBJS)
 
 mandoc: $(MAIN_OBJS) libmandoc.a
 
 mandoc: $(MAIN_OBJS) libmandoc.a
-       $(CC) $(LDFLAGS) -o $@ $(MAIN_OBJS) libmandoc.a $(DBLIB)
+       $(CC) -o $@ $(LDFLAGS) $(MAIN_OBJS) libmandoc.a $(LDADD)
 
 manpage: $(MANPAGE_OBJS) libmandoc.a
 
 manpage: $(MANPAGE_OBJS) libmandoc.a
-       $(CC) $(LDFLAGS) -o $@ $(MANPAGE_OBJS) libmandoc.a $(DBLIB)
+       $(CC) -o $@ $(LDFLAGS) $(MANPAGE_OBJS) libmandoc.a $(LDADD)
 
 man.cgi: $(CGI_OBJS) libmandoc.a
 
 man.cgi: $(CGI_OBJS) libmandoc.a
-       $(CC) $(LDFLAGS) $(STATIC) -o $@ $(CGI_OBJS) libmandoc.a $(DBLIB)
+       $(CC) $(STATIC) -o $@ $(LDFLAGS) $(CGI_OBJS) libmandoc.a $(LDADD)
 
 demandoc: $(DEMANDOC_OBJS) libmandoc.a
 
 demandoc: $(DEMANDOC_OBJS) libmandoc.a
-       $(CC) $(LDFLAGS) -o $@ $(DEMANDOC_OBJS) libmandoc.a -lz
+       $(CC) -o $@ $(LDFLAGS) $(DEMANDOC_OBJS) libmandoc.a $(LDADD)
 
 
-soelim: $(SOELIM_OBJS) compat_reallocarray.o
-       $(CC) $(LDFLAGS) -o $@ $(SOELIM_OBJS) compat_reallocarray.o
+soelim: $(SOELIM_OBJS)
+       $(CC) -o $@ $(LDFLAGS) $(SOELIM_OBJS)
 
 # --- maintainer targets ---
 
 www-install: www
        mkdir -p $(HTDOCDIR)/snapshots
 
 # --- maintainer targets ---
 
 www-install: www
        mkdir -p $(HTDOCDIR)/snapshots
-       $(INSTALL_DATA) $(WWW_MANS) style.css $(HTDOCDIR)
+       $(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) $(WWW_OBJS) $(HTDOCDIR)/snapshots
        $(INSTALL_DATA) mdocml.tar.gz \
                $(HTDOCDIR)/snapshots/mdocml-$(VERSION).tar.gz
@@ -430,6 +453,8 @@ depend: config.h
                Makefile.depend > Makefile.tmp
        mv Makefile.tmp Makefile.depend
 
                Makefile.depend > Makefile.tmp
        mv Makefile.tmp Makefile.depend
 
+dist: mdocml.sha256
+
 mdocml.sha256: mdocml.tar.gz
        sha256 mdocml.tar.gz > $@
 
 mdocml.sha256: mdocml.tar.gz
        sha256 mdocml.tar.gz > $@
 
@@ -450,4 +475,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