]> 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
In man(1) mode, properly clean up the resn[] result array
[mandoc.git] / Makefile
diff --git a/Makefile b/Makefile
index 8bfc1accc724b9af7071438ed425816980dc6547..48c4741812b62a3be4520d648ea8392a695c5688 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.540 2021/09/21 11:04:40 schwarze Exp $
 #
 #
+# Copyright (c) 2011, 2013-2021 Ingo Schwarze <schwarze@openbsd.org>
 # Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
 # Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
-# Copyright (c) 2011, 2013-2018 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
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -15,11 +15,12 @@
 # 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.4
+VERSION = 1.14.6
 
 # === LIST OF FILES ====================================================
 
 
 # === LIST OF FILES ====================================================
 
-TESTSRCS        = test-be32toh.c \
+TESTSRCS        = test-attribute.c \
+                  test-be32toh.c \
                   test-cmsg.c \
                   test-dirent-namlen.c \
                   test-EFTYPE.c \
                   test-cmsg.c \
                   test-dirent-namlen.c \
                   test-EFTYPE.c \
@@ -29,6 +30,7 @@ TESTSRCS       = test-be32toh.c \
                   test-getsubopt.c \
                   test-isblank.c \
                   test-mkdtemp.c \
                   test-getsubopt.c \
                   test-isblank.c \
                   test-mkdtemp.c \
+                  test-mkstemps.c \
                   test-nanosleep.c \
                   test-noop.c \
                   test-ntohl.c \
                   test-nanosleep.c \
                   test-noop.c \
                   test-ntohl.c \
@@ -37,9 +39,9 @@ TESTSRCS       = test-be32toh.c \
                   test-PATH_MAX.c \
                   test-pledge.c \
                   test-progname.c \
                   test-PATH_MAX.c \
                   test-pledge.c \
                   test-progname.c \
-                  test-recvmsg.c \
                   test-reallocarray.c \
                   test-recallocarray.c \
                   test-reallocarray.c \
                   test-recallocarray.c \
+                  test-recvmsg.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 \
@@ -54,7 +56,8 @@ TESTSRCS       = test-be32toh.c \
                   test-vasprintf.c \
                   test-wchar.c
 
                   test-vasprintf.c \
                   test-wchar.c
 
-SRCS            = att.c \
+SRCS            = arch.c \
+                  att.c \
                   catman.c \
                   cgi.c \
                   chars.c \
                   catman.c \
                   cgi.c \
                   chars.c \
@@ -64,6 +67,7 @@ SRCS           = att.c \
                   compat_getsubopt.c \
                   compat_isblank.c \
                   compat_mkdtemp.c \
                   compat_getsubopt.c \
                   compat_isblank.c \
                   compat_mkdtemp.c \
+                  compat_mkstemps.c \
                   compat_ohash.c \
                   compat_progname.c \
                   compat_reallocarray.c \
                   compat_ohash.c \
                   compat_progname.c \
                   compat_reallocarray.c \
@@ -96,6 +100,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 \
@@ -132,6 +137,7 @@ SRCS                 = att.c \
                   term_ascii.c \
                   term_ps.c \
                   term_tab.c \
                   term_ascii.c \
                   term_ps.c \
                   term_tab.c \
+                  term_tag.c \
                   tree.c
 
 DISTFILES       = INSTALL \
                   tree.c
 
 DISTFILES       = INSTALL \
@@ -185,6 +191,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 \
@@ -199,7 +206,6 @@ 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 \
@@ -207,6 +213,7 @@ DISTFILES    = INSTALL \
                   tbl_int.h \
                   tbl_parse.h \
                   term.h \
                   tbl_int.h \
                   tbl_parse.h \
                   term.h \
+                  term_tag.h \
                   $(SRCS) \
                   $(TESTSRCS)
 
                   $(SRCS) \
                   $(TESTSRCS)
 
@@ -234,26 +241,31 @@ LIBROFF_OBJS       = eqn.o \
 LIBMANDOC_OBJS  = $(LIBMAN_OBJS) \
                   $(LIBMDOC_OBJS) \
                   $(LIBROFF_OBJS) \
 LIBMANDOC_OBJS  = $(LIBMAN_OBJS) \
                   $(LIBMDOC_OBJS) \
                   $(LIBROFF_OBJS) \
+                  arch.o \
                   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 \
                   preconv.o \
                   mandoc_ohash.o \
                   mandoc_xr.o \
                   msec.o \
                   preconv.o \
