]> git.cameronkatri.com Git - mandoc.git/blobdiff - Makefile
Compat glue needed for Solaris 9 and 10.
[mandoc.git] / Makefile
index e66c7cac3a29a232e873d284797bf284c70b455c..231b4161dabede5c18c113ba869ae603ee0d6efb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
-# $Id: Makefile,v 1.434 2014/08/08 23:47:21 schwarze Exp $
+# $Id: Makefile,v 1.458 2015/03/19 14:57:29 schwarze Exp $
 #
 # Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
-# Copyright (c) 2011, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
+# Copyright (c) 2011, 2013, 2014, 2015 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
 # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-VERSION                 = 1.13.1
+VERSION = 1.13.3
 
-# === USER SETTINGS ====================================================
+# === LIST OF FILES ====================================================
 
-# --- user settings relevant for all builds ----------------------------
-
-# Specify this if you want to hard-code the operating system to appear
-# in the lower-left hand corner of -mdoc manuals.
-#
-# CFLAGS       += -DOSNAME="\"OpenBSD 5.5\""
-
-# IFF your system supports multi-byte functions (setlocale(), wcwidth(),
-# putwchar()) AND has __STDC_ISO_10646__ (that is, wchar_t is simply a
-# UCS-4 value) should you define USE_WCHAR.  If you define it and your
-# system DOESN'T support this, -Tlocale will produce garbage.
-# If you don't define it, -Tlocale is a synonym for -Tacsii.
-#
-CFLAGS         += -DUSE_WCHAR
-
-CFLAGS         += -g -DHAVE_CONFIG_H
-CFLAGS         += -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings
-PREFIX          = /usr/local
-BINDIR          = $(PREFIX)/bin
-INCLUDEDIR      = $(PREFIX)/include/mandoc
-LIBDIR          = $(PREFIX)/lib/mandoc
-MANDIR          = $(PREFIX)/man
-EXAMPLEDIR      = $(PREFIX)/share/examples/mandoc
-
-INSTALL                 = install
-INSTALL_PROGRAM         = $(INSTALL) -m 0555
-INSTALL_DATA    = $(INSTALL) -m 0444
-INSTALL_LIB     = $(INSTALL) -m 0444
-INSTALL_SOURCE  = $(INSTALL) -m 0644
-INSTALL_MAN     = $(INSTALL_DATA)
-
-# --- user settings related to database support ------------------------
-
-# If you want to build without database support, for example to avoid
-# the dependency on SQLite3, comment the following line.
-# However, you won't get apropos(1) and makewhatis(8) in that case.
-#
-BUILD_TARGETS  += db-build
-
-# The remaining settings in this section
-# are only relevant if db-build is enabled.
-# Otherwise, they have no effect either way.
-
-# If your system has manpath(1), uncomment this.  This is most any
-# system that's not OpenBSD or NetBSD.  If uncommented, apropos(1)
-# and makewhatis(8) will use manpath(1) to get the MANPATH variable.
-#
-#CFLAGS                += -DUSE_MANPATH
-
-# On some systems, SQLite3 may be installed below /usr/local.
-# In that case, uncomment the following two lines.
-#
-#CFLAGS                += -I/usr/local/include
-#DBLIB         += -L/usr/local/lib
-
-# OpenBSD has the ohash functions in libutil.
-# Comment the following line if your system doesn't.
-#
-DBLIB          += -lutil
-
-SBINDIR                 = $(PREFIX)/sbin
-
-# --- user settings related to man.cgi ---------------------------------
-
-# To build man.cgi, copy cgi.h.example to cgi.h, edit it,
-# and enable the following line.
-# Obviously, this requires that db-build is enabled, too.
-#
-#BUILD_TARGETS += cgi-build
-
-# The remaining settings in this section
-# are only relevant if cgi-build is enabled.
-# Otherwise, they have no effect either way.
-
-# If your system does not support static binaries, comment this,
-# for example on Mac OS X.
-#
-STATIC          = -static
-
-# Linux requires -pthread for statical linking.
-#
-#STATIC                += -pthread
-
-WWWPREFIX       = /var/www
-HTDOCDIR        = $(WWWPREFIX)/htdocs
-CGIBINDIR       = $(WWWPREFIX)/cgi-bin
-
-# === END OF USER SETTINGS =============================================
-
-INSTALL_TARGETS         = $(BUILD_TARGETS:-build=-install)
-
-BASEBIN                 = mandoc preconv demandoc
-DBBIN           = apropos makewhatis
-CGIBIN          = man.cgi
-
-DBLIB          += -lsqlite3
-
-TESTSRCS        = test-fgetln.c \
+TESTSRCS        = test-dirent-namlen.c \
+                  test-fgetln.c \
+                  test-fts.c \
                   test-getsubopt.c \
