]> 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
Minor correction: we render HTML character references hexadecimal,
[mandoc.git] / Makefile
diff --git a/Makefile b/Makefile
index cb2a20953320a7768d5f866e02bd1348568701a3..a9626643eaf908576d98db470257b0b4babf7951 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
-# $Id: Makefile,v 1.473 2015/11/06 16:30:33 schwarze Exp $
+# $Id: Makefile,v 1.518 2018/02/27 11:16:23 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-2017 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,27 +15,38 @@
 # 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.3
 
 # === LIST OF FILES ====================================================
 
 
 # === LIST OF FILES ====================================================
 
-TESTSRCS        = test-dirent-namlen.c \
+TESTSRCS        = test-be32toh.c \
+                  test-cmsg.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-O_DIRECTORY.c \
                   test-ohash.c \
                   test-ohash.c \
+                  test-PATH_MAX.c \
+                  test-pledge.c \
                   test-progname.c \
                   test-progname.c \
+                  test-recvmsg.c \
                   test-reallocarray.c \
                   test-reallocarray.c \
-                  test-sqlite3.c \
-                  test-sqlite3_errstr.c \
+                  test-recallocarray.c \
+                  test-rewb-bsd.c \
+                  test-rewb-sysv.c \
+                  test-sandbox_init.c \
                   test-strcasestr.c \
                   test-stringlist.c \
                   test-strlcat.c \
                   test-strlcpy.c \
                   test-strcasestr.c \
                   test-stringlist.c \
                   test-strlcat.c \
                   test-strlcpy.c \
+                  test-strndup.c \
                   test-strptime.c \
                   test-strsep.c \
                   test-strtonum.c \
                   test-strptime.c \
                   test-strsep.c \
                   test-strtonum.c \
@@ -43,25 +54,33 @@ TESTSRCS     = test-dirent-namlen.c \
                   test-wchar.c
 
 SRCS            = att.c \
                   test-wchar.c
 
 SRCS            = att.c \
+                  catman.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_progname.c \
                   compat_reallocarray.c \
                   compat_getsubopt.c \
                   compat_isblank.c \
                   compat_mkdtemp.c \
                   compat_ohash.c \
                   compat_progname.c \
                   compat_reallocarray.c \
-                  compat_sqlite3_errstr.c \
+                  compat_recallocarray.c \
                   compat_strcasestr.c \
                   compat_stringlist.c \
                   compat_strlcat.c \
                   compat_strlcpy.c \
                   compat_strcasestr.c \
                   compat_stringlist.c \
                   compat_strlcat.c \
                   compat_strlcpy.c \
+                  compat_strndup.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 \
@@ -70,7 +89,6 @@ SRCS           = att.c \
                   lib.c \
                   main.c \
                   man.c \
                   lib.c \
                   main.c \
                   man.c \
-                  man_hash.c \
                   man_html.c \
                   man_macro.c \
                   man_term.c \
                   man_html.c \
                   man_macro.c \
                   man_term.c \
@@ -78,17 +96,17 @@ SRCS                 = att.c \
                   mandoc.c \
                   mandoc_aux.c \
                   mandoc_ohash.c \
                   mandoc.c \
                   mandoc_aux.c \
                   mandoc_ohash.c \
+                  mandoc_xr.c \
+                  mandocd.c \
                   mandocdb.c \
                   mandocdb.c \
-                  manpage.c \
                   manpath.c \
                   mansearch.c \
                   manpath.c \
                   mansearch.c \
-                  mansearch_const.c \
                   mdoc.c \
                   mdoc_argv.c \
                   mdoc.c \
                   mdoc_argv.c \
-                  mdoc_hash.c \
                   mdoc_html.c \
                   mdoc_macro.c \
                   mdoc_man.c \
                   mdoc_html.c \
                   mdoc_macro.c \
                   mdoc_man.c \
