bugfix: .Tg must be ignored completely in these output modes

[mandoc.git] / Makefile

diff --git a/Makefile b/Makefile
index 8bfc1accc724b9af7071438ed425816980dc6547..f4e29540df0010204d133ac4f5764f2ef5b09b0f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
-# $Id: Makefile,v 1.524 2018/12/13 05:23:37 schwarze Exp $
+# $Id: Makefile,v 1.530 2019/03/06 16:08:41 schwarze Exp $
 #
 # Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
-# Copyright (c) 2011, 2013-2018 Ingo Schwarze <schwarze@openbsd.org>
+# Copyright (c) 2011, 2013-2019 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.14.4
+VERSION = 1.14.5
 
 # === LIST OF FILES ====================================================
 
@@ -37,9 +37,9 @@ TESTSRCS       = test-be32toh.c \
                   test-PATH_MAX.c \
                   test-pledge.c \
                   test-progname.c \
-                  test-recvmsg.c \
                   test-reallocarray.c \
                   test-recallocarray.c \
+                  test-recvmsg.c \
                   test-rewb-bsd.c \
                   test-rewb-sysv.c \
                   test-sandbox_init.c \
@@ -54,7 +54,8 @@ TESTSRCS       = test-be32toh.c \
                   test-vasprintf.c \
                   test-wchar.c
 
-SRCS            = att.c \
+SRCS            = arch.c \
+                  att.c \
                   catman.c \
                   cgi.c \
                   chars.c \
@@ -96,6 +97,7 @@ SRCS           = att.c \
                   man_validate.c \
                   mandoc.c \
                   mandoc_aux.c \
+                  mandoc_msg.c \
                   mandoc_ohash.c \
                   mandoc_xr.c \
                   mandocd.c \
@@ -185,6 +187,7 @@ DISTFILES    = INSTALL \
                   mandoc_html.3 \
                   mandoc_malloc.3 \
                   mandoc_ohash.h \
+                  mandoc_parse.h \
                   mandoc_xr.h \
                   mandocd.8 \
                   mansearch.3 \
@@ -199,7 +202,6 @@ DISTFILES    = INSTALL \
                   roff.h \
                   roff_int.h \
                   soelim.1 \
-                  st.in \
                   tag.h \
                   tbl.3 \
                   tbl.7 \
@@ -234,9 +236,11 @@ LIBROFF_OBJS        = eqn.o \
 LIBMANDOC_OBJS  = $(LIBMAN_OBJS) \
                   $(LIBMDOC_OBJS) \
                   $(LIBROFF_OBJS) \
+                  arch.o \
                   chars.o \
                   mandoc.o \
                   mandoc_aux.o \
+                  mandoc_msg.o \
                   mandoc_ohash.o \
                   mandoc_xr.o \
                   msec.o \
@@ -350,14 +354,18 @@ WWW_MANS   = apropos.1.html \
                   mandocd.8.html
 
 WWW_INCS        = eqn.h.html \
+                  html.h.html \
                   man.h.html \
                   manconf.h.html \
                   mandoc.h.html \
                   mandoc_aux.h.html \
+                  mandoc_parse.h.html \
                   mansearch.h.html \
                   mdoc.h.html \
                   roff.h.html \
-                  tbl.h.html
+                  tbl.h.html \
+                  tbl_int.h.html \
+                  tbl_parse.h.html
 
 # === USER CONFIGURATION ===============================================
 
@@ -428,8 +436,8 @@ lib-install: libmandoc.a
        mkdir -p $(DESTDIR)$(INCLUDEDIR)
        mkdir -p $(DESTDIR)$(MANDIR)/man3
        $(INSTALL_LIB) libmandoc.a $(DESTDIR)$(LIBDIR)
-       $(INSTALL_LIB) eqn.h man.h mandoc.h mandoc_aux.h mdoc.h roff.h tbl.h \
-               $(DESTDIR)$(INCLUDEDIR)
+       $(INSTALL_LIB) eqn.h man.h mandoc.h mandoc_aux.h mandoc_parse.h \
+               mdoc.h roff.h tbl.h $(DESTDIR)$(INCLUDEDIR)
        $(INSTALL_MAN) mandoc.3 mandoc_escape.3 mandoc_malloc.3 \
                mansearch.3 mchars_alloc.3 tbl.3 $(DESTDIR)$(MANDIR)/man3
 
@@ -487,6 +495,7 @@ uninstall:
        rm -f $(DESTDIR)$(INCLUDEDIR)/man.h
        rm -f $(DESTDIR)$(INCLUDEDIR)/mandoc.h
        rm -f $(DESTDIR)$(INCLUDEDIR)/mandoc_aux.h
+       rm -f $(DESTDIR)$(INCLUDEDIR)/mandoc_parse.h
        rm -f $(DESTDIR)$(INCLUDEDIR)/mdoc.h
        rm -f $(DESTDIR)$(INCLUDEDIR)/roff.h
        rm -f $(DESTDIR)$(INCLUDEDIR)/tbl.h
@@ -576,6 +585,10 @@ mandoc-$(VERSION).tar.gz: $(DISTFILES)
        ( cd .dist/ && tar zcf ../$@ mandoc-$(VERSION) )
        rm -rf .dist/
 
+dist-install: dist
+       $(INSTALL_DATA) mandoc-$(VERSION).tar.gz mandoc-$(VERSION).sha256 \
+           $(HTDOCDIR)/snapshots
+
 # === SUFFIX RULES =====================================================
 
 .SUFFIXES:      .1       .3       .5       .7       .8       .h
@@ -585,6 +598,6 @@ mandoc-$(VERSION).tar.gz: $(DISTFILES)
        highlight -I $< > $@
 
 .1.1.html .3.3.html .5.5.html .7.7.html .8.8.html: mandoc
-       ./mandoc -Thtml -O \
-       style=/mandoc.css,man=/man/%N.%S.html,includes=/includes/%I.html \
-       $< > $@
+       mandoc -Thtml -Wwarning,stop \
+               -O 'style=/mandoc.css,man=/man/%N.%S.html;https://man.openbsd.org/%N.%S,includes=/includes/%I.html' \
+               $< > $@