+                  test-isblank.c \
+                  test-mkdtemp.c \
                   test-mmap.c \
                   test-ohash.c \
                   test-reallocarray.c \
+                  test-sqlite3.c \
                   test-sqlite3_errstr.c \
                   test-strcasestr.c \
                   test-strlcat.c \
                   test-strlcpy.c \
                   test-strptime.c \
-                  test-strsep.c
+                  test-strsep.c \
+                  test-strtonum.c \
+                  test-vasprintf.c \
+                  test-wchar.c
 
-SRCS            = apropos.c \
-                  arch.c \
-                  att.c \
+SRCS            = att.c \
                   cgi.c \
                   chars.c \
                   compat_fgetln.c \
+                  compat_fts.c \
                   compat_getsubopt.c \
+                  compat_isblank.c \
+                  compat_mkdtemp.c \
                   compat_ohash.c \
                   compat_reallocarray.c \
                   compat_sqlite3_errstr.c \
@@ -142,6 +54,8 @@ SRCS          = apropos.c \
                   compat_strlcat.c \
                   compat_strlcpy.c \
                   compat_strsep.c \
+                  compat_strtonum.c \
+                  compat_vasprintf.c \
                   demandoc.c \
                   eqn.c \
                   eqn_html.c \
@@ -186,7 +100,6 @@ SRCS                 = apropos.c \
                   term_ascii.c \
                   term_ps.c \
                   tree.c \
-                  vol.c \
                   $(TESTSRCS)
 
 DISTFILES       = INSTALL \
@@ -196,14 +109,12 @@ DISTFILES  = INSTALL \
                   NEWS \
                   TODO \
                   apropos.1 \
-                  arch.in \
-                  att.in \
                   cgi.h.example \
                   chars.in \
+                  compat_fts.h \
                   compat_ohash.h \
-                  config.h.post \
-                  config.h.pre \
                   configure \
+                  configure.local.example \
                   demandoc.1 \
                   eqn.7 \
                   example.style.css \
@@ -217,6 +128,7 @@ DISTFILES    = INSTALL \
                   main.h \
                   makewhatis.8 \
                   man-cgi.css \
+                  man.1 \
                   man.7 \
                   man.cgi.8 \
                   man.h \
@@ -227,6 +139,7 @@ DISTFILES    = INSTALL \
                   mandoc_aux.h \
                   mandoc_char.7 \
                   mandoc_escape.3 \
+                  mandoc_headers.3 \
                   mandoc_html.3 \
                   mandoc_malloc.3 \
                   manpath.h \
@@ -237,7 +150,6 @@ DISTFILES    = INSTALL \
                   mdoc.h \
                   msec.in \
                   out.h \
-                  preconv.1 \
                   predefs.in \
                   roff.7 \
                   st.in \
@@ -245,7 +157,6 @@ DISTFILES    = INSTALL \
                   tbl.3 \
                   tbl.7 \
                   term.h \
-                  vol.in \
                   $(SRCS)
 
 LIBMAN_OBJS     = man.o \
@@ -253,16 +164,14 @@ LIBMAN_OBJS        = man.o \
                   man_macro.o \
                   man_validate.o
 
-LIBMDOC_OBJS    = arch.o \
-                  att.o \
+LIBMDOC_OBJS    = att.o \
                   lib.o \
                   mdoc.o \
                   mdoc_argv.o \
                   mdoc_hash.o \
                   mdoc_macro.o \
                   mdoc_validate.o \
