Finally, represent the man(7) .PP and .HP macros by the natural

[mandoc.git] / Makefile

diff --git a/Makefile b/Makefile
index 09738579f0d295cf25026531bcc384fae6feb58b..7f48296b3f761cf3f3eb6e31ca99179829025122 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.519 2018/07/31 15:34:00 schwarze Exp $
+# $Id: Makefile,v 1.527 2018/12/14 01:18:25 schwarze Exp $
 #
 # Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
 # Copyright (c) 2011, 2013-2018 Ingo Schwarze <schwarze@openbsd.org>
@@ -96,6 +96,7 @@ SRCS           = att.c \
                   man_validate.c \
                   mandoc.c \
                   mandoc_aux.c \
+                  mandoc_msg.c \
                   mandoc_ohash.c \
                   mandoc_xr.c \
                   mandocd.c \
@@ -155,13 +156,14 @@ DISTFILES  = INSTALL \
                   dbm_map.h \
                   demandoc.1 \
                   eqn.7 \
+                  eqn.h \
+                  eqn_parse.h \
                   gmdiff \
                   html.h \
                   lib.in \
                   libman.h \
                   libmandoc.h \
                   libmdoc.h \
-                  libroff.h \
                   main.h \
                   makewhatis.8 \
                   man.1 \
@@ -184,6 +186,7 @@ DISTFILES    = INSTALL \
                   mandoc_html.3 \
                   mandoc_malloc.3 \
                   mandoc_ohash.h \
+                  mandoc_parse.h \
                   mandoc_xr.h \
                   mandocd.8 \
                   mansearch.3 \
@@ -198,10 +201,12 @@ DISTFILES  = INSTALL \
                   roff.h \
                   roff_int.h \
                   soelim.1 \
-                  st.in \
                   tag.h \
                   tbl.3 \
                   tbl.7 \
+                  tbl.h \
+                  tbl_int.h \
+                  tbl_parse.h \
                   term.h \
                   $(SRCS) \
                   $(TESTSRCS)
@@ -233,6 +238,7 @@ LIBMANDOC_OBJS       = $(LIBMAN_OBJS) \
                   chars.o \
                   mandoc.o \
                   mandoc_aux.o \
+                  mandoc_msg.o \
                   mandoc_ohash.o \
                   mandoc_xr.o \
                   msec.o \
@@ -320,6 +326,7 @@ SOELIM_OBJS  = soelim.o \
 WWW_MANS        = apropos.1.html \
                   demandoc.1.html \
                   man.1.html \
+                  man.options.1.html \
                   mandoc.1.html \
                   soelim.1.html \
                   man.cgi.3.html \
@@ -336,20 +343,24 @@ WWW_MANS   = apropos.1.html \
                   eqn.7.html \
                   man.7.html \
                   mandoc_char.7.html \
-                  mandocd.8.html \
                   mdoc.7.html \
                   roff.7.html \
                   tbl.7.html \
                   catman.8.html \
                   makewhatis.8.html \
                   man.cgi.8.html \
+                  mandocd.8.html
+
+WWW_INCS        = eqn.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
+                  roff.h.html \
+                  tbl.h.html
 
 # === USER CONFIGURATION ===============================================
 
@@ -361,9 +372,9 @@ all: mandoc demandoc soelim $(BUILD_TARGETS) Makefile.local
 
 install: base-install $(INSTALL_TARGETS)
 
-www: $(WWW_MANS)
+www: $(WWW_MANS) $(WWW_INCS)
 
-$(WWW_MANS): mandoc
+$(WWW_MANS) $(WWW_INCS): mandoc
 
 .PHONY: base-install cgi-install install www-install
 .PHONY: clean distclean depend
@@ -382,7 +393,7 @@ clean:
        rm -f mandocd catman catman.o $(MANDOCD_OBJS)
        rm -f demandoc $(DEMANDOC_OBJS)
        rm -f soelim $(SOELIM_OBJS)
-       rm -f $(WWW_MANS) mandoc.tar.gz mandoc.sha256
+       rm -f $(WWW_MANS) $(WWW_INCS) mandoc*.tar.gz mandoc*.sha256
        rm -rf *.dSYM
 
 base-install: mandoc demandoc soelim
@@ -420,8 +431,8 @@ lib-install: libmandoc.a
        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_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
 
@@ -475,11 +486,14 @@ uninstall:
        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)/eqn.h
        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
        [ ! -e $(DESTDIR)$(INCLUDEDIR) ] || rmdir $(DESTDIR)$(INCLUDEDIR)
 
 regress: all
@@ -516,7 +530,9 @@ soelim: $(SOELIM_OBJS)
 # --- maintainer targets ---
 
 www-install: www
-       $(INSTALL_DATA) $(WWW_MANS) mandoc.css $(HTDOCDIR)
+       $(INSTALL_DATA) mandoc.css $(HTDOCDIR)
+       $(INSTALL_DATA) $(WWW_MANS) $(HTDOCDIR)/man
+       $(INSTALL_DATA) $(WWW_INCS) $(HTDOCDIR)/includes
 
 depend: config.h
        mkdep -f Makefile.depend $(CFLAGS) $(SRCS)
@@ -573,5 +589,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 -Wall,stop \
-               -Ostyle=mandoc.css,man=%N.%S.html,includes=%I.html $< > $@
+       ./mandoc -Thtml -O \
+       style=/mandoc.css,man=/man/%N.%S.html,includes=/includes/%I.html \
+       $< > $@