=================================================================== RCS file: /cvs/mandoc/Makefile,v retrieving revision 1.395.2.12 retrieving revision 1.398 diff -u -p -r1.395.2.12 -r1.398 --- mandoc/Makefile 2014/01/04 13:49:22 1.395.2.12 +++ mandoc/Makefile 2012/06/09 11:27:38 1.398 @@ -1,15 +1,19 @@ .PHONY: clean install installwww .SUFFIXES: .sgml .html .md5 .h .h.html .SUFFIXES: .1 .3 .7 .8 +.SUFFIXES: .1.txt .3.txt .7.txt .8.txt +.SUFFIXES: .1.pdf .3.pdf .7.pdf .8.pdf +.SUFFIXES: .1.ps .3.ps .7.ps .8.ps .SUFFIXES: .1.html .3.html .7.html .8.html +.SUFFIXES: .1.xhtml .3.xhtml .7.xhtml .8.xhtml # 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.4\"" +# CFLAGS += -DOSNAME="\"OpenBSD 4.5\"" -VERSION = 1.12.3 -VDATE = 31 December 2013 +VERSION = 1.12.1 +VDATE = 23 March 2012 # IFF your system supports multi-byte functions (setlocale(), wcwidth(), # putwchar()) AND has __STDC_ISO_10646__ (that is, wchar_t is simply a @@ -20,18 +24,16 @@ VDATE = 31 December 2013 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 +# 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 -# If your system does not support static binaries, comment this, -# for example on Mac OS X. +# If your system supports static binaries only, uncomment this. This +# appears only to be BSD UNIX systems (Mac OS X has no support and Linux +# requires -pthreads for static libdb). STATIC = -static -# Linux requires -pthread to statically link with libdb. -#STATIC += -pthread -CFLAGS += -g -DHAVE_CONFIG_H +CFLAGS += -I/usr/local/include -g -DHAVE_CONFIG_H -DVERSION="\"$(VERSION)\"" CFLAGS += -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings PREFIX = /usr/local WWWPREFIX = /var/www @@ -49,49 +51,24 @@ 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 man.cgi catman whatis -DBLN = llib-lapropos.ln llib-lmandocdb.ln llib-lman.cgi.ln llib-lcatman.ln +DBLIB = -L/usr/local/lib -lsqlite3 +DBBIN = mandocdb manpage apropos all: mandoc preconv demandoc $(DBBIN) -TESTSRCS = test-betoh64.c \ - test-fgetln.c \ - test-getsubopt.c \ - test-mmap.c \ - test-strlcat.c \ - test-strlcpy.c \ - test-strnlen.c \ - test-strptime.c - SRCS = Makefile \ - NEWS \ TODO \ - apropos.1 \ - apropos.c \ - apropos_db.c \ - apropos_db.h \ arch.c \ arch.in \ att.c \ att.in \ - catman.8 \ - catman.c \ cgi.c \ chars.c \ chars.in \ compat_fgetln.c \ compat_getsubopt.c \ - compat_strcasestr.c \ compat_strlcat.c \ compat_strlcpy.c \ - compat_strnlen.c \ - compat_strsep.c \ config.h.post \ config.h.pre \ demandoc.1 \ @@ -102,7 +79,6 @@ SRCS = Makefile \ eqn_term.c \ example.style.css \ external.png \ - gmdiff \ html.c \ html.h \ index.css \ @@ -117,7 +93,6 @@ SRCS = Makefile \ main.h \ man.7 \ man.c \ - man.cgi.7 \ man-cgi.css \ man.h \ man_hash.c \ @@ -158,7 +133,6 @@ SRCS = Makefile \ st.c \ st.in \ style.css \ - tbl.3 \ tbl.7 \ tbl.c \ tbl_data.c \ @@ -170,11 +144,16 @@ SRCS = Makefile \ term.h \ term_ascii.c \ term_ps.c \ + test-fgetln.c \ + test-getsubopt.c \ + test-mmap.c \ + test-ohash.c \ + test-strlcat.c \ + test-strlcpy.c \ + test-strptime.c \ tree.c \ vol.c \ - vol.in \ - whatis.1 \ - $(TESTSRCS) + vol.in LIBMAN_OBJS = man.o \ man_hash.o \ @@ -209,11 +188,9 @@ LIBMANDOC_OBJS = $(LIBMAN_OBJS) \ COMPAT_OBJS = compat_fgetln.o \ compat_getsubopt.o \ - compat_strcasestr.o \ + compat_ohash.o \ compat_strlcat.o \ - compat_strlcpy.o \ - compat_strnlen.o \ - compat_strsep.o + compat_strlcpy.o arch.o: arch.in att.o: att.in @@ -228,7 +205,7 @@ $(LIBMAN_OBJS): libman.h $(LIBMDOC_OBJS): libmdoc.h $(LIBROFF_OBJS): libroff.h $(LIBMANDOC_OBJS): mandoc.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 \ @@ -262,41 +239,70 @@ $(MANDOCDB_OBJS): mandocdb.h mandoc.h mdoc.h man.h con PRECONV_OBJS = preconv.o $(PRECONV_OBJS): config.h -APROPOS_OBJS = apropos.o apropos_db.o manpath.o -$(APROPOS_OBJS): config.h mandoc.h apropos_db.h manpath.h mandocdb.h +APROPOS_OBJS = apropos.o mansearch.o manpath.o +$(APROPOS_OBJS): config.h manpath.h mandocdb.h mansearch.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 apropos_db.h manpath.h mandocdb.h +MANPAGE_OBJS = manpage.o mansearch.o manpath.o +$(MANPAGE_OBJS): config.h manpath.h mandocdb.h mansearch.h -CATMAN_OBJS = catman.o manpath.o -$(CATMAN_OBJS): config.h mandoc.h manpath.h mandocdb.h - DEMANDOC_OBJS = demandoc.o $(DEMANDOC_OBJS): config.h -INDEX_MANS = apropos.1.html \ - catman.8.html \ - demandoc.1.html \ +INDEX_MANS = demandoc.1.html \ + demandoc.1.xhtml \ + demandoc.1.ps \ + demandoc.1.pdf \ + demandoc.1.txt \ mandoc.1.html \ - whatis.1.html \ + mandoc.1.xhtml \ + mandoc.1.ps \ + mandoc.1.pdf \ + mandoc.1.txt \ mandoc.3.html \ - tbl.3.html \ + mandoc.3.xhtml \ + mandoc.3.ps \ + mandoc.3.pdf \ + mandoc.3.txt \ eqn.7.html \ + eqn.7.xhtml \ + eqn.7.ps \ + eqn.7.pdf \ + eqn.7.txt \ man.7.html \ - man.cgi.7.html \ + man.7.xhtml \ + man.7.ps \ + man.7.pdf \ + man.7.txt \ mandoc_char.7.html \ + mandoc_char.7.xhtml \ + mandoc_char.7.ps \ + mandoc_char.7.pdf \ + mandoc_char.7.txt \ mdoc.7.html \ + mdoc.7.xhtml \ + mdoc.7.ps \ + mdoc.7.pdf \ + mdoc.7.txt \ preconv.1.html \ + preconv.1.xhtml \ + preconv.1.ps \ + preconv.1.pdf \ + preconv.1.txt \ roff.7.html \ + roff.7.xhtml \ + roff.7.ps \ + roff.7.pdf \ + roff.7.txt \ tbl.7.html \ - mandocdb.8.html + tbl.7.xhtml \ + tbl.7.ps \ + tbl.7.pdf \ + tbl.7.txt \ + mandocdb.8.html \ + mandocdb.8.xhtml \ + mandocdb.8.ps \ + mandocdb.8.pdf \ + mandocdb.8.txt $(INDEX_MANS): mandoc @@ -311,11 +317,10 @@ www: index.html clean: rm -f libmandoc.a $(LIBMANDOC_OBJS) + rm -f apropos $(APROPOS_OBJS) rm -f mandocdb $(MANDOCDB_OBJS) rm -f preconv $(PRECONV_OBJS) - rm -f apropos whatis $(APROPOS_OBJS) - rm -f man.cgi $(CGI_OBJS) - rm -f catman $(CATMAN_OBJS) + rm -f manpage $(MANPAGE_OBJS) rm -f demandoc $(DEMANDOC_OBJS) rm -f mandoc $(MANDOC_OBJS) rm -f config.h config.log $(COMPAT_OBJS) @@ -335,14 +340,14 @@ install: all $(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) mandoc.3 $(DESTDIR)$(MANDIR)/man3 $(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) installcgi: all mkdir -p $(DESTDIR)$(CGIBINDIR) mkdir -p $(DESTDIR)$(HTDOCDIR) - $(INSTALL_PROGRAM) man.cgi $(DESTDIR)$(CGIBINDIR) + #$(INSTALL_PROGRAM) man.cgi $(DESTDIR)$(CGIBINDIR) $(INSTALL_DATA) example.style.css $(DESTDIR)$(HTDOCDIR)/man.css $(INSTALL_DATA) man-cgi.css $(DESTDIR)$(HTDOCDIR) @@ -369,18 +374,12 @@ 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) -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 @@ -395,15 +394,59 @@ mdocml.tar.gz: $(SRCS) index.html: $(INDEX_OBJS) -config.h: configure config.h.pre config.h.post $(TESTSRCS) +config.h: config.h.pre config.h.post rm -f config.log - CC="$(CC)" CFLAGS="$(CFLAGS)" VERSION="$(VERSION)" ./configure + ( cat config.h.pre; \ + echo; \ + if $(CC) $(CFLAGS) -Werror -o test-ohash test-ohash.c >> config.log 2>&1; then \ + echo '#define HAVE_OHASH'; \ + rm test-ohash; \ + fi; \ + if $(CC) $(CFLAGS) -Werror -o test-fgetln test-fgetln.c >> config.log 2>&1; then \ + echo '#define HAVE_FGETLN'; \ + rm test-fgetln; \ + fi; \ + if $(CC) $(CFLAGS) -Werror -o test-strptime test-strptime.c >> config.log 2>&1; then \ + echo '#define HAVE_STRPTIME'; \ + rm test-strptime; \ + fi; \ + if $(CC) $(CFLAGS) -Werror -o test-getsubopt test-getsubopt.c >> config.log 2>&1; then \ + echo '#define HAVE_GETSUBOPT'; \ + rm test-getsubopt; \ + fi; \ + if $(CC) $(CFLAGS) -Werror -o test-strlcat test-strlcat.c >> config.log 2>&1; then \ + echo '#define HAVE_STRLCAT'; \ + rm test-strlcat; \ + fi; \ + if $(CC) $(CFLAGS) -Werror -o test-mmap test-mmap.c >> config.log 2>&1; then \ + echo '#define HAVE_MMAP'; \ + rm test-mmap; \ + fi; \ + if $(CC) $(CFLAGS) -Werror -o test-strlcpy test-strlcpy.c >> config.log 2>&1; then \ + echo '#define HAVE_STRLCPY'; \ + rm test-strlcpy; \ + fi; \ + echo; \ + cat config.h.post \ + ) > $@ .h.h.html: highlight -I $< >$@ +.1.1.txt .3.3.txt .7.7.txt .8.8.txt: + ./mandoc -Tascii -Wall,stop $< | col -b >$@ + .1.1.html .3.3.html .7.7.html .8.8.html: ./mandoc -Thtml -Wall,stop -Ostyle=style.css,man=%N.%S.html,includes=%I.html $< >$@ + +.1.1.ps .3.3.ps .7.7.ps .8.8.ps: + ./mandoc -Tps -Wall,stop $< >$@ + +.1.1.xhtml .3.3.xhtml .7.7.xhtml .8.8.xhtml: + ./mandoc -Txhtml -Wall,stop -Ostyle=style.css,man=%N.%S.xhtml,includes=%I.html $< >$@ + +.1.1.pdf .3.3.pdf .7.7.pdf .8.8.pdf: + ./mandoc -Tpdf -Wall,stop $< >$@ .sgml.html: validate --warn $<