-                  st.o \
-                  vol.o
+                  st.o
 
 LIBROFF_OBJS    = eqn.o \
                   roff.o \
@@ -278,17 +187,23 @@ LIBMANDOC_OBJS     = $(LIBMAN_OBJS) \
                   mandoc.o \
                   mandoc_aux.o \
                   msec.o \
+                  preconv.o \
                   read.o
 
 COMPAT_OBJS     = compat_fgetln.o \
+                  compat_fts.o \
                   compat_getsubopt.o \
+                  compat_isblank.o \
+                  compat_mkdtemp.o \
                   compat_ohash.o \
                   compat_reallocarray.o \
                   compat_sqlite3_errstr.o \
                   compat_strcasestr.o \
                   compat_strlcat.o \
                   compat_strlcpy.o \
-                  compat_strsep.o
+                  compat_strsep.o \
+                  compat_strtonum.o \
+                  compat_vasprintf.o
 
 MANDOC_HTML_OBJS = eqn_html.o \
                   html.o \
@@ -306,18 +221,19 @@ MANDOC_TERM_OBJS = eqn_term.o \
                   term_ps.o \
                   tbl_term.o
 
-MANDOC_OBJS     = $(MANDOC_HTML_OBJS) \
+BASE_OBJS       = $(MANDOC_HTML_OBJS) \
                   $(MANDOC_MAN_OBJS) \
                   $(MANDOC_TERM_OBJS) \
                   main.o \
+                  manpath.o \
                   out.o \
                   tree.o
 
-MAKEWHATIS_OBJS         = mandocdb.o mansearch_const.o manpath.o
-
-PRECONV_OBJS    = preconv.o
+MAIN_OBJS       = $(BASE_OBJS)
 
-APROPOS_OBJS    = apropos.o mansearch.o mansearch_const.o manpath.o
+DB_OBJS                 = mandocdb.o \
+                  mansearch.o \
+                  mansearch_const.o
 
 CGI_OBJS        = $(MANDOC_HTML_OBJS) \
                   cgi.o \
@@ -331,10 +247,11 @@ DEMANDOC_OBJS      = demandoc.o
 
 WWW_MANS        = apropos.1.html \
                   demandoc.1.html \
+                  man.1.html \
                   mandoc.1.html \
-                  preconv.1.html \
                   mandoc.3.html \
                   mandoc_escape.3.html \
+                  mandoc_headers.3.html \
                   mandoc_html.3.html \
                   mandoc_malloc.3.html \
                   mansearch.3.html \
@@ -359,34 +276,40 @@ WWW_MANS   = apropos.1.html \
 WWW_OBJS        = mdocml.tar.gz \
                   mdocml.sha256
 
-# === DEPENDENCY HANDLING ==============================================
+# === USER CONFIGURATION ===============================================
 
-all: base-build $(BUILD_TARGETS)
+include Makefile.local
+
+# === DEPENDENCY HANDLING ==============================================
 
-base-build: $(BASEBIN)
+all: base-build $(BUILD_TARGETS) Makefile.local
 
-db-build: $(DBBIN)
+base-build: mandoc demandoc
 
-cgi-build: $(CGIBIN)
+cgi-build: man.cgi
 
 install: base-install $(INSTALL_TARGETS)
 
 www: $(WWW_OBJS) $(WWW_MANS)
 
+$(WWW_MANS): mandoc
+
+.PHONY: base-install cgi-install db-install install www-install
+.PHONY: clean distclean depend
+
 include Makefile.depend
 
 # === TARGETS CONTAINING SHELL COMMANDS ================================
 
+distclean: clean
+       rm -f Makefile.local config.h config.h.old config.log config.log.old
+
 clean:
-       rm -f libmandoc.a $(LIBMANDOC_OBJS)
-       rm -f apropos $(APROPOS_OBJS)
-       rm -f makewhatis $(MAKEWHATIS_OBJS)
-       rm -f preconv $(PRECONV_OBJS)
+       rm -f libmandoc.a $(LIBMANDOC_OBJS) $(COMPAT_OBJS)
+       rm -f mandoc $(BASE_OBJS) $(DB_OBJS)
        rm -f man.cgi $(CGI_OBJS)
        rm -f manpage $(MANPAGE_OBJS)
        rm -f demandoc $(DEMANDOC_OBJS)
