Since resetting of offsets works quite differently in man(7) and mdoc(7),

[mandoc.git] / Makefile

diff --git a/Makefile b/Makefile
index e5661c423b94e0815c0148c5191428909280d4f7..7f48296b3f761cf3f3eb6e31ca99179829025122 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.520 2018/08/09 17:28:23 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>
 #
 # 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 \
                   man_validate.c \
                   mandoc.c \
                   mandoc_aux.c \

+                  mandoc_msg.c \

                   mandoc_ohash.c \
                   mandoc_xr.c \
                   mandocd.c \
                   mandoc_ohash.c \
                   mandoc_xr.c \
                   mandocd.c \


@@ -155,13 +156,14 @@ DISTFILES  = INSTALL \
                   dbm_map.h \
                   demandoc.1 \
                   eqn.7 \
                   dbm_map.h \
                   demandoc.1 \
                   eqn.7 \

+                  eqn.h \
+                  eqn_parse.h \

                   gmdiff \
                   html.h \
                   lib.in \
                   libman.h \
                   libmandoc.h \
                   libmdoc.h \
                   gmdiff \
                   html.h \
                   lib.in \
                   libman.h \
                   libmandoc.h \
                   libmdoc.h \

-                  libroff.h \

                   main.h \
                   makewhatis.8 \
                   man.1 \
                   main.h \
                   makewhatis.8 \
                   man.1 \


@@ -184,6 +186,7 @@ DISTFILES    = INSTALL \
                   mandoc_html.3 \
                   mandoc_malloc.3 \
                   mandoc_ohash.h \
                   mandoc_html.3 \
                   mandoc_malloc.3 \
                   mandoc_ohash.h \

+                  mandoc_parse.h \

                   mandoc_xr.h \
                   mandocd.8 \
                   mansearch.3 \
                   mandoc_xr.h \
                   mandocd.8 \
                   mansearch.3 \


@@ -198,10 +201,12 @@ DISTFILES  = INSTALL \
                   roff.h \
                   roff_int.h \
                   soelim.1 \
                   roff.h \
                   roff_int.h \
                   soelim.1 \

-                  st.in \

                   tag.h \
                   tbl.3 \
                   tbl.7 \
                   tag.h \
                   tbl.3 \
                   tbl.7 \

+                  tbl.h \
+                  tbl_int.h \
+                  tbl_parse.h \

                   term.h \
                   $(SRCS) \
                   $(TESTSRCS)
                   term.h \
                   $(SRCS) \
                   $(TESTSRCS)


@@ -233,6 +238,7 @@ LIBMANDOC_OBJS       = $(LIBMAN_OBJS) \
                   chars.o \
                   mandoc.o \
                   mandoc_aux.o \
                   chars.o \
                   mandoc.o \
                   mandoc_aux.o \

+                  mandoc_msg.o \

                   mandoc_ohash.o \
                   mandoc_xr.o \
                   msec.o \
                   mandoc_ohash.o \
                   mandoc_xr.o \
                   msec.o \


@@ -345,13 +351,16 @@ WWW_MANS   = apropos.1.html \
                   man.cgi.8.html \
                   mandocd.8.html
 
                   man.cgi.8.html \
                   mandocd.8.html
 

-WWW_INCS        = man.h.html \
+WWW_INCS        = eqn.h.html \
+                  man.h.html \

                   manconf.h.html \
                   mandoc.h.html \
                   mandoc_aux.h.html \
                   manconf.h.html \
                   mandoc.h.html \
                   mandoc_aux.h.html \

+                  mandoc_parse.h.html \

                   mansearch.h.html \
                   mdoc.h.html \
                   mansearch.h.html \
                   mdoc.h.html \

-                  roff.h.html
+                  roff.h.html \
+                  tbl.h.html

 
 # === USER CONFIGURATION ===============================================
 
 
 # === USER CONFIGURATION ===============================================
 


@@ -422,8 +431,8 @@ lib-install: libmandoc.a
        mkdir -p $(DESTDIR)$(INCLUDEDIR)
        mkdir -p $(DESTDIR)$(MANDIR)/man3
        $(INSTALL_LIB) libmandoc.a $(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_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
 
        $(INSTALL_MAN) mandoc.3 mandoc_escape.3 mandoc_malloc.3 \
                mansearch.3 mchars_alloc.3 tbl.3 $(DESTDIR)$(MANDIR)/man3
 


@@ -477,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)$(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)/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)/mdoc.h
        rm -f $(DESTDIR)$(INCLUDEDIR)/roff.h

+       rm -f $(DESTDIR)$(INCLUDEDIR)/tbl.h

        [ ! -e $(DESTDIR)$(INCLUDEDIR) ] || rmdir $(DESTDIR)$(INCLUDEDIR)
 
 regress: all
        [ ! -e $(DESTDIR)$(INCLUDEDIR) ] || rmdir $(DESTDIR)$(INCLUDEDIR)
 
 regress: all