=================================================================== RCS file: /cvs/mandoc/Makefile,v retrieving revision 1.395.2.20 retrieving revision 1.415 diff -u -p -r1.395.2.20 -r1.415 --- mandoc/Makefile 2014/08/05 00:42:53 1.395.2.20 +++ mandoc/Makefile 2014/04/15 20:18:26 1.415 @@ -1,28 +1,16 @@ -# $Id: Makefile,v 1.395.2.20 2014/08/05 00:42:53 schwarze Exp $ -# -# Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons -# Copyright (c) 2011, 2013, 2014 Ingo Schwarze -# -# Permission to use, copy, modify, and distribute this software for any -# purpose with or without fee is hereby granted, provided that the above -# copyright notice and this permission notice appear in all copies. -# -# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +.PHONY: clean install installcgi installwww +.SUFFIXES: .md5 .h .h.html +.SUFFIXES: .1 .3 .5 .7 .8 +.SUFFIXES: .1.html .3.html .5.html .7.html .8.html -VERSION = 1.12.4 +VERSION = 1.13.0 # === USER SETTINGS ==================================================== # 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\"" +# CFLAGS += -DOSNAME="\"OpenBSD 5.4\"" # IFF your system supports multi-byte functions (setlocale(), wcwidth(), # putwchar()) AND has __STDC_ISO_10646__ (that is, wchar_t is simply a @@ -33,16 +21,22 @@ VERSION = 1.12.4 CFLAGS += -DUSE_WCHAR # 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 popen(3) manpath(1) to get the MANPATH -# variable. +# system that's not OpenBSD or NetBSD. If uncommented, manpage(1) and +# mandocdb(8) will use manpath(1) to get the MANPATH variable. #CFLAGS += -DUSE_MANPATH -CFLAGS += -g -DHAVE_CONFIG_H +# If your system does not support static binaries, comment this, +# for example on Mac OS X. +STATIC = -static +# Linux requires -pthread to statically link with libdb. +#STATIC += -pthread + +CFLAGS += -I/usr/local/include -g -DHAVE_CONFIG_H CFLAGS += -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings PREFIX = /usr/local WWWPREFIX = /var/www HTDOCDIR = $(WWWPREFIX)/htdocs +CGIBINDIR = $(WWWPREFIX)/cgi-bin BINDIR = $(PREFIX)/bin INCLUDEDIR = $(PREFIX)/include/mandoc LIBDIR = $(PREFIX)/lib/mandoc @@ -55,13 +49,10 @@ INSTALL_LIB = $(INSTALL) -m 0644 INSTALL_SOURCE = $(INSTALL) -m 0644 INSTALL_MAN = $(INSTALL_DATA) -# Non-BSD systems (Linux, etc.) need -ldb to compile mandocdb and -# apropos. -# However, if you don't have -ldb at all (or it's not native), then -# comment out apropos and mandocdb. -# -#DBLIB = -ldb -DBBIN = apropos mandocdb whatis +# If you want to build without database support, for example to avoid +# the dependency on SQLite3, comment the following two lines. +DBLIB = -L/usr/local/lib -lsqlite3 +DBBIN = mandocdb manpage apropos # === END OF USER SETTINGS ============================================= @@ -69,35 +60,35 @@ ALLBIN = mandoc preconv demandoc $(DBBIN) all: $(ALLBIN) -TESTSRCS = test-betoh64.c \ - test-fgetln.c \ +TESTSRCS = test-fgetln.c \ test-getsubopt.c \ test-mmap.c \ - test-reallocarray.c \ + test-ohash.c \ test-strlcat.c \ test-strlcpy.c \ + test-strnlen.c \ test-strptime.c -SRCS = LICENSE \ - Makefile \ +SRCS = Makefile \ NEWS \ TODO \ apropos.1 \ apropos.c \ - apropos_db.c \ - apropos_db.h \ arch.c \ arch.in \ att.c \ att.in \ + cgi.c \ chars.c \ chars.in \ compat_fgetln.c \ compat_getsubopt.c \ - compat_reallocarray.c \ + compat_ohash.c \ + compat_ohash.h \ compat_strcasestr.c \ compat_strlcat.c \ compat_strlcpy.c \ + compat_strnlen.c \ compat_strsep.c \ config.h.post \ config.h.pre \ @@ -122,6 +113,7 @@ SRCS = LICENSE \ main.h \ man.7 \ man.c \ + man-cgi.css \ man.h \ man_hash.c \ man_html.c \ @@ -131,15 +123,20 @@ SRCS = LICENSE \ mandoc.1 \ mandoc.3 \ mandoc.c \ + mandoc.db.5 \ mandoc.h \ mandoc_aux.c \ mandoc_aux.h \ mandoc_char.7 \ mandocdb.8 \ mandocdb.c \ - mandocdb.h \ + manpage.c \ manpath.c \ manpath.h \ + mansearch.3 \ + mansearch.c \ + mansearch.h \ + mansearch_const.c \ mdoc.7 \ mdoc.c \ mdoc.h \ @@ -178,7 +175,6 @@ SRCS = LICENSE \ tree.c \ vol.c \ vol.in \ - whatis.1 \ $(TESTSRCS) LIBMAN_OBJS = man.o \ @@ -215,14 +211,13 @@ LIBMANDOC_OBJS = $(LIBMAN_OBJS) \ COMPAT_OBJS = compat_fgetln.o \ compat_getsubopt.o \ - compat_reallocarray.o \ + compat_ohash.o \ compat_strcasestr.o \ compat_strlcat.o \ compat_strlcpy.o \ + compat_strnlen.o \ compat_strsep.o -# === DEPENDENCY HANDLING ============================================== - arch.o: arch.in att.o: att.in chars.o: chars.in @@ -236,7 +231,7 @@ $(LIBMAN_OBJS): libman.h $(LIBMDOC_OBJS): libmdoc.h $(LIBROFF_OBJS): libroff.h $(LIBMANDOC_OBJS): mandoc.h mandoc_aux.h mdoc.h man.h libmandoc.h config.h -$(COMPAT_OBJS): config.h +$(COMPAT_OBJS): config.h compat_ohash.h MANDOC_HTML_OBJS = eqn_html.o \ html.o \ @@ -264,27 +259,30 @@ MANDOC_OBJS = $(MANDOC_HTML_OBJS) \ tree.o $(MANDOC_OBJS): main.h mandoc.h mandoc_aux.h mdoc.h man.h config.h out.h -MANDOCDB_OBJS = mandocdb.o manpath.o -$(MANDOCDB_OBJS): mandocdb.h mandoc.h mandoc_aux.h \ +MANDOCDB_OBJS = mandocdb.o mansearch_const.o manpath.o +$(MANDOCDB_OBJS): mansearch.h mandoc.h mandoc_aux.h \ mdoc.h man.h config.h manpath.h PRECONV_OBJS = preconv.o $(PRECONV_OBJS): config.h -APROPOS_OBJS = apropos.o apropos_db.o manpath.o -$(APROPOS_OBJS): config.h mandoc.h mandoc_aux.h manpath.h \ - apropos_db.h mandocdb.h +APROPOS_OBJS = apropos.o mansearch.o mansearch_const.o manpath.o +$(APROPOS_OBJS): config.h manpath.h mansearch.h +MANPAGE_OBJS = manpage.o mansearch.o mansearch_const.o manpath.o +$(MANPAGE_OBJS): config.h manpath.h mansearch.h + DEMANDOC_OBJS = demandoc.o -$(DEMANDOC_OBJS): config.h mandoc.h man.h mdoc.h +$(DEMANDOC_OBJS): config.h WWW_MANS = apropos.1.html \ demandoc.1.html \ mandoc.1.html \ preconv.1.html \ - whatis.1.html \ mandoc.3.html \ + mansearch.3.html \ tbl.3.html \ + mandoc.db.5.html \ eqn.7.html \ man.7.html \ mandoc_char.7.html \ @@ -294,22 +292,21 @@ WWW_MANS = apropos.1.html \ mandocdb.8.html \ man.h.html \ mandoc.h.html \ - mandoc_aux.h.html \ manpath.h.html \ + mansearch.h.html \ mdoc.h.html +$(WWW_MANS): mandoc + WWW_OBJS = mdocml.tar.gz \ - mdocml.sha256 + mdocml.md5 -www: $(WWW_OBJS) $(WWW_MANS) - -# === TARGETS CONTAINING SHELL COMMANDS ================================ - clean: rm -f libmandoc.a $(LIBMANDOC_OBJS) - rm -f apropos whatis $(APROPOS_OBJS) + rm -f apropos $(APROPOS_OBJS) rm -f mandocdb $(MANDOCDB_OBJS) rm -f preconv $(PRECONV_OBJS) + rm -f manpage $(MANPAGE_OBJS) rm -f demandoc $(DEMANDOC_OBJS) rm -f mandoc $(MANDOC_OBJS) rm -f config.h config.log $(COMPAT_OBJS) @@ -323,24 +320,32 @@ install: all 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 preconv demandoc $(DESTDIR)$(BINDIR) + $(INSTALL_PROGRAM) $(ALLBIN) $(DESTDIR)$(BINDIR) $(INSTALL_LIB) libmandoc.a $(DESTDIR)$(LIBDIR) $(INSTALL_LIB) man.h mdoc.h mandoc.h $(DESTDIR)$(INCLUDEDIR) $(INSTALL_MAN) mandoc.1 preconv.1 demandoc.1 $(DESTDIR)$(MANDIR)/man1 - $(INSTALL_MAN) mandoc.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) mandoc.3 mansearch.3 tbl.3 $(DESTDIR)$(MANDIR)/man3 + $(INSTALL_MAN) mandoc.db.5 $(DESTDIR)$(MANDIR)/man5 + $(INSTALL_MAN) man.7 mdoc.7 roff.7 eqn.7 tbl.7 mandoc_char.7 $(DESTDIR)$(MANDIR)/man7 $(INSTALL_DATA) example.style.css $(DESTDIR)$(EXAMPLEDIR) -installwww: www +installcgi: all + mkdir -p $(DESTDIR)$(CGIBINDIR) + mkdir -p $(DESTDIR)$(HTDOCDIR) + #$(INSTALL_PROGRAM) man.cgi $(DESTDIR)$(CGIBINDIR) + $(INSTALL_DATA) example.style.css $(DESTDIR)$(HTDOCDIR)/man.css + $(INSTALL_DATA) man-cgi.css $(DESTDIR)$(HTDOCDIR) + +installwww: $(WWW_MANS) $(WWW_OBJS) 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 + $(INSTALL_DATA) mdocml.md5 \ + $(DESTDIR)$(HTDOCDIR)/snapshots/mdocml-$(VERSION).md5 libmandoc.a: $(COMPAT_OBJS) $(LIBMANDOC_OBJS) $(AR) rs $@ $(COMPAT_OBJS) $(LIBMANDOC_OBJS) @@ -354,8 +359,8 @@ mandocdb: $(MANDOCDB_OBJS) libmandoc.a preconv: $(PRECONV_OBJS) $(CC) $(LDFLAGS) -o $@ $(PRECONV_OBJS) -whatis: apropos - cp -f apropos whatis +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) @@ -363,8 +368,8 @@ apropos: $(APROPOS_OBJS) libmandoc.a demandoc: $(DEMANDOC_OBJS) libmandoc.a $(CC) $(LDFLAGS) -o $@ $(DEMANDOC_OBJS) libmandoc.a -mdocml.sha256: mdocml.tar.gz - sha256 mdocml.tar.gz > $@ +mdocml.md5: mdocml.tar.gz + md5 mdocml.tar.gz >$@ mdocml.tar.gz: $(SRCS) mkdir -p .dist/mdocml-$(VERSION)/ @@ -377,13 +382,8 @@ config.h: configure config.h.pre config.h.post $(TESTS rm -f config.log CC="$(CC)" CFLAGS="$(CFLAGS)" VERSION="$(VERSION)" ./configure -.PHONY: clean install installwww -.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 $< > $@ + 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 $< > $@ +.1.1.html .3.3.html .5.5.html .7.7.html .8.8.html: + ./mandoc -Thtml -Wall,stop -Ostyle=style.css,man=%N.%S.html,includes=%I.html $< >$@