Vastly simplify man(7) block unwinding, similar to mdoc_macro.c 1.171.

[mandoc.git] / Makefile

diff --git a/Makefile b/Makefile
index d686e01455d69cb7b91bf3374414c040d5b42f19..cb120f3e531d2d497d07aa544b0659211c965bf3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
-# $Id: Makefile,v 1.456 2015/02/16 16:23:54 schwarze Exp $
+# $Id: Makefile,v 1.461 2015/04/02 21:36:49 schwarze Exp $
 #
 # 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
@@ -15,7 +15,7 @@
 # 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.2
+VERSION = 1.13.3
 
 # === LIST OF FILES ====================================================
 
@@ -23,6 +23,8 @@ TESTSRCS       = test-dirent-namlen.c \
                   test-fgetln.c \
                   test-fts.c \
                   test-getsubopt.c \
+                  test-isblank.c \
+                  test-mkdtemp.c \
                   test-mmap.c \
                   test-ohash.c \
                   test-reallocarray.c \
@@ -34,6 +36,7 @@ TESTSRCS       = test-dirent-namlen.c \
                   test-strptime.c \
                   test-strsep.c \
                   test-strtonum.c \
+                  test-vasprintf.c \
                   test-wchar.c
 
 SRCS            = att.c \
@@ -42,6 +45,8 @@ SRCS           = att.c \
                   compat_fgetln.c \
                   compat_fts.c \
                   compat_getsubopt.c \
+                  compat_isblank.c \
+                  compat_mkdtemp.c \
                   compat_ohash.c \
                   compat_reallocarray.c \
                   compat_sqlite3_errstr.c \
@@ -50,6 +55,7 @@ SRCS           = att.c \
                   compat_strlcpy.c \
                   compat_strsep.c \
                   compat_strtonum.c \
+                  compat_vasprintf.c \
                   demandoc.c \
                   eqn.c \
                   eqn_html.c \
@@ -125,7 +131,9 @@ DISTFILES    = INSTALL \
                   man.1 \
                   man.7 \
                   man.cgi.8 \
+                  man.conf.5 \
                   man.h \
+                  manconf.h \
                   mandoc.1 \
                   mandoc.3 \
                   mandoc.db.5 \
@@ -136,7 +144,6 @@ DISTFILES    = INSTALL \
                   mandoc_headers.3 \
                   mandoc_html.3 \
                   mandoc_malloc.3 \
-                  manpath.h \
                   mansearch.3 \
                   mansearch.h \
                   mchars_alloc.3 \
@@ -146,6 +153,7 @@ DISTFILES    = INSTALL \
                   out.h \
                   predefs.in \
                   roff.7 \
+                  roff.h \
                   st.in \
                   style.css \
                   tbl.3 \
@@ -187,6 +195,8 @@ LIBMANDOC_OBJS       = $(LIBMAN_OBJS) \
 COMPAT_OBJS     = compat_fgetln.o \
                   compat_fts.o \
                   compat_getsubopt.o \
+                  compat_isblank.o \
+                  compat_mkdtemp.o \
                   compat_ohash.o \
                   compat_reallocarray.o \
                   compat_sqlite3_errstr.o \
@@ -194,7 +204,8 @@ COMPAT_OBJS  = compat_fgetln.o \
                   compat_strlcat.o \
                   compat_strlcpy.o \
                   compat_strsep.o \
-                  compat_strtonum.o
+                  compat_strtonum.o \
+                  compat_vasprintf.o
 
 MANDOC_HTML_OBJS = eqn_html.o \
                   html.o \
@@ -248,6 +259,7 @@ WWW_MANS     = apropos.1.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 \
@@ -258,11 +270,12 @@ WWW_MANS   = apropos.1.html \
                   makewhatis.8.html \
                   man.cgi.8.html \
                   man.h.html \
+                  manconf.h.html \
                   mandoc.h.html \
                   mandoc_aux.h.html \
-                  manpath.h.html \
                   mansearch.h.html \
-                  mdoc.h.html
+                  mdoc.h.html \
+                  roff.h.html
 
 WWW_OBJS        = mdocml.tar.gz \
                   mdocml.sha256
@@ -311,16 +324,18 @@ base-install: base-build
        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 $(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 \
+       $(INSTALL_LIB) man.h mandoc.h mandoc_aux.h mdoc.h roff.h \
                $(DESTDIR)$(INCLUDEDIR)
        $(INSTALL_MAN) mandoc.1 demandoc.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