-                  read.o
+                  read.o \
+                  tag.o
 
 
-COMPAT_OBJS     = compat_err.o \
+ALL_COBJS       = compat_err.o \
                   compat_fts.o \
                   compat_getline.o \
                   compat_getsubopt.o \
                   compat_isblank.o \
                   compat_mkdtemp.o \
                   compat_fts.o \
                   compat_getline.o \
                   compat_getsubopt.o \
                   compat_isblank.o \
                   compat_mkdtemp.o \
+                  compat_mkstemps.o \
                   compat_ohash.o \
                   compat_progname.o \
                   compat_reallocarray.o \
                   compat_recallocarray.o \
                   compat_strcasestr.o \
                   compat_ohash.o \
                   compat_progname.o \
                   compat_reallocarray.o \
                   compat_recallocarray.o \
                   compat_strcasestr.o \
+                  compat_stringlist.o \
                   compat_strlcat.o \
                   compat_strlcpy.o \
                   compat_strndup.o \
                   compat_strlcat.o \
                   compat_strlcpy.o \
                   compat_strndup.o \
@@ -276,6 +288,7 @@ MANDOC_TERM_OBJS = eqn_term.o \
                   term_ascii.o \
                   term_ps.o \
                   term_tab.o \
                   term_ascii.o \
                   term_ps.o \
                   term_tab.o \
+                  term_tag.o \
                   tbl_term.o
 
 DBM_OBJS        = dbm.o \
                   tbl_term.o
 
 DBM_OBJS        = dbm.o \
@@ -298,7 +311,6 @@ MAIN_OBJS    = $(MANDOC_HTML_OBJS) \
                   mdoc_man.o \
                   mdoc_markdown.o \
                   out.o \
                   mdoc_man.o \
                   mdoc_markdown.o \
                   out.o \
-                  tag.o \
                   tree.o
 
 CGI_OBJS        = $(MANDOC_HTML_OBJS) \
                   tree.o
 
 CGI_OBJS        = $(MANDOC_HTML_OBJS) \
@@ -309,18 +321,10 @@ CGI_OBJS   = $(MANDOC_HTML_OBJS) \
 MANDOCD_OBJS    = $(MANDOC_HTML_OBJS) \
                   $(MANDOC_TERM_OBJS) \
                   mandocd.o \
 MANDOCD_OBJS    = $(MANDOC_HTML_OBJS) \
                   $(MANDOC_TERM_OBJS) \
                   mandocd.o \
-                  out.o \
-                  tag.o
+                  out.o
 
 DEMANDOC_OBJS   = demandoc.o
 
 
 DEMANDOC_OBJS   = demandoc.o
 
-SOELIM_OBJS     = soelim.o \
-                  compat_err.o \
-                  compat_getline.o \
-                  compat_progname.o \
-                  compat_reallocarray.o \
-                  compat_stringlist.o
-
 WWW_MANS        = apropos.1.html \
                   demandoc.1.html \
                   man.1.html \
 WWW_MANS        = apropos.1.html \
                   demandoc.1.html \
                   man.1.html \
@@ -350,14 +354,18 @@ WWW_MANS   = apropos.1.html \
                   mandocd.8.html
 
 WWW_INCS        = eqn.h.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 \
                   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 \
                   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 ===============================================
 
 
 # === USER CONFIGURATION ===============================================
 
@@ -365,7 +373,7 @@ include Makefile.local
 
 # === DEPENDENCY HANDLING ==============================================
 
 
 # === DEPENDENCY HANDLING ==============================================
 
-all: mandoc demandoc soelim $(BUILD_TARGETS) Makefile.local
+all: mandoc man demandoc soelim $(BUILD_TARGETS) Makefile.local
 
 install: base-install $(INSTALL_TARGETS)
 
 
 install: base-install $(INSTALL_TARGETS)
 
@@ -384,13 +392,14 @@ distclean: clean
        rm -f Makefile.local config.h config.h.old config.log config.log.old
 
 clean:
        rm -f Makefile.local config.h config.h.old config.log config.log.old
 
 clean:
-       rm -f libmandoc.a $(LIBMANDOC_OBJS) $(COMPAT_OBJS)
-       rm -f mandoc $(MAIN_OBJS)
+       rm -f libmandoc.a $(LIBMANDOC_OBJS) $(ALL_COBJS)
+       rm -f mandoc man $(MAIN_OBJS)
        rm -f man.cgi $(CGI_OBJS)
        rm -f mandocd catman catman.o $(MANDOCD_OBJS)
        rm -f demandoc $(DEMANDOC_OBJS)
        rm -f man.cgi $(CGI_OBJS)
        rm -f mandocd catman catman.o $(MANDOCD_OBJS)
        rm -f demandoc $(DEMANDOC_OBJS)
