Without HAVE_ERR, don't try to include <err.h>, it probably isn't there.

[mandoc.git] / Makefile

diff --git a/Makefile b/Makefile
index 4ebf6980b16ef5580a5a40fd7aefe51b5a3e0293..91caa006c5fff57309ee6564bd32d762e6ace4a9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.465 2015/07/17 22:38:29 schwarze Exp $
+# $Id: Makefile,v 1.476 2015/11/07 13:14:21 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,6 +28,8 @@ TESTSRCS       = test-dirent-namlen.c \
                   test-mkdtemp.c \
                   test-mmap.c \
                   test-ohash.c \
+                  test-pledge.c \
+                  test-progname.c \
                   test-reallocarray.c \
                   test-sqlite3.c \
                   test-sqlite3_errstr.c \
@@ -43,12 +46,14 @@ TESTSRCS     = test-dirent-namlen.c \
 SRCS            = att.c \
                   cgi.c \
                   chars.c \
+                  compat_err.c \
                   compat_fgetln.c \
                   compat_fts.c \
                   compat_getsubopt.c \
                   compat_isblank.c \
                   compat_mkdtemp.c \
                   compat_ohash.c \
+                  compat_progname.c \
                   compat_reallocarray.c \
                   compat_sqlite3_errstr.c \
                   compat_strcasestr.c \
@@ -73,6 +78,7 @@ SRCS           = att.c \
                   man_validate.c \
                   mandoc.c \
                   mandoc_aux.c \
+                  mandoc_ohash.c \
                   mandocdb.c \
                   manpage.c \
                   manpath.c \
@@ -84,6 +90,7 @@ SRCS           = att.c \
                   mdoc_html.c \
                   mdoc_macro.c \
                   mdoc_man.c \
+                  mdoc_state.c \
                   mdoc_term.c \
                   mdoc_validate.c \
                   msec.c \
@@ -113,7 +120,6 @@ DISTFILES    = INSTALL \
                   TODO \
                   apropos.1 \
                   cgi.h.example \
-                  chars.in \
                   compat_fts.h \
                   compat_ohash.h \
                   compat_stringlist.h \
@@ -121,7 +127,6 @@ DISTFILES    = INSTALL \
                   configure.local.example \
                   demandoc.1 \
                   eqn.7 \
-                  example.style.css \
                   gmdiff \
                   html.h \
                   lib.in \
@@ -131,7 +136,6 @@ DISTFILES    = INSTALL \
                   libroff.h \
                   main.h \
                   makewhatis.8 \
-                  man-cgi.css \
                   man.1 \
                   man.7 \
                   man.cgi.8 \
@@ -140,6 +144,7 @@ DISTFILES    = INSTALL \
                   manconf.h \
                   mandoc.1 \
                   mandoc.3 \
+                  mandoc.css \
                   mandoc.db.5 \
                   mandoc.h \
                   mandoc_aux.h \
@@ -148,6 +153,7 @@ DISTFILES    = INSTALL \
                   mandoc_headers.3 \
                   mandoc_html.3 \
                   mandoc_malloc.3 \
+                  mandoc_ohash.h \
                   mansearch.3 \
                   mansearch.h \
                   mchars_alloc.3 \
@@ -160,7 +166,6 @@ DISTFILES    = INSTALL \
                   roff.h \
                   soelim.1 \
                   st.in \
-                  style.css \
                   tag.h \
                   tbl.3 \
                   tbl.7 \
@@ -179,6 +184,7 @@ LIBMDOC_OBJS         = att.o \
                   mdoc_argv.o \
                   mdoc_hash.o \
                   mdoc_macro.o \
+                  mdoc_state.o \
                   mdoc_validate.o \
                   st.o
 
@@ -195,16 +201,19 @@ 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 \
                   compat_mkdtemp.o \
                   compat_ohash.o \