-       rm -f mandoc $(MANDOC_OBJS)
-       rm -f config.h config.log $(COMPAT_OBJS)
        rm -f $(WWW_MANS) $(WWW_OBJS)
        rm -rf *.dSYM
 
@@ -398,33 +321,41 @@ base-install: base-build
        mkdir -p $(DESTDIR)$(MANDIR)/man1
        mkdir -p $(DESTDIR)$(MANDIR)/man3
        mkdir -p $(DESTDIR)$(MANDIR)/man7
-       $(INSTALL_PROGRAM) $(BASEBIN) $(DESTDIR)$(BINDIR)
+       $(INSTALL_PROGRAM) mandoc demandoc $(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 \
                $(DESTDIR)$(INCLUDEDIR)
-       $(INSTALL_MAN) mandoc.1 preconv.1 demandoc.1 $(DESTDIR)$(MANDIR)/man1
+       $(INSTALL_MAN) mandoc.1 demandoc.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
-       $(INSTALL_MAN) man.7 mdoc.7 roff.7 eqn.7 tbl.7 mandoc_char.7 \
-               $(DESTDIR)$(MANDIR)/man7
+       $(INSTALL_MAN) man.7 $(DESTDIR)$(MANDIR)/man7/${MANM_MAN}.7
+       $(INSTALL_MAN) mdoc.7 $(DESTDIR)$(MANDIR)/man7/${MANM_MDOC}.7
+       $(INSTALL_MAN) roff.7 $(DESTDIR)$(MANDIR)/man7/${MANM_ROFF}.7
+       $(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: db-build
+db-install: base-build
        mkdir -p $(DESTDIR)$(BINDIR)
        mkdir -p $(DESTDIR)$(SBINDIR)
        mkdir -p $(DESTDIR)$(MANDIR)/man1
        mkdir -p $(DESTDIR)$(MANDIR)/man3
        mkdir -p $(DESTDIR)$(MANDIR)/man5
        mkdir -p $(DESTDIR)$(MANDIR)/man8
-       $(INSTALL_PROGRAM) apropos $(DESTDIR)$(BINDIR)
-       ln -f $(DESTDIR)$(BINDIR)/apropos $(DESTDIR)$(BINDIR)/whatis
-       $(INSTALL_PROGRAM) makewhatis $(DESTDIR)$(SBINDIR)
-       $(INSTALL_MAN) apropos.1 $(DESTDIR)$(MANDIR)/man1
-       ln -f $(DESTDIR)$(MANDIR)/man1/apropos.1 \
-               $(DESTDIR)$(MANDIR)/man1/whatis.1
+       ln -f $(DESTDIR)$(BINDIR)/mandoc $(DESTDIR)$(BINDIR)/$(BINM_APROPOS)
+       ln -f $(DESTDIR)$(BINDIR)/mandoc $(DESTDIR)$(BINDIR)/$(BINM_WHATIS)
+       ln -f $(DESTDIR)$(BINDIR)/mandoc \
+               $(DESTDIR)$(SBINDIR)/$(BINM_MAKEWHATIS)
+       $(INSTALL_MAN) apropos.1 $(DESTDIR)$(MANDIR)/man1/$(BINM_APROPOS).1
+       ln -f $(DESTDIR)$(MANDIR)/man1/$(BINM_APROPOS).1 \
+               $(DESTDIR)$(MANDIR)/man1/$(BINM_WHATIS).1
        $(INSTALL_MAN) mansearch.3 $(DESTDIR)$(MANDIR)/man3
        $(INSTALL_MAN) mandoc.db.5 $(DESTDIR)$(MANDIR)/man5
-       $(INSTALL_MAN) makewhatis.8 $(DESTDIR)$(MANDIR)/man8
+       $(INSTALL_MAN) makewhatis.8 \
+               $(DESTDIR)$(MANDIR)/man8/$(BINM_MAKEWHATIS).8
 
 cgi-install: cgi-build
        mkdir -p $(DESTDIR)$(CGIBINDIR)
@@ -437,62 +368,55 @@ cgi-install: cgi-build
        $(INSTALL_MAN) apropos.1 $(DESTDIR)$(WWWPREFIX)/man/mandoc/man1/
        $(INSTALL_MAN) man.cgi.8 $(DESTDIR)$(WWWPREFIX)/man/mandoc/man8/
 
-www-install: www
-       mkdir -p $(DESTDIR)$(HTDOCDIR)/snapshots
-       $(INSTALL_DATA) $(WWW_MANS) style.css $(DESTDIR)$(HTDOCDIR)
-       $(INSTALL_DATA) $(WWW_OBJS) $(DESTDIR)$(HTDOCDIR)/snapshots
-       $(INSTALL_DATA) mdocml.tar.gz \
-               $(DESTDIR)$(HTDOCDIR)/snapshots/mdocml-$(VERSION).tar.gz
-       $(INSTALL_DATA) mdocml.sha256 \
-               $(DESTDIR)$(HTDOCDIR)/snapshots/mdocml-$(VERSION).sha256
-
-depend: config.h
-       mkdep -f Makefile.depend $(CFLAGS) $(SRCS)
-       perl -e 'undef $$/; $$_ = <>; s|/usr/include/\S+||g; \
-               s|\\\n||g; s|  +| |g; print;' Makefile.depend > Makefile.tmp
-       mv Makefile.tmp Makefile.depend
+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)
 
-mandoc: $(MANDOC_OBJS) libmandoc.a
-       $(CC) $(LDFLAGS) -o $@ $(MANDOC_OBJS) libmandoc.a
-
-makewhatis: $(MAKEWHATIS_OBJS) libmandoc.a
-       $(CC) $(LDFLAGS) -o $@ $(MAKEWHATIS_OBJS) libmandoc.a $(DBLIB)
-
-preconv: $(PRECONV_OBJS)
-       $(CC) $(LDFLAGS) -o $@ $(PRECONV_OBJS)
+mandoc: $(MAIN_OBJS) libmandoc.a
+       $(CC) $(LDFLAGS) -o $@ $(MAIN_OBJS) libmandoc.a $(DBLIB)
 
 manpage: $(MANPAGE_OBJS) libmandoc.a
        $(CC) $(LDFLAGS) -o $@ $(MANPAGE_OBJS) libmandoc.a $(DBLIB)
 
-apropos: $(APROPOS_OBJS) libmandoc.a
-       $(CC) $(LDFLAGS) -o $@ $(APROPOS_OBJS) libmandoc.a $(DBLIB)
-
 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
 
+# --- maintainer targets ---
+
+www-install: www
+       mkdir -p $(HTDOCDIR)/snapshots
+       $(INSTALL_DATA) $(WWW_MANS) style.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)
+       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
+
 mdocml.sha256: mdocml.tar.gz
        sha256 mdocml.tar.gz > $@
 
 mdocml.tar.gz: $(DISTFILES)
        mkdir -p .dist/mdocml-$(VERSION)/
-       $(INSTALL_SOURCE) $(DISTFILES) .dist/mdocml-$(VERSION)
+       $(INSTALL) -m 0644 $(DISTFILES) .dist/mdocml-$(VERSION)
        chmod 755 .dist/mdocml-$(VERSION)/configure
        ( cd .dist/ && tar zcf ../$@ mdocml-$(VERSION) )
        rm -rf .dist/
 
-config.h: configure config.h.pre config.h.post $(TESTSRCS)
-       rm -f config.log
-       CC="$(CC)" CFLAGS="$(CFLAGS)" DBLIB="$(DBLIB)" \
-               VERSION="$(VERSION)" ./configure
+# === SUFFIX RULES =====================================================
 
-.PHONY:         base-install cgi-install db-install install www-install
-.PHONY:         clean depend
 .SUFFIXES:      .1       .3       .5       .7       .8       .h
 .SUFFIXES:      .1.html  .3.html  .5.html  .7.html  .8.html  .h.html