]> git.cameronkatri.com Git - mandoc.git/blobdiff - Makefile
git.ckatri.com / mandoc.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Eliminate the class=It-* attributes.
[mandoc.git] / Makefile
diff --git a/Makefile b/Makefile
index 53dc2354721977e2dd12fc805a044a6ba74cb87c..a9626643eaf908576d98db470257b0b4babf7951 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.503 2017/02/18 13:05:43 schwarze Exp $
+# $Id: Makefile,v 1.518 2018/02/27 11:16:23 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 \
@@ -45,6 +46,7 @@ TESTSRCS       = test-be32toh.c \
                   test-stringlist.c \
                   test-strlcat.c \
                   test-strlcpy.c \
                   test-stringlist.c \
                   test-strlcat.c \
                   test-strlcpy.c \
+                  test-strndup.c \
                   test-strptime.c \
                   test-strsep.c \
                   test-strtonum.c \
                   test-strptime.c \
                   test-strsep.c \
                   test-strtonum.c \
@@ -64,10 +66,12 @@ 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_strlcpy.c \
                   compat_strcasestr.c \
                   compat_stringlist.c \
                   compat_strlcat.c \
                   compat_strlcpy.c \
+                  compat_strndup.c \
                   compat_strsep.c \
                   compat_strtonum.c \
                   compat_vasprintf.c \
                   compat_strsep.c \
                   compat_strtonum.c \
                   compat_vasprintf.c \
@@ -85,7 +89,6 @@ SRCS           = att.c \
                   lib.c \
                   main.c \
                   man.c \
                   lib.c \
                   main.c \
                   man.c \
-                  man_hash.c \
                   man_html.c \
                   man_macro.c \
                   man_term.c \
                   man_html.c \
                   man_macro.c \
                   man_term.c \
@@ -93,17 +96,17 @@ 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 \
                   mandocd.c \
                   mandocdb.c \
-                  manpage.c \
                   manpath.c \
                   mansearch.c \
                   mdoc.c \
                   mdoc_argv.c \
                   manpath.c \
                   mansearch.c \
                   mdoc.c \
                   mdoc_argv.c \
-                  mdoc_hash.c \
                   mdoc_html.c \
                   mdoc_macro.c \
                   mdoc_man.c \
                   mdoc_html.c \
                   mdoc_macro.c \
                   mdoc_man.c \
+                  mdoc_markdown.c \
                   mdoc_state.c \
                   mdoc_term.c \
                   mdoc_validate.c \
                   mdoc_state.c \
                   mdoc_term.c \
                   mdoc_validate.c \
@@ -112,6 +115,9 @@ SRCS                 = att.c \
                   preconv.c \
                   read.c \
                   roff.c \
                   preconv.c \
                   read.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 +130,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 +183,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 \
@@ -198,7 +206,6 @@ DISTFILES    = INSTALL \
                   $(TESTSRCS)
 
 LIBMAN_OBJS     = man.o \
                   $(TESTSRCS)
 
 LIBMAN_OBJS     = man.o \
-                  man_hash.o \
                   man_macro.o \
                   man_validate.o
 
                   man_macro.o \
                   man_validate.o
 
@@ -206,7 +213,6 @@ LIBMDOC_OBJS         = att.o \
                   lib.o \
                   mdoc.o \
                   mdoc_argv.o \
                   lib.o \
                   mdoc.o \
                   mdoc_argv.o \
-                  mdoc_hash.o \
                   mdoc_macro.o \
                   mdoc_state.o \
                   mdoc_validate.o \
                   mdoc_macro.o \
                   mdoc_state.o \
                   mdoc_validate.o \
@@ -214,6 +220,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 \
@@ -226,6 +233,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
@@ -239,9 +247,11 @@ 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 \
+                  compat_strndup.o \
                   compat_strsep.o \
                   compat_strtonum.o \
                   compat_vasprintf.o
                   compat_strsep.o \
                   compat_strtonum.o \
                   compat_vasprintf.o
@@ -250,16 +260,17 @@ MANDOC_HTML_OBJS = eqn_html.o \
                   html.o \
                   man_html.o \
                   mdoc_html.o \
                   html.o \
                   man_html.o \
                   mdoc_html.o \
+                  roff_html.o \
                   tbl_html.o
 
                   tbl_html.o
 
-MANDOC_MAN_OBJS  = mdoc_man.o
-
 MANDOC_TERM_OBJS = eqn_term.o \
                   man_term.o \
                   mdoc_term.o \
 MANDOC_TERM_OBJS = eqn_term.o \
                   man_term.o \
                   mdoc_term.o \
