=================================================================== RCS file: /cvs/mandoc/Makefile,v retrieving revision 1.395.2.18 retrieving revision 1.395.2.21 diff -u -p -r1.395.2.18 -r1.395.2.21 --- mandoc/Makefile 2014/04/24 00:36:44 1.395.2.18 +++ mandoc/Makefile 2014/08/05 01:07:42 1.395.2.21 @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.395.2.18 2014/04/24 00:36:44 schwarze Exp $ +# $Id: Makefile,v 1.395.2.21 2014/08/05 01:07:42 schwarze Exp $ # # Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons # Copyright (c) 2011, 2013, 2014 Ingo Schwarze @@ -19,6 +19,8 @@ VERSION = 1.12.4 # === USER SETTINGS ==================================================== +# --- 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. # @@ -32,29 +34,15 @@ 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), -# mandocdb(8), and man.cgi will popen(3) manpath(1) to get the MANPATH -# variable. -#CFLAGS += -DUSE_MANPATH - -# 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 += -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 MANDIR = $(PREFIX)/man EXAMPLEDIR = $(PREFIX)/share/examples/mandoc + INSTALL = install INSTALL_PROGRAM = $(INSTALL) -m 0755 INSTALL_DATA = $(INSTALL) -m 0444 @@ -62,14 +50,27 @@ INSTALL_LIB = $(INSTALL) -m 0644 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 Berkeley DB, comment the following line. +# +DBBIN = apropos mandocdb whatis + # 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 man.cgi catman whatis +# 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. +# +#CFLAGS += -DUSE_MANPATH + +WWWPREFIX = /var/www +HTDOCDIR = $(WWWPREFIX)/htdocs + # === END OF USER SETTINGS ============================================= ALLBIN = mandoc preconv demandoc $(DBBIN) @@ -83,7 +84,6 @@ TESTSRCS = test-betoh64.c \ test-reallocarray.c \ test-strlcat.c \ test-strlcpy.c \ - test-strnlen.c \ test-strptime.c SRCS = LICENSE \ @@ -98,9 +98,6 @@ SRCS = LICENSE \ arch.in \ att.c \ att.in \ - catman.8 \ - catman.c \ - cgi.c \ chars.c \ chars.in \ compat_fgetln.c \ @@ -109,7 +106,6 @@ SRCS = LICENSE \ compat_strcasestr.c \ compat_strlcat.c \ compat_strlcpy.c \ - compat_strnlen.c \ compat_strsep.c \ config.h.post \ config.h.pre \ @@ -134,8 +130,6 @@ SRCS = LICENSE \ main.h \ man.7 \ man.c \ - man.cgi.7 \ - man-cgi.css \ man.h \ man_hash.c \ man_html.c \ @@ -233,7 +227,6 @@ COMPAT_OBJS = compat_fgetln.o \ compat_strcasestr.o \ compat_strlcat.o \ compat_strlcpy.o \ - compat_strnlen.o \ compat_strsep.o # === DEPENDENCY HANDLING ============================================== @@ -290,25 +283,10 @@ 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 -CGI_OBJS = $(MANDOC_HTML_OBJS) \ - $(MANDOC_MAN_OBJS) \ - $(MANDOC_TERM_OBJS) \ - cgi.o \ - apropos_db.o \ - manpath.o \ - out.o \ - tree.o -$(CGI_OBJS): main.h mdoc.h man.h out.h config.h mandoc.h mandoc_aux.h \ - apropos_db.h manpath.h mandocdb.h - -CATMAN_OBJS = catman.o manpath.o -$(CATMAN_OBJS): config.h mandoc_aux.h manpath.h mandocdb.h - DEMANDOC_OBJS = demandoc.o $(DEMANDOC_OBJS): config.h mandoc.h man.h mdoc.h WWW_MANS = apropos.1.html \ - catman.8.html \ demandoc.1.html \ mandoc.1.html \ preconv.1.html \ @@ -317,7 +295,6 @@ WWW_MANS = apropos.1.html \ tbl.3.html \ eqn.7.html \ man.7.html \ - man.cgi.7.html \ mandoc_char.7.html \ mdoc.7.html \ roff.7.html \ @@ -341,8 +318,6 @@ clean: rm -f apropos whatis $(APROPOS_OBJS) rm -f mandocdb $(MANDOCDB_OBJS) rm -f preconv $(PRECONV_OBJS) - rm -f man.cgi $(CGI_OBJS) - rm -f catman $(CATMAN_OBJS) rm -f demandoc $(DEMANDOC_OBJS) rm -f mandoc $(MANDOC_OBJS) rm -f config.h config.log $(COMPAT_OBJS) @@ -366,13 +341,6 @@ install: all $(DESTDIR)$(MANDIR)/man7 $(INSTALL_DATA) example.style.css $(DESTDIR)$(EXAMPLEDIR) -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 mkdir -p $(DESTDIR)$(HTDOCDIR)/snapshots $(INSTALL_DATA) $(WWW_MANS) style.css $(DESTDIR)$(HTDOCDIR) @@ -400,12 +368,6 @@ whatis: apropos apropos: $(APROPOS_OBJS) libmandoc.a $(CC) $(LDFLAGS) -o $@ $(APROPOS_OBJS) libmandoc.a $(DBLIB) -catman: $(CATMAN_OBJS) libmandoc.a - $(CC) $(LDFLAGS) -o $@ $(CATMAN_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 @@ -423,7 +385,7 @@ config.h: configure config.h.pre config.h.post $(TESTS rm -f config.log CC="$(CC)" CFLAGS="$(CFLAGS)" VERSION="$(VERSION)" ./configure -.PHONY: clean install installcgi installwww +.PHONY: clean install installwww .SUFFIXES: .1 .3 .5 .7 .8 .h .SUFFIXES: .1.html .3.html .5.html .7.html .8.html .h.html