Reduce the amount of code by moving the three copies of the ohash

[mandoc.git] / Makefile

diff --git a/Makefile b/Makefile
index cb120f3e531d2d497d07aa544b0659211c965bf3..c101c6ff0b100c6a98b5ae288a2f4e334f299686 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.461 2015/04/02 21:36:49 schwarze Exp $
+# $Id: Makefile,v 1.468 2015/10/13 15:53:05 schwarze Exp $
 #
 # Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
 # Copyright (c) 2011, 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -20,6 +20,7 @@ VERSION = 1.13.3
 # === LIST OF FILES ====================================================
 
 TESTSRCS        = test-dirent-namlen.c \
+                  test-err.c \
                   test-fgetln.c \
                   test-fts.c \
                   test-getsubopt.c \
@@ -27,10 +28,12 @@ TESTSRCS     = test-dirent-namlen.c \
                   test-mkdtemp.c \
                   test-mmap.c \
                   test-ohash.c \
+                  test-progname.c \
                   test-reallocarray.c \
                   test-sqlite3.c \
                   test-sqlite3_errstr.c \
                   test-strcasestr.c \
+                  test-stringlist.c \
                   test-strlcat.c \
                   test-strlcpy.c \
                   test-strptime.c \
@@ -42,6 +45,7 @@ TESTSRCS       = test-dirent-namlen.c \
 SRCS            = att.c \
                   cgi.c \
                   chars.c \
+                  compat_err.c \
                   compat_fgetln.c \
                   compat_fts.c \
                   compat_getsubopt.c \
@@ -51,6 +55,7 @@ SRCS           = att.c \
                   compat_reallocarray.c \
                   compat_sqlite3_errstr.c \
                   compat_strcasestr.c \
+                  compat_stringlist.c \
                   compat_strlcat.c \
                   compat_strlcpy.c \
                   compat_strsep.c \
@@ -71,6 +76,7 @@ SRCS           = att.c \
                   man_validate.c \
                   mandoc.c \
                   mandoc_aux.c \
+                  mandoc_ohash.c \
                   mandocdb.c \
                   manpage.c \
                   manpath.c \
@@ -89,7 +95,9 @@ SRCS           = att.c \
                   preconv.c \
                   read.c \
                   roff.c \
+                  soelim.c \
                   st.c \
+                  tag.c \
                   tbl.c \
                   tbl_data.c \
                   tbl_html.c \
@@ -99,8 +107,7 @@ SRCS          = att.c \
                   term.c \
                   term_ascii.c \
                   term_ps.c \
-                  tree.c \
-                  $(TESTSRCS)
+                  tree.c
 
 DISTFILES       = INSTALL \
                   LICENSE \
@@ -113,6 +120,7 @@ DISTFILES    = INSTALL \
                   chars.in \
                   compat_fts.h \
                   compat_ohash.h \
+                  compat_stringlist.h \
                   configure \
                   configure.local.example \
                   demandoc.1 \
@@ -144,6 +152,7 @@ DISTFILES    = INSTALL \
                   mandoc_headers.3 \
                   mandoc_html.3 \
                   mandoc_malloc.3 \
+                  mandoc_ohash.h \
                   mansearch.3 \
                   mansearch.h \
                   mchars_alloc.3 \
@@ -154,12 +163,15 @@ DISTFILES  = INSTALL \
                   predefs.in \
                   roff.7 \
                   roff.h \
+                  soelim.1 \
                   st.in \
                   style.css \
+                  tag.h \
                   tbl.3 \
                   tbl.7 \
                   term.h \
-                  $(SRCS)
+                  $(SRCS) \
+                  $(TESTSRCS)
 
 LIBMAN_OBJS     = man.o \
                   man_hash.o \
@@ -188,11 +200,13 @@ LIBMANDOC_OBJS     = $(LIBMAN_OBJS) \
                   chars.o \
                   mandoc.o \
                   mandoc_aux.o \
+                  mandoc_ohash.o \
                   msec.o \
                   preconv.o \
                   read.o
 