+                  mdoc_markdown.c \
                   mdoc_state.c \
                   mdoc_term.c \
                   mdoc_validate.c \
                   mdoc_state.c \
                   mdoc_term.c \
                   mdoc_validate.c \
@@ -97,6 +115,9 @@ SRCS          = att.c \
                   preconv.c \
                   read.c \
                   roff.c \
                   preconv.c \
                   read.c \
                   roff.c \
+                  roff_html.c \
+                  roff_term.c \
+                  roff_validate.c \
                   soelim.c \
                   st.c \
                   tag.c \
                   soelim.c \
                   st.c \
                   tag.c \
@@ -109,6 +130,7 @@ SRCS                 = att.c \
                   term.c \
                   term_ascii.c \
                   term_ps.c \
                   term.c \
                   term_ascii.c \
                   term_ps.c \
+                  term_tab.c \
                   tree.c
 
 DISTFILES       = INSTALL \
                   tree.c
 
 DISTFILES       = INSTALL \
@@ -118,12 +140,18 @@ DISTFILES  = INSTALL \
                   NEWS \
                   TODO \
                   apropos.1 \
                   NEWS \
                   TODO \
                   apropos.1 \
+                  catman.8 \
                   cgi.h.example \
                   compat_fts.h \
                   compat_ohash.h \
                   compat_stringlist.h \
                   configure \
                   configure.local.example \
                   cgi.h.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 \
                   gmdiff \
                   demandoc.1 \
                   eqn.7 \
                   gmdiff \
@@ -137,9 +165,11 @@ DISTFILES   = INSTALL \
                   makewhatis.8 \
                   man.1 \
                   man.7 \
                   makewhatis.8 \
                   man.1 \
                   man.7 \
+                  man.cgi.3 \
                   man.cgi.8 \
                   man.conf.5 \
                   man.h \
                   man.cgi.8 \
                   man.conf.5 \
                   man.h \
+                  man.options.1 \
                   manconf.h \
                   mandoc.1 \
                   mandoc.3 \
                   manconf.h \
                   mandoc.1 \
                   mandoc.3 \
@@ -153,6 +183,8 @@ DISTFILES    = INSTALL \
                   mandoc_html.3 \
                   mandoc_malloc.3 \
                   mandoc_ohash.h \
                   mandoc_html.3 \
                   mandoc_malloc.3 \
                   mandoc_ohash.h \
+                  mandoc_xr.h \
+                  mandocd.8 \
                   mansearch.3 \
                   mansearch.h \
                   mchars_alloc.3 \
                   mansearch.3 \
                   mansearch.h \
                   mchars_alloc.3 \
@@ -163,6 +195,7 @@ DISTFILES    = INSTALL \
                   predefs.in \
                   roff.7 \
                   roff.h \
                   predefs.in \
                   roff.7 \
                   roff.h \
+                  roff_int.h \
                   soelim.1 \
                   st.in \
                   tag.h \
                   soelim.1 \
                   st.in \
                   tag.h \
@@ -173,7 +206,6 @@ DISTFILES    = INSTALL \
                   $(TESTSRCS)
 
 LIBMAN_OBJS     = man.o \
                   $(TESTSRCS)
 
 LIBMAN_OBJS     = man.o \
-                  man_hash.o \
                   man_macro.o \
                   man_validate.o
 
                   man_macro.o \
                   man_validate.o
 
@@ -181,7 +213,6 @@ LIBMDOC_OBJS         = att.o \
                   lib.o \
                   mdoc.o \
                   mdoc_argv.o \
                   lib.o \
                   mdoc.o \
                   mdoc_argv.o \
-                  mdoc_hash.o \
                   mdoc_macro.o \
                   mdoc_state.o \
                   mdoc_validate.o \
                   mdoc_macro.o \
                   mdoc_state.o \
                   mdoc_validate.o \
@@ -189,6 +220,7 @@ LIBMDOC_OBJS         = att.o \
 
 LIBROFF_OBJS    = eqn.o \
                   roff.o \
 
 LIBROFF_OBJS    = eqn.o \
                   roff.o \