+                  compat_progname.o \
                   compat_reallocarray.o \
                   compat_sqlite3_errstr.o \
                   compat_strcasestr.o \
@@ -331,19 +340,20 @@ clean:
 
 base-install: base-build
        mkdir -p $(DESTDIR)$(BINDIR)
-       mkdir -p $(DESTDIR)$(EXAMPLEDIR)
        mkdir -p $(DESTDIR)$(LIBDIR)
        mkdir -p $(DESTDIR)$(INCLUDEDIR)
        mkdir -p $(DESTDIR)$(MANDIR)/man1
        mkdir -p $(DESTDIR)$(MANDIR)/man3
        mkdir -p $(DESTDIR)$(MANDIR)/man5
        mkdir -p $(DESTDIR)$(MANDIR)/man7
-       $(INSTALL_PROGRAM) mandoc demandoc soelim $(DESTDIR)$(BINDIR)
+       $(INSTALL_PROGRAM) mandoc demandoc $(DESTDIR)$(BINDIR)
+       $(INSTALL_PROGRAM) soelim $(DESTDIR)$(BINDIR)/$(BINM_SOELIM)
        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 soelim.1 $(DESTDIR)$(MANDIR)/man1
+       $(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) mandoc.3 mandoc_escape.3 mandoc_malloc.3 \
                mchars_alloc.3 tbl.3 $(DESTDIR)$(MANDIR)/man3
@@ -354,7 +364,6 @@ base-install: base-build
        $(INSTALL_MAN) eqn.7 $(DESTDIR)$(MANDIR)/man7/${MANM_EQN}.7
        $(INSTALL_MAN) tbl.7 $(DESTDIR)$(MANDIR)/man7/${MANM_TBL}.7
        $(INSTALL_MAN) mandoc_char.7 $(DESTDIR)$(MANDIR)/man7
-       $(INSTALL_DATA) example.style.css $(DESTDIR)$(EXAMPLEDIR)
 
 db-install: base-build
        mkdir -p $(DESTDIR)$(BINDIR)
@@ -381,8 +390,7 @@ cgi-install: cgi-build
        mkdir -p $(DESTDIR)$(WWWPREFIX)/man/mandoc/man1
        mkdir -p $(DESTDIR)$(WWWPREFIX)/man/mandoc/man8
        $(INSTALL_PROGRAM) man.cgi $(DESTDIR)$(CGIBINDIR)
-       $(INSTALL_DATA) example.style.css $(DESTDIR)$(HTDOCDIR)/man.css
-       $(INSTALL_DATA) man-cgi.css $(DESTDIR)$(HTDOCDIR)
+       $(INSTALL_DATA) mandoc.css $(DESTDIR)$(HTDOCDIR)
        $(INSTALL_MAN) apropos.1 $(DESTDIR)$(WWWPREFIX)/man/mandoc/man1/
        $(INSTALL_MAN) man.cgi.8 $(DESTDIR)$(WWWPREFIX)/man/mandoc/man8/
 
@@ -403,7 +411,7 @@ 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 $(DBLIB)
 
 soelim: $(SOELIM_OBJS) compat_reallocarray.o
        $(CC) $(LDFLAGS) -o $@ $(SOELIM_OBJS) compat_reallocarray.o
@@ -412,7 +420,7 @@ soelim: $(SOELIM_OBJS) compat_reallocarray.o
 
 www-install: www
        mkdir -p $(HTDOCDIR)/snapshots
-       $(INSTALL_DATA) $(WWW_MANS) style.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
@@ -446,4 +454,4 @@ mdocml.tar.gz: $(DISTFILES)
 
 .1.1.html .3.3.html .5.5.html .7.7.html .8.8.html: mandoc
        ./mandoc -Thtml -Wall,stop \
-               -Ostyle=style.css,man=%N.%S.html,includes=%I.html $< > $@
+               -Ostyle=mandoc.css,man=%N.%S.html,includes=%I.html $< > $@