-       rm -f soelim $(SOELIM_OBJS)
+       rm -f soelim soelim.o
        rm -f $(WWW_MANS) $(WWW_INCS) mandoc*.tar.gz mandoc*.sha256
        rm -f $(WWW_MANS) $(WWW_INCS) mandoc*.tar.gz mandoc*.sha256
+       rm -f Makefile.tmp1 Makefile.tmp2
        rm -rf *.dSYM
 
 base-install: mandoc demandoc soelim
        rm -rf *.dSYM
 
 base-install: mandoc demandoc soelim
@@ -428,8 +437,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) 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
 
        $(INSTALL_MAN) mandoc.3 mandoc_escape.3 mandoc_malloc.3 \
                mansearch.3 mchars_alloc.3 tbl.3 $(DESTDIR)$(MANDIR)/man3
 
@@ -487,6 +496,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)/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
        rm -f $(DESTDIR)$(INCLUDEDIR)/mdoc.h
        rm -f $(DESTDIR)$(INCLUDEDIR)/roff.h
        rm -f $(DESTDIR)$(INCLUDEDIR)/tbl.h
@@ -502,12 +512,15 @@ Makefile.local config.h: configure $(TESTSRCS)
        @echo "$@ is out of date; please run ./configure"
        @exit 1
 
        @echo "$@ is out of date; please run ./configure"
        @exit 1
 
-libmandoc.a: $(COMPAT_OBJS) $(LIBMANDOC_OBJS)
-       ar rs $@ $(COMPAT_OBJS) $(LIBMANDOC_OBJS)
+libmandoc.a: $(MANDOC_COBJS) $(LIBMANDOC_OBJS)
+       $(AR) rs $@ $(MANDOC_COBJS) $(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)
 
+man: mandoc
+       $(LN) mandoc man
+
 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)
 
@@ -520,8 +533,8 @@ catman: catman.o libmandoc.a
 demandoc: $(DEMANDOC_OBJS) libmandoc.a
        $(CC) -o $@ $(LDFLAGS) $(DEMANDOC_OBJS) libmandoc.a $(LDADD)
 
 demandoc: $(DEMANDOC_OBJS) libmandoc.a
        $(CC) -o $@ $(LDFLAGS) $(DEMANDOC_OBJS) libmandoc.a $(LDADD)
 
-soelim: $(SOELIM_OBJS)
-       $(CC) -o $@ $(LDFLAGS) $(SOELIM_OBJS)
+soelim: $(SOELIM_COBJS) soelim.o
+       $(CC) -o $@ $(LDFLAGS) $(SOELIM_COBJS) soelim.o
 
 # --- maintainer targets ---
 
 
 # --- maintainer targets ---
 
@@ -531,11 +544,13 @@ www-install: www
        $(INSTALL_DATA) $(WWW_INCS) $(HTDOCDIR)/includes
 
 depend: config.h
        $(INSTALL_DATA) $(WWW_INCS) $(HTDOCDIR)/includes
 
 depend: config.h
-       mkdep -f Makefile.depend $(CFLAGS) $(SRCS)
+       ./configure -depend
+       mkdep -f Makefile.tmp1 $(CFLAGS) $(SRCS)
        perl -e 'undef $$/; $$_ = <>; s|/usr/include/\S+||g; \
                s|\\\n||g; s|  +| |g; s| $$||mg; print;' \
        perl -e 'undef $$/; $$_ = <>; s|/usr/include/\S+||g; \
                s|\\\n||g; s|  +| |g; s| $$||mg; print;' \
-               Makefile.depend > Makefile.tmp
-       mv Makefile.tmp Makefile.depend
+               Makefile.tmp1 > Makefile.tmp2
+       rm Makefile.tmp1
+       mv Makefile.tmp2 Makefile.depend
 
 regress-distclean:
        @find regress \
 
 regress-distclean:
        @find regress \
@@ -576,6 +591,10 @@ mandoc-$(VERSION).tar.gz: $(DISTFILES)
        ( cd .dist/ && tar zcf ../$@ mandoc-$(VERSION) )
        rm -rf .dist/
 
        ( 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
 # === SUFFIX RULES =====================================================
 
 .SUFFIXES:      .1       .3       .5       .7       .8       .h
@@ -584,7 +603,7 @@ mandoc-$(VERSION).tar.gz: $(DISTFILES)
 .h.h.html:
        highlight -I $< > $@
 
 .h.h.html:
        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 \
-       $< > $@
+.1.1.html .3.3.html .5.5.html .7.7.html .8.8.html:
+       ./mandoc -Thtml -Wwarning,stop \
+               -O 'style=/mandoc.css,man=/man/%N.%S.html;https://man.openbsd.org/%N.%S,includes=/includes/%I.html' \
+               $< > $@
A git conversion mirror of mandoc.bsd.lv