-COMPAT_OBJS     = compat_fgetln.o \
+COMPAT_OBJS     = compat_err.o \
+                  compat_fgetln.o \
                   compat_fts.o \
                   compat_getsubopt.o \
                   compat_isblank.o \
@@ -229,6 +243,7 @@ BASE_OBJS    = $(MANDOC_HTML_OBJS) \
                   main.o \
                   manpath.o \
                   out.o \
+                  tag.o \
                   tree.o
 
 MAIN_OBJS       = $(BASE_OBJS)
@@ -247,10 +262,13 @@ MANPAGE_OBJS       = manpage.o mansearch.o mansearch_const.o manpath.o
 
 DEMANDOC_OBJS   = demandoc.o
 
+SOELIM_OBJS     = soelim.o compat_stringlist.o
+
 WWW_MANS        = apropos.1.html \
                   demandoc.1.html \
                   man.1.html \
                   mandoc.1.html \
+                  soelim.1.html \
                   mandoc.3.html \
                   mandoc_escape.3.html \
                   mandoc_headers.3.html \
@@ -288,7 +306,7 @@ include Makefile.local
 
 all: base-build $(BUILD_TARGETS) Makefile.local
 
-base-build: mandoc demandoc
+base-build: mandoc demandoc soelim
 
 cgi-build: man.cgi
 
@@ -314,6 +332,7 @@ clean:
        rm -f man.cgi $(CGI_OBJS)
        rm -f manpage $(MANPAGE_OBJS)
        rm -f demandoc $(DEMANDOC_OBJS)
+       rm -f soelim $(SOELIM_OBJS)
        rm -f $(WWW_MANS) $(WWW_OBJS)
        rm -rf *.dSYM
 
@@ -326,12 +345,12 @@ base-install: base-build
        mkdir -p $(DESTDIR)$(MANDIR)/man3
        mkdir -p $(DESTDIR)$(MANDIR)/man5
        mkdir -p $(DESTDIR)$(MANDIR)/man7
-       $(INSTALL_PROGRAM) mandoc demandoc $(DESTDIR)$(BINDIR)
+       $(INSTALL_PROGRAM) mandoc demandoc soelim $(DESTDIR)$(BINDIR)
        ln -f $(DESTDIR)$(BINDIR)/mandoc $(DESTDIR)$(BINDIR)/$(BINM_MAN)
        $(INSTALL_LIB) libmandoc.a $(DESTDIR)$(LIBDIR)
        $(INSTALL_LIB) man.h mandoc.h mandoc_aux.h mdoc.h roff.h \
                $(DESTDIR)$(INCLUDEDIR)
-       $(INSTALL_MAN) mandoc.1 demandoc.1 $(DESTDIR)$(MANDIR)/man1
+       $(INSTALL_MAN) mandoc.1 demandoc.1 soelim.1 $(DESTDIR)$(MANDIR)/man1
        $(INSTALL_MAN) man.1 $(DESTDIR)$(MANDIR)/man1/$(BINM_MAN).1
        $(INSTALL_MAN) mandoc.3 mandoc_escape.3 mandoc_malloc.3 \
                mchars_alloc.3 tbl.3 $(DESTDIR)$(MANDIR)/man3
@@ -391,7 +410,10 @@ man.cgi: $(CGI_OBJS) libmandoc.a
        $(CC) $(LDFLAGS) $(STATIC) -o $@ $(CGI_OBJS) libmandoc.a $(DBLIB)
 
 demandoc: $(DEMANDOC_OBJS) libmandoc.a
-       $(CC) $(LDFLAGS) -o $@ $(DEMANDOC_OBJS) libmandoc.a
+       $(CC) $(LDFLAGS) -o $@ $(DEMANDOC_OBJS) libmandoc.a -lz
+
+soelim: $(SOELIM_OBJS) compat_reallocarray.o
+       $(CC) $(LDFLAGS) -o $@ $(SOELIM_OBJS) compat_reallocarray.o
 
 # --- maintainer targets ---