Manually tag the section option.

[mandoc.git] / Makefile

diff --git a/Makefile b/Makefile
index 31ea921c4cdedc8f8ceb5b9eeba0540f6b9f253e..80882eeae6f959effbf5b980c5ea83c329a02a19 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
-# $Id: Makefile,v 1.529 2019/03/06 11:19:42 schwarze Exp $
+# $Id: Makefile,v 1.534 2020/06/15 16:58:24 schwarze Exp $
 #
+# Copyright (c) 2011, 2013-2020 Ingo Schwarze <schwarze@openbsd.org>
 # Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
-# Copyright (c) 2011, 2013-2019 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
@@ -134,6 +134,7 @@ SRCS                 = arch.c \
                   term_ascii.c \
                   term_ps.c \
                   term_tab.c \
+                  term_tag.c \
                   tree.c
 
 DISTFILES       = INSTALL \
@@ -209,6 +210,7 @@ DISTFILES    = INSTALL \
                   tbl_int.h \
                   tbl_parse.h \
                   term.h \
+                  term_tag.h \
                   $(SRCS) \
                   $(TESTSRCS)
 
@@ -245,9 +247,10 @@ LIBMANDOC_OBJS      = $(LIBMAN_OBJS) \
                   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 \
@@ -258,6 +261,7 @@ COMPAT_OBJS  = compat_err.o \
                   compat_reallocarray.o \
                   compat_recallocarray.o \
                   compat_strcasestr.o \
+                  compat_stringlist.o \
                   compat_strlcat.o \
                   compat_strlcpy.o \
                   compat_strndup.o \
@@ -280,6 +284,7 @@ MANDOC_TERM_OBJS = eqn_term.o \
                   term_ascii.o \
                   term_ps.o \
                   term_tab.o \
+                  term_tag.o \
                   tbl_term.o
 
 DBM_OBJS        = dbm.o \
@@ -302,7 +307,6 @@ MAIN_OBJS    = $(MANDOC_HTML_OBJS) \
                   mdoc_man.o \
                   mdoc_markdown.o \
                   out.o \
-                  tag.o \
                   tree.o
 
 CGI_OBJS        = $(MANDOC_HTML_OBJS) \
@@ -313,18 +317,10 @@ CGI_OBJS   = $(MANDOC_HTML_OBJS) \
 MANDOCD_OBJS    = $(MANDOC_HTML_OBJS) \
                   $(MANDOC_TERM_OBJS) \
                   mandocd.o \
-                  out.o \
-                  tag.o
+                  out.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 \
@@ -392,13 +388,14 @@ distclean: 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 soelim $(SOELIM_OBJS)
+       rm -f soelim soelim.o
        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
@@ -501,7 +498,7 @@ uninstall:
        rm -f $(DESTDIR)$(INCLUDEDIR)/tbl.h
        [ ! -e $(DESTDIR)$(INCLUDEDIR) ] || rmdir $(DESTDIR)$(INCLUDEDIR)
 
-regress: all
+regress: all man
        cd regress && ./regress.pl
 
 regress-clean:
@@ -511,12 +508,15 @@ Makefile.local config.h: configure $(TESTSRCS)
        @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)
 
+man: mandoc
+       $(LN) mandoc man
+
 man.cgi: $(CGI_OBJS) libmandoc.a
        $(CC) $(STATIC) -o $@ $(LDFLAGS) $(CGI_OBJS) libmandoc.a $(LDADD)
 
@@ -529,8 +529,8 @@ catman: catman.o libmandoc.a
 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 ---
 
@@ -540,11 +540,13 @@ www-install: www
        $(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;' \
-               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 \
@@ -585,6 +587,10 @@ mandoc-$(VERSION).tar.gz: $(DISTFILES)
        ( 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