+                  roff_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 \
@@ -279,6 +290,8 @@ MAIN_OBJS    = $(MANDOC_HTML_OBJS) \
                   $(DBA_OBJS) \
                   main.o \
                   manpath.o \
                   $(DBA_OBJS) \
                   main.o \
                   manpath.o \
+                  mdoc_man.o \
+                  mdoc_markdown.o \
                   out.o \
                   tag.o \
                   tree.o
                   out.o \
                   tag.o \
                   tree.o
@@ -294,10 +307,6 @@ MANDOCD_OBJS        = $(MANDOC_HTML_OBJS) \
                   out.o \
                   tag.o
 
                   out.o \
                   tag.o
 
-MANPAGE_OBJS    = $(DBM_OBJS) \
-                  manpage.o \
-                  manpath.o
-
 DEMANDOC_OBJS   = demandoc.o
 
 SOELIM_OBJS     = soelim.o \
 DEMANDOC_OBJS   = demandoc.o
 
 SOELIM_OBJS     = soelim.o \
@@ -341,9 +350,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
@@ -354,7 +360,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
 
@@ -372,11 +378,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 manpage $(MANPAGE_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
@@ -388,17 +393,16 @@ base-install: mandoc demandoc soelim
        mkdir -p $(DESTDIR)$(MANDIR)/man8
        $(INSTALL_PROGRAM) mandoc demandoc $(DESTDIR)$(BINDIR)
        $(INSTALL_PROGRAM) soelim $(DESTDIR)$(BINDIR)/$(BINM_SOELIM)
        mkdir -p $(DESTDIR)$(MANDIR)/man8
        $(INSTALL_PROGRAM) mandoc demandoc $(DESTDIR)$(BINDIR)
        $(INSTALL_PROGRAM) soelim $(DESTDIR)$(BINDIR)/$(BINM_SOELIM)
-       $(LN) $(DESTDIR)$(BINDIR)/mandoc $(DESTDIR)$(BINDIR)/$(BINM_MAN)
-       $(LN) $(DESTDIR)$(BINDIR)/mandoc $(DESTDIR)$(BINDIR)/$(BINM_APROPOS)
-       $(LN) $(DESTDIR)$(BINDIR)/mandoc $(DESTDIR)$(BINDIR)/$(BINM_WHATIS)
-       $(LN) $(DESTDIR)$(BINDIR)/mandoc \
-               $(DESTDIR)$(SBINDIR)/$(BINM_MAKEWHATIS)
+       cd $(DESTDIR)$(BINDIR) && $(LN) mandoc $(BINM_MAN)
+       cd $(DESTDIR)$(BINDIR) && $(LN) mandoc $(BINM_APROPOS)
+       cd $(DESTDIR)$(BINDIR) && $(LN) mandoc $(BINM_WHATIS)
+       cd $(DESTDIR)$(SBINDIR) && \
+               $(LN) ${BIN_FROM_SBIN}/mandoc $(BINM_MAKEWHATIS)
        $(INSTALL_MAN) mandoc.1 demandoc.1 $(DESTDIR)$(MANDIR)/man1
        $(INSTALL_MAN) soelim.1 $(DESTDIR)$(MANDIR)/man1/$(BINM_SOELIM).1
        $(INSTALL_MAN) man.1 $(DESTDIR)$(MANDIR)/man1/$(BINM_MAN).1
        $(INSTALL_MAN) apropos.1 $(DESTDIR)$(MANDIR)/man1/$(BINM_APROPOS).1
        $(INSTALL_MAN) mandoc.1 demandoc.1 $(DESTDIR)$(MANDIR)/man1
        $(INSTALL_MAN) soelim.1 $(DESTDIR)$(MANDIR)/man1/$(BINM_SOELIM).1
        $(INSTALL_MAN) man.1 $(DESTDIR)$(MANDIR)/man1/$(BINM_MAN).1
        $(INSTALL_MAN) apropos.1 $(DESTDIR)$(MANDIR)/man1/$(BINM_APROPOS).1
-       $(LN) $(DESTDIR)$(MANDIR)/man1/$(BINM_APROPOS).1 \
-               $(DESTDIR)$(MANDIR)/man1/$(BINM_WHATIS).1
+       cd $(DESTDIR)$(MANDIR)/man1 && $(LN) $(BINM_APROPOS).1 $(BINM_WHATIS).1
        $(INSTALL_MAN) man.conf.5 $(DESTDIR)$(MANDIR)/man5/$(MANM_MANCONF).5
        $(INSTALL_MAN) mandoc.db.5 $(DESTDIR)$(MANDIR)/man5
        $(INSTALL_MAN) man.7 $(DESTDIR)$(MANDIR)/man7/$(MANM_MAN).7
        $(INSTALL_MAN) man.conf.5 $(DESTDIR)$(MANDIR)/man5/$(MANM_MANCONF).5
        $(INSTALL_MAN) mandoc.db.5 $(DESTDIR)$(MANDIR)/man5
        $(INSTALL_MAN) man.7 $(DESTDIR)$(MANDIR)/man7/$(MANM_MAN).7
@@ -475,7 +479,13 @@ uninstall:
        rm -f $(DESTDIR)$(INCLUDEDIR)/mandoc_aux.h
        rm -f $(DESTDIR)$(INCLUDEDIR)/mdoc.h
        rm -f $(DESTDIR)$(INCLUDEDIR)/roff.h
        rm -f $(DESTDIR)$(INCLUDEDIR)/mandoc_aux.h
        rm -f $(DESTDIR)$(INCLUDEDIR)/mdoc.h
        rm -f $(DESTDIR)$(INCLUDEDIR)/roff.h
-       rmdir $(DESTDIR)$(INCLUDEDIR)
+       [ ! -e $(DESTDIR)$(INCLUDEDIR) ] || rmdir $(DESTDIR)$(INCLUDEDIR)
+
+regress: all
+       cd regress && ./regress.pl
+
+regress-clean:
+       cd regress && ./regress.pl . clean
 
 Makefile.local config.h: configure $(TESTSRCS)
        @echo "$@ is out of date; please run ./configure"
 
 Makefile.local config.h: configure $(TESTSRCS)
        @echo "$@ is out of date; please run ./configure"
@@ -487,9 +497,6 @@ libmandoc.a: $(COMPAT_OBJS) $(LIBMANDOC_OBJS)
 mandoc: $(MAIN_OBJS) libmandoc.a
        $(CC) -o $@ $(LDFLAGS) $(MAIN_OBJS) libmandoc.a $(LDADD)
 
 mandoc: $(MAIN_OBJS) libmandoc.a
        $(CC) -o $@ $(LDFLAGS) $(MAIN_OBJS) libmandoc.a $(LDADD)
 
-manpage: $(MANPAGE_OBJS) libmandoc.a
-       $(CC) -o $@ $(LDFLAGS) $(MANPAGE_OBJS) libmandoc.a $(LDADD)
-
 man.cgi: $(CGI_OBJS) libmandoc.a
        $(CC) $(STATIC) -o $@ $(LDFLAGS) $(CGI_OBJS) libmandoc.a $(LDADD)
 
 man.cgi: $(CGI_OBJS) libmandoc.a
        $(CC) $(STATIC) -o $@ $(LDFLAGS) $(CGI_OBJS) libmandoc.a $(LDADD)
 
@@ -508,13 +515,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)
@@ -523,20 +524,43 @@ depend: config.h
                Makefile.depend > Makefile.tmp
        mv Makefile.tmp Makefile.depend
 
                Makefile.depend > Makefile.tmp
        mv Makefile.tmp Makefile.depend
 
-dist: mdocml.sha256
-
-mdocml.sha256: mdocml.tar.gz
-       sha256 mdocml.tar.gz > $@
-
-mdocml.tar.gz: $(DISTFILES)
+regress-distclean:
+       @find regress \
+               -name '.#*' -o \
+               -name '*.orig' -o \
+               -name '*.rej' -o \
+               -name '*.core' \
+               -exec rm -i {} \;
+
+regress-distcheck:
+       @find regress ! -type d ! -type f
+       @find regress -type f \
+               ! -path '*/CVS/*' \
+               ! -name Makefile \
+               ! -name Makefile.inc \
+               ! -name '*.in' \
+               ! -name '*.out_ascii' \
+               ! -name '*.out_utf8' \
+               ! -name '*.out_html' \
+               ! -name '*.out_markdown' \
+               ! -name '*.out_lint' \
+               ! -path regress/regress.pl \
+               ! -path regress/regress.pl.1
+
+dist: mandoc.sha256
+
+mandoc.sha256: mandoc.tar.gz
+       sha256 mandoc.tar.gz > $@
+
+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 =====================================================
A git conversion mirror of mandoc.bsd.lv