=================================================================== RCS file: /cvs/mandoc/Makefile,v retrieving revision 1.395.2.29 retrieving revision 1.430 diff -u -p -r1.395.2.29 -r1.430 --- mandoc/Makefile 2014/08/14 20:43:22 1.395.2.29 +++ mandoc/Makefile 2014/08/05 05:48:56 1.430 @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.395.2.29 2014/08/14 20:43:22 schwarze Exp $ +# $Id: Makefile,v 1.430 2014/08/05 05:48:56 schwarze Exp $ # # Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons # Copyright (c) 2011, 2013, 2014 Ingo Schwarze @@ -15,7 +15,7 @@ # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -VERSION = 1.12.4 +VERSION = 1.13.0 # === USER SETTINGS ==================================================== @@ -30,12 +30,12 @@ VERSION = 1.12.4 # 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 -Tascii. +# If you don't define it, -Tlocale is a synonym for -Tacsii. # CFLAGS += -DUSE_WCHAR -CFLAGS += -g -W -Wall -Wstrict-prototypes -CFLAGS += -Wno-unused-parameter -Wwrite-strings +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 @@ -53,7 +53,7 @@ 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 Berkeley DB, comment the following line. +# 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 @@ -62,28 +62,64 @@ BUILD_TARGETS += db-build # are only relevant if db-build is enabled. # Otherwise, they have no effect either way. -# Non-BSD systems (Linux, etc.) need -ldb to compile mandocdb and -# apropos. -# -#DBLIB = -ldb - # If your system has manpath(1), uncomment this. This is most any # system that's not OpenBSD or NetBSD. If uncommented, apropos(1) -# and mandocdb(8) will use manpath(1) to get the MANPATH variable. +# 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 mandocdb +DBBIN = apropos makewhatis +CGIBIN = man.cgi -TESTSRCS = test-betoh64.c \ - test-fgetln.c \ +DBLIB += -lsqlite3 + +TESTSRCS = test-fgetln.c \ test-getsubopt.c \ test-mmap.c \ + test-ohash.c \ test-reallocarray.c \ test-strcasestr.c \ test-strlcat.c \ @@ -92,12 +128,13 @@ TESTSRCS = test-betoh64.c \ test-strsep.c SRCS = apropos.c \ - apropos_db.c \ arch.c \ att.c \ + cgi.c \ chars.c \ compat_fgetln.c \ compat_getsubopt.c \ + compat_ohash.c \ compat_reallocarray.c \ compat_strcasestr.c \ compat_strlcat.c \ @@ -119,7 +156,10 @@ SRCS = apropos.c \ mandoc.c \ mandoc_aux.c \ mandocdb.c \ + manpage.c \ manpath.c \ + mansearch.c \ + mansearch_const.c \ mdoc.c \ mdoc_argv.c \ mdoc_hash.c \ @@ -147,17 +187,17 @@ SRCS = apropos.c \ vol.c \ $(TESTSRCS) -DISTFILES = INSTALL \ - LICENSE \ +DISTFILES = LICENSE \ Makefile \ Makefile.depend \ NEWS \ TODO \ apropos.1 \ - apropos_db.h \ arch.in \ att.in \ + cgi.h.example \ chars.in \ + compat_ohash.h \ config.h.post \ config.h.pre \ configure \ @@ -172,19 +212,23 @@ DISTFILES = INSTALL \ libmdoc.h \ libroff.h \ main.h \ + makewhatis.8 \ + man-cgi.css \ man.7 \ + man.cgi.8 \ man.h \ mandoc.1 \ mandoc.3 \ + mandoc.db.5 \ mandoc.h \ mandoc_aux.h \ mandoc_char.7 \ mandoc_escape.3 \ mandoc_html.3 \ mandoc_malloc.3 \ - mandocdb.8 \ - mandocdb.h \ manpath.h \ + mansearch.3 \ + mansearch.h \ mchars_alloc.3 \ mdoc.7 \ mdoc.h \ @@ -199,7 +243,6 @@ DISTFILES = INSTALL \ tbl.7 \ term.h \ vol.in \ - whatis.1 \ $(SRCS) LIBMAN_OBJS = man.o \ @@ -236,6 +279,7 @@ LIBMANDOC_OBJS = $(LIBMAN_OBJS) \ COMPAT_OBJS = compat_fgetln.o \ compat_getsubopt.o \ + compat_ohash.o \ compat_reallocarray.o \ compat_strcasestr.o \ compat_strlcat.o \ @@ -265,14 +309,49 @@ MANDOC_OBJS = $(MANDOC_HTML_OBJS) \ out.o \ tree.o -MANDOCDB_OBJS = mandocdb.o manpath.o +MAKEWHATIS_OBJS = mandocdb.o mansearch_const.o manpath.o PRECONV_OBJS = preconv.o -APROPOS_OBJS = apropos.o apropos_db.o manpath.o +APROPOS_OBJS = apropos.o mansearch.o mansearch_const.o manpath.o +CGI_OBJS = $(MANDOC_HTML_OBJS) \ + cgi.o \ + mansearch.o \ + mansearch_const.o \ + out.o + +MANPAGE_OBJS = manpage.o mansearch.o mansearch_const.o manpath.o + DEMANDOC_OBJS = demandoc.o +WWW_MANS = apropos.1.html \ + demandoc.1.html \ + mandoc.1.html \ + preconv.1.html \ + mandoc.3.html \ + mandoc_escape.3.html \ + mandoc_html.3.html \ + mandoc_malloc.3.html \ + mansearch.3.html \ + mchars_alloc.3.html \ + tbl.3.html \ + mandoc.db.5.html \ + eqn.7.html \ + man.7.html \ + mandoc_char.7.html \ + mdoc.7.html \ + roff.7.html \ + tbl.7.html \ + makewhatis.8.html \ + man.cgi.8.html \ + man.h.html \ + mandoc.h.html \ + mandoc_aux.h.html \ + manpath.h.html \ + mansearch.h.html \ + mdoc.h.html + WWW_OBJS = mdocml.tar.gz \ mdocml.sha256 @@ -284,23 +363,27 @@ base-build: $(BASEBIN) db-build: $(DBBIN) +cgi-build: $(CGIBIN) + install: base-install $(INSTALL_TARGETS) -www: $(WWW_OBJS) +www: $(WWW_OBJS) $(WWW_MANS) -include Makefile.depend +.include "Makefile.depend" # === TARGETS CONTAINING SHELL COMMANDS ================================ clean: rm -f libmandoc.a $(LIBMANDOC_OBJS) rm -f apropos $(APROPOS_OBJS) - rm -f mandocdb $(MANDOCDB_OBJS) + rm -f makewhatis $(MAKEWHATIS_OBJS) rm -f preconv $(PRECONV_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_OBJS) + rm -f $(WWW_MANS) $(WWW_OBJS) rm -rf *.dSYM base-install: base-build @@ -324,14 +407,42 @@ base-install: base-build db-install: db-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) $(DBBIN) $(DESTDIR)$(BINDIR) + $(INSTALL_PROGRAM) apropos $(DESTDIR)$(BINDIR) ln -f $(DESTDIR)$(BINDIR)/apropos $(DESTDIR)$(BINDIR)/whatis - $(INSTALL_MAN) apropos.1 whatis.1 $(DESTDIR)$(MANDIR)/man1 - $(INSTALL_MAN) mandocdb.8 $(DESTDIR)$(MANDIR)/man8 + $(INSTALL_PROGRAM) makewhatis $(DESTDIR)$(SBINDIR) + $(INSTALL_MAN) apropos.1 $(DESTDIR)$(MANDIR)/man1 + ln -f $(DESTDIR)$(MANDIR)/man1/apropos.1 \ + $(DESTDIR)$(MANDIR)/man1/whatis.1 + $(INSTALL_MAN) mansearch.3 $(DESTDIR)$(MANDIR)/man3 + $(INSTALL_MAN) mandoc.db.5 $(DESTDIR)$(MANDIR)/man5 + $(INSTALL_MAN) makewhatis.8 $(DESTDIR)$(MANDIR)/man8 -depend: config.h +cgi-install: cgi-build + mkdir -p $(DESTDIR)$(CGIBINDIR) + mkdir -p $(DESTDIR)$(HTDOCDIR) + 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_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 + +Makefile.depend: $(SRCS) config.h Makefile mkdep -f Makefile.depend $(CFLAGS) $(SRCS) perl -e 'undef $$/; $$_ = <>; s|/usr/include/\S+||g; \ s|\\\n||g; s| +| |g; print;' Makefile.depend > Makefile.tmp @@ -343,15 +454,21 @@ libmandoc.a: $(COMPAT_OBJS) $(LIBMANDOC_OBJS) mandoc: $(MANDOC_OBJS) libmandoc.a $(CC) $(LDFLAGS) -o $@ $(MANDOC_OBJS) libmandoc.a -mandocdb: $(MANDOCDB_OBJS) libmandoc.a - $(CC) $(LDFLAGS) -o $@ $(MANDOCDB_OBJS) libmandoc.a $(DBLIB) +makewhatis: $(MAKEWHATIS_OBJS) libmandoc.a + $(CC) $(LDFLAGS) -o $@ $(MAKEWHATIS_OBJS) libmandoc.a $(DBLIB) preconv: $(PRECONV_OBJS) $(CC) $(LDFLAGS) -o $@ $(PRECONV_OBJS) +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 @@ -369,5 +486,13 @@ config.h: configure config.h.pre config.h.post $(TESTS rm -f config.log CC="$(CC)" CFLAGS="$(CFLAGS)" VERSION="$(VERSION)" ./configure -.PHONY: base-install db-install install -.PHONY: clean depend +.PHONY: base-install clean cgi-install db-install install www-install +.SUFFIXES: .1 .3 .5 .7 .8 .h +.SUFFIXES: .1.html .3.html .5.html .7.html .8.html .h.html + +.h.h.html: + highlight -I $< > $@ + +.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 $< > $@