+                  roff_validate.o \
                   tbl.o \
                   tbl_data.o \
                   tbl_layout.o \
                   tbl.o \
                   tbl_data.o \
                   tbl_layout.o \
@@ -201,23 +233,25 @@ LIBMANDOC_OBJS     = $(LIBMAN_OBJS) \
                   mandoc.o \
                   mandoc_aux.o \
                   mandoc_ohash.o \
                   mandoc.o \
                   mandoc_aux.o \
                   mandoc_ohash.o \
+                  mandoc_xr.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_progname.o \
                   compat_reallocarray.o \
                   compat_getsubopt.o \
                   compat_isblank.o \
                   compat_mkdtemp.o \
                   compat_ohash.o \
                   compat_progname.o \
                   compat_reallocarray.o \
-                  compat_sqlite3_errstr.o \
+                  compat_recallocarray.o \
                   compat_strcasestr.o \
                   compat_strlcat.o \
                   compat_strlcpy.o \
                   compat_strcasestr.o \
                   compat_strlcat.o \
                   compat_strlcpy.o \
+                  compat_strndup.o \
                   compat_strsep.o \
                   compat_strtonum.o \
                   compat_vasprintf.o
                   compat_strsep.o \
                   compat_strtonum.o \
                   compat_vasprintf.o
@@ -226,50 +260,68 @@ MANDOC_HTML_OBJS = eqn_html.o \
                   html.o \
                   man_html.o \
                   mdoc_html.o \
                   html.o \
                   man_html.o \
                   mdoc_html.o \
+                  roff_html.o \
                   tbl_html.o
 
                   tbl_html.o
 
-MANDOC_MAN_OBJS  = mdoc_man.o
-
 MANDOC_TERM_OBJS = eqn_term.o \
                   man_term.o \
                   mdoc_term.o \
 MANDOC_TERM_OBJS = eqn_term.o \
                   man_term.o \
                   mdoc_term.o \
+                  roff_term.o \
                   term.o \
                   term_ascii.o \
                   term_ps.o \
                   term.o \
                   term_ascii.o \
                   term_ps.o \
+                  term_tab.o \
                   tbl_term.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 \
                   main.o \
                   manpath.o \
+                  mdoc_man.o \
+                  mdoc_markdown.o \
                   out.o \
                   tag.o \
                   tree.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
+MANDOCD_OBJS    = $(MANDOC_HTML_OBJS) \
+                  $(MANDOC_TERM_OBJS) \
+                  mandocd.o \
+                  out.o \
+                  tag.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 \
                   man.1.html \
                   mandoc.1.html \
                   soelim.1.html \
 
 WWW_MANS        = apropos.1.html \
                   demandoc.1.html \
                   man.1.html \
                   mandoc.1.html \
                   soelim.1.html \
+                  man.cgi.3.html \
                   mandoc.3.html \
                   mandoc_escape.3.html \
                   mandoc_headers.3.html \
                   mandoc.3.html \
                   mandoc_escape.3.html \
                   mandoc_headers.3.html \
@@ -283,9 +335,11 @@ WWW_MANS    = apropos.1.html \
                   eqn.7.html \
                   man.7.html \
                   mandoc_char.7.html \
                   eqn.7.html \
                   man.7.html \
                   mandoc_char.7.html \
+                  mandocd.8.html \
                   mdoc.7.html \
                   roff.7.html \
                   tbl.7.html \
                   mdoc.7.html \
                   roff.7.html \
                   tbl.7.html \
+                  catman.8.html \
                   makewhatis.8.html \
                   man.cgi.8.html \
                   man.h.html \
                   makewhatis.8.html \
                   man.cgi.8.html \
                   man.h.html \
@@ -296,28 +350,21 @@ WWW_MANS   = apropos.1.html \
                   mdoc.h.html \
                   roff.h.html
 
                   mdoc.h.html \
                   roff.h.html
 
-WWW_OBJS        = mdocml.tar.gz \
-                  mdocml.sha256
-
 # === USER CONFIGURATION ===============================================
 
 include Makefile.local
 
 # === DEPENDENCY HANDLING ==============================================
 
 # === USER CONFIGURATION ===============================================
 
 include Makefile.local
 
 # === DEPENDENCY HANDLING ==============================================
 
-all: base-build $(BUILD_TARGETS) Makefile.local
-
-base-build: mandoc demandoc soelim
-
-cgi-build: man.cgi
+all: mandoc demandoc soelim $(BUILD_TARGETS) Makefile.local
 
 install: base-install $(INSTALL_TARGETS)
 
 
 install: base-install $(INSTALL_TARGETS)
 
-www: $(WWW_OBJS) $(WWW_MANS)
+www: $(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
@@ -329,101 +376,146 @@ 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 man.cgi $(CGI_OBJS)
-       rm -f manpage $(MANPAGE_OBJS)
+       rm -f mandocd catman catman.o $(MANDOCD_OBJS)
        rm -f demandoc $(DEMANDOC_OBJS)
        rm -f soelim $(SOELIM_OBJS)
        rm -f demandoc $(DEMANDOC_OBJS)
        rm -f soelim $(SOELIM_OBJS)
-       rm -f $(WWW_MANS) $(WWW_OBJS)
+       rm -f $(WWW_MANS) mandoc.tar.gz mandoc.sha256
        rm -rf *.dSYM
 
        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
-
-db-install: base-build
+base-install: mandoc demandoc soelim
        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
-       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_PROGRAM) mandoc demandoc $(DESTDIR)$(BINDIR)
+       $(INSTALL_PROGRAM) soelim $(DESTDIR)$(BINDIR)/$(BINM_SOELIM)
+       cd $(DESTDIR)$(BINDIR) && $(LN) mandoc $(BINM_MAN)
+       cd $(DESTDIR)$(BINDIR) && $(LN) mandoc $(BINM_APROPOS)
+       cd $(DESTDIR)$(BINDIR) && $(LN) mandoc $(BINM_WHATIS)
+       cd $(DESTDIR)$(SBINDIR) && \
+               $(LN) ${BIN_FROM_SBIN}/mandoc $(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
        $(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
+       cd $(DESTDIR)$(MANDIR)/man1 && $(LN) $(BINM_APROPOS).1 $(BINM_WHATIS).1
+       $(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
 
-cgi-install: cgi-build
+lib-install: libmandoc.a
+       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: man.cgi
        mkdir -p $(DESTDIR)$(CGIBINDIR)
        mkdir -p $(DESTDIR)$(HTDOCDIR)
        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) mandoc.css $(DESTDIR)$(HTDOCDIR)
        $(INSTALL_PROGRAM) man.cgi $(DESTDIR)$(CGIBINDIR)
        $(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/
 
 
-Makefile.local config.h: configure ${TESTSRCS}
+catman-install: mandocd catman
+       mkdir -p $(DESTDIR)$(SBINDIR)
+       mkdir -p $(DESTDIR)$(MANDIR)/man8
+       $(INSTALL_PROGRAM) mandocd $(DESTDIR)$(SBINDIR)
+       $(INSTALL_PROGRAM) catman $(DESTDIR)$(SBINDIR)/$(BINM_CATMAN)
+       $(INSTALL_MAN) mandocd.8 $(DESTDIR)$(MANDIR)/man8
+       $(INSTALL_MAN) catman.8 $(DESTDIR)$(MANDIR)/man8/$(BINM_CATMAN).8
+
+uninstall:
+       rm -f $(DESTDIR)$(BINDIR)/mandoc
+       rm -f $(DESTDIR)$(BINDIR)/demandoc
+       rm -f $(DESTDIR)$(BINDIR)/$(BINM_SOELIM)
+       rm -f $(DESTDIR)$(BINDIR)/$(BINM_MAN)
+       rm -f $(DESTDIR)$(BINDIR)/$(BINM_APROPOS)
+       rm -f $(DESTDIR)$(BINDIR)/$(BINM_WHATIS)
+       rm -f $(DESTDIR)$(SBINDIR)/$(BINM_MAKEWHATIS)
+       rm -f $(DESTDIR)$(MANDIR)/man1/mandoc.1
+       rm -f $(DESTDIR)$(MANDIR)/man1/demandoc.1
+       rm -f $(DESTDIR)$(MANDIR)/man1/$(BINM_SOELIM).1
+       rm -f $(DESTDIR)$(MANDIR)/man1/$(BINM_MAN).1
+       rm -f $(DESTDIR)$(MANDIR)/man1/$(BINM_APROPOS).1
+       rm -f $(DESTDIR)$(MANDIR)/man1/$(BINM_WHATIS).1
+       rm -f $(DESTDIR)$(MANDIR)/man5/$(MANM_MANCONF).5
+       rm -f $(DESTDIR)$(MANDIR)/man5/mandoc.db.5
+       rm -f $(DESTDIR)$(MANDIR)/man7/$(MANM_MAN).7
+       rm -f $(DESTDIR)$(MANDIR)/man7/$(MANM_MDOC).7
+       rm -f $(DESTDIR)$(MANDIR)/man7/$(MANM_ROFF).7
+       rm -f $(DESTDIR)$(MANDIR)/man7/$(MANM_EQN).7
+       rm -f $(DESTDIR)$(MANDIR)/man7/$(MANM_TBL).7
+       rm -f $(DESTDIR)$(MANDIR)/man7/mandoc_char.7
+       rm -f $(DESTDIR)$(MANDIR)/man8/$(BINM_MAKEWHATIS).8
+       rm -f $(DESTDIR)$(CGIBINDIR)/man.cgi
+       rm -f $(DESTDIR)$(HTDOCDIR)/mandoc.css
+       rm -f $(DESTDIR)$(SBINDIR)/mandocd
+       rm -f $(DESTDIR)$(SBINDIR)/$(BINM_CATMAN)
+       rm -f $(DESTDIR)$(MANDIR)/man8/mandocd.8
+       rm -f $(DESTDIR)$(MANDIR)/man8/$(BINM_CATMAN).8
+       rm -f $(DESTDIR)$(LIBDIR)/libmandoc.a
+       rm -f $(DESTDIR)$(MANDIR)/man3/mandoc.3
+       rm -f $(DESTDIR)$(MANDIR)/man3/mandoc_escape.3
+       rm -f $(DESTDIR)$(MANDIR)/man3/mandoc_malloc.3
+       rm -f $(DESTDIR)$(MANDIR)/man3/mansearch.3
+       rm -f $(DESTDIR)$(MANDIR)/man3/mchars_alloc.3
+       rm -f $(DESTDIR)$(MANDIR)/man3/tbl.3
+       rm -f $(DESTDIR)$(INCLUDEDIR)/man.h
+       rm -f $(DESTDIR)$(INCLUDEDIR)/mandoc.h
+       rm -f $(DESTDIR)$(INCLUDEDIR)/mandoc_aux.h
+       rm -f $(DESTDIR)$(INCLUDEDIR)/mdoc.h
+       rm -f $(DESTDIR)$(INCLUDEDIR)/roff.h
+       [ ! -e $(DESTDIR)$(INCLUDEDIR) ] || rmdir $(DESTDIR)$(INCLUDEDIR)
+
+regress: all
+       cd regress && ./regress.pl
+
+regress-clean:
+       cd regress && ./regress.pl . clean
+
+Makefile.local config.h: configure $(TESTSRCS)
        @echo "$@ is out of date; please run ./configure"
        @exit 1
 
 libmandoc.a: $(COMPAT_OBJS) $(LIBMANDOC_OBJS)
        @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)
-
-manpage: $(MANPAGE_OBJS) libmandoc.a
-       $(CC) $(LDFLAGS) -o $@ $(MANPAGE_OBJS) libmandoc.a $(DBLIB)
+       $(CC) -o $@ $(LDFLAGS) $(MAIN_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)
+
+mandocd: $(MANDOCD_OBJS) libmandoc.a
+       $(CC) -o $@ $(LDFLAGS) $(MANDOCD_OBJS) libmandoc.a $(LDADD)
+
+catman: catman.o libmandoc.a
+       $(CC) -o $@ $(LDFLAGS) catman.o libmandoc.a $(LDADD)
 
 demandoc: $(DEMANDOC_OBJS) libmandoc.a
 
 demandoc: $(DEMANDOC_OBJS) libmandoc.a
-       $(CC) $(LDFLAGS) -o $@ $(DEMANDOC_OBJS) libmandoc.a $(DBLIB)
+       $(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
 
 # --- maintainer targets ---
 
 www-install: www
-       mkdir -p $(HTDOCDIR)/snapshots
        $(INSTALL_DATA) $(WWW_MANS) mandoc.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) mdocml.sha256 \
-               $(HTDOCDIR)/snapshots/mdocml-$(VERSION).sha256
 
 depend: config.h
        mkdep -f Makefile.depend $(CFLAGS) $(SRCS)
 
 depend: config.h
        mkdep -f Makefile.depend $(CFLAGS) $(SRCS)
@@ -432,14 +524,43 @@ depend: config.h
                Makefile.depend > Makefile.tmp
        mv Makefile.tmp Makefile.depend
 
                Makefile.depend > Makefile.tmp
        mv Makefile.tmp Makefile.depend
 
-mdocml.sha256: mdocml.tar.gz
-       sha256 mdocml.tar.gz > $@
-
-mdocml.tar.gz: $(DISTFILES)
-       mkdir -p .dist/mdocml-$(VERSION)/
-       $(INSTALL) -m 0644 $(DISTFILES) .dist/mdocml-$(VERSION)
-       chmod 755 .dist/mdocml-$(VERSION)/configure
-       ( cd .dist/ && tar zcf ../$@ mdocml-$(VERSION) )
+regress-distclean:
+       @find regress \
+               -name '.#*' -o \
+               -name '*.orig' -o \
+               -name '*.rej' -o \
+               -name '*.core' \
+               -exec rm -i {} \;
+
+regress-distcheck:
+       @find regress ! -type d ! -type f
+       @find regress -type f \
+               ! -path '*/CVS/*' \
+               ! -name Makefile \
+               ! -name Makefile.inc \
+               ! -name '*.in' \
+               ! -name '*.out_ascii' \
+               ! -name '*.out_utf8' \
+               ! -name '*.out_html' \
+               ! -name '*.out_markdown' \
+               ! -name '*.out_lint' \
+               ! -path regress/regress.pl \
+               ! -path regress/regress.pl.1
+
+dist: mandoc.sha256
+
+mandoc.sha256: mandoc.tar.gz
+       sha256 mandoc.tar.gz > $@
+
+mandoc.tar.gz: $(DISTFILES)
+       ls regress/*/*/*.mandoc_* && exit 1 || true
+       mkdir -p .dist/mandoc-$(VERSION)/
+       $(INSTALL) -m 0644 $(DISTFILES) .dist/mandoc-$(VERSION)
+       cp -pR regress .dist/mandoc-$(VERSION)
+       find .dist/mandoc-$(VERSION)/regress \
+           -type d -name CVS -print0 | xargs -0 rm -rf
+       chmod 755 .dist/mandoc-$(VERSION)/configure
+       ( cd .dist/ && tar zcf ../$@ mandoc-$(VERSION) )
        rm -rf .dist/
 
 # === SUFFIX RULES =====================================================
        rm -rf .dist/
 
 # === SUFFIX RULES =====================================================
A git conversion mirror of mandoc.bsd.lv