Explain how to transform markup for the terminal when not using a

[mandoc.git] / Makefile

diff --git a/Makefile b/Makefile
index decfe75f578811e941290c4e22cfd8ba31b19d94..bbababa2f7e589658405bcb74105ac537a69bd4f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.510 2017/05/04 22:16:09 schwarze Exp $
+# $Id: Makefile,v 1.517 2017/08/05 13:34:39 schwarze Exp $

 #
 # Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
 # Copyright (c) 2011, 2013-2017 Ingo Schwarze <schwarze@openbsd.org>
 #
 # Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
 # Copyright (c) 2011, 2013-2017 Ingo Schwarze <schwarze@openbsd.org>


@@ -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.
 
 # 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.1
+VERSION = 1.14.3

 
 # === LIST OF FILES ====================================================
 
 
 # === LIST OF FILES ====================================================
 


@@ -38,6 +38,7 @@ TESTSRCS       = test-be32toh.c \
                   test-progname.c \
                   test-recvmsg.c \
                   test-reallocarray.c \
                   test-progname.c \
                   test-recvmsg.c \
                   test-reallocarray.c \

+                  test-recallocarray.c \

                   test-rewb-bsd.c \
                   test-rewb-sysv.c \
                   test-sandbox_init.c \
                   test-rewb-bsd.c \
                   test-rewb-sysv.c \
                   test-sandbox_init.c \


@@ -64,6 +65,7 @@ SRCS           = att.c \
                   compat_ohash.c \
                   compat_progname.c \
                   compat_reallocarray.c \
                   compat_ohash.c \
                   compat_progname.c \
                   compat_reallocarray.c \

+                  compat_recallocarray.c \

                   compat_strcasestr.c \
                   compat_stringlist.c \
                   compat_strlcat.c \
                   compat_strcasestr.c \
                   compat_stringlist.c \
                   compat_strlcat.c \


@@ -92,6 +94,7 @@ 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 \
                   manpath.c \
                   mandocd.c \
                   mandocdb.c \
                   manpath.c \


@@ -112,6 +115,7 @@ SRCS                 = att.c \
                   roff.c \
                   roff_html.c \
                   roff_term.c \
                   roff.c \
                   roff_html.c \
                   roff_term.c \

+                  roff_validate.c \

                   soelim.c \
                   st.c \
                   tag.c \
                   soelim.c \
                   st.c \
                   tag.c \


@@ -124,6 +128,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 \


@@ -176,6 +181,7 @@ 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 \
                   mandocd.8 \
                   mansearch.3 \
                   mansearch.h \


@@ -212,6 +218,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 \


@@ -224,6 +231,7 @@ 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
                   msec.o \
                   preconv.o \
                   read.o


@@ -237,6 +245,7 @@ COMPAT_OBJS  = compat_err.o \
                   compat_ohash.o \
                   compat_progname.o \
                   compat_reallocarray.o \
                   compat_ohash.o \
                   compat_progname.o \
                   compat_reallocarray.o \

+                  compat_recallocarray.o \

                   compat_strcasestr.o \
                   compat_strlcat.o \
                   compat_strlcpy.o \
                   compat_strcasestr.o \
                   compat_strlcat.o \
                   compat_strlcpy.o \


@@ -258,6 +267,7 @@ MANDOC_TERM_OBJS = eqn_term.o \
                   term.o \
                   term_ascii.o \
                   term_ps.o \
                   term.o \
                   term_ascii.o \
                   term_ps.o \

+                  term_tab.o \

                   tbl_term.o
 
 DBM_OBJS        = dbm.o \
                   tbl_term.o
 
 DBM_OBJS        = dbm.o \


@@ -337,9 +347,6 @@ 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
 # === USER CONFIGURATION ===============================================
 
 include Makefile.local


@@ -350,7 +357,7 @@ 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
 


@@ -368,10 +375,10 @@ clean:
        rm -f libmandoc.a $(LIBMANDOC_OBJS) $(COMPAT_OBJS)
        rm -f mandoc $(MAIN_OBJS)
        rm -f man.cgi $(CGI_OBJS)
        rm -f libmandoc.a $(LIBMANDOC_OBJS) $(COMPAT_OBJS)
        rm -f mandoc $(MAIN_OBJS)
        rm -f man.cgi $(CGI_OBJS)

-       rm -f mandocd catman $(MANDOCD_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
 
 base-install: mandoc demandoc soelim
        rm -rf *.dSYM
 
 base-install: mandoc demandoc soelim


@@ -505,13 +512,7 @@ soelim: $(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)


@@ -538,24 +539,25 @@ regress-distcheck:
                ! -name '*.out_ascii' \
                ! -name '*.out_utf8' \
                ! -name '*.out_html' \
                ! -name '*.out_ascii' \
                ! -name '*.out_utf8' \
                ! -name '*.out_html' \

+               ! -name '*.out_markdown' \

                ! -name '*.out_lint' \
                ! -path regress/regress.pl \
                ! -path regress/regress.pl.1
 
                ! -name '*.out_lint' \
                ! -path regress/regress.pl \
                ! -path regress/regress.pl.1
 

-dist: mdocml.sha256
+dist: mandoc.sha256

 
 

-mdocml.sha256: mdocml.tar.gz
-       sha256 mdocml.tar.gz > $@
+mandoc.sha256: mandoc.tar.gz
+       sha256 mandoc.tar.gz > $@

 
 

-mdocml.tar.gz: $(DISTFILES)
+mandoc.tar.gz: $(DISTFILES)

        ls regress/*/*/*.mandoc_* && exit 1 || true
        ls regress/*/*/*.mandoc_* && exit 1 || true

-       mkdir -p .dist/mdocml-$(VERSION)/
-       $(INSTALL) -m 0644 $(DISTFILES) .dist/mdocml-$(VERSION)
-       cp -pR regress .dist/mdocml-$(VERSION)
-       find .dist/mdocml-$(VERSION)/regress \
+       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
            -type d -name CVS -print0 | xargs -0 rm -rf

-       chmod 755 .dist/mdocml-$(VERSION)/configure
-       ( cd .dist/ && tar zcf ../$@ mdocml-$(VERSION) )
+       chmod 755 .dist/mandoc-$(VERSION)/configure
+       ( cd .dist/ && tar zcf ../$@ mandoc-$(VERSION) )

        rm -rf .dist/
 
 # === SUFFIX RULES =====================================================
        rm -rf .dist/
 
 # === SUFFIX RULES =====================================================