=================================================================== RCS file: /cvs/mandoc/Makefile,v retrieving revision 1.397 retrieving revision 1.403 diff -u -p -r1.397 -r1.403 --- mandoc/Makefile 2012/06/09 11:00:13 1.397 +++ mandoc/Makefile 2013/10/05 20:43:20 1.403 @@ -1,19 +1,15 @@ .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 4.5\"" +# CFLAGS += -DOSNAME="\"OpenBSD 5.4\"" -VERSION = 1.12.1 -VDATE = 23 March 2012 +VERSION = 1.12.2 +VDATE = 05 October 2013 # IFF your system supports multi-byte functions (setlocale(), wcwidth(), # putwchar()) AND has __STDC_ISO_10646__ (that is, wchar_t is simply a @@ -28,10 +24,11 @@ CFLAGS += -DUSE_WCHAR # mandocdb(8) will use manpath(1) to get the MANPATH variable. #CFLAGS += -DUSE_MANPATH -# 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). +# 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 -DVERSION="\"$(VERSION)\"" CFLAGS += -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings @@ -57,7 +54,10 @@ DBBIN = mandocdb manpage apropos all: mandoc preconv demandoc $(DBBIN) SRCS = Makefile \ + NEWS \ TODO \ + apropos.1 \ + apropos.c \ arch.c \ arch.in \ att.c \ @@ -79,6 +79,7 @@ SRCS = Makefile \ eqn_term.c \ example.style.css \ external.png \ + gmdiff \ html.c \ html.h \ index.css \ @@ -107,7 +108,6 @@ SRCS = Makefile \ mandoc_char.7 \ mandocdb.8 \ mandocdb.c \ - mandocdb.h \ manpath.c \ manpath.h \ mdoc.7 \ @@ -133,6 +133,7 @@ SRCS = Makefile \ st.c \ st.in \ style.css \ + tbl.3 \ tbl.7 \ tbl.c \ tbl_data.c \ @@ -234,75 +235,33 @@ MANDOC_OBJS = $(MANDOC_HTML_OBJS) \ $(MANDOC_OBJS): main.h mandoc.h mdoc.h man.h config.h out.h MANDOCDB_OBJS = mandocdb.o manpath.o -$(MANDOCDB_OBJS): mandocdb.h mandoc.h mdoc.h man.h config.h manpath.h +$(MANDOCDB_OBJS): mansearch.h mandoc.h mdoc.h man.h config.h manpath.h PRECONV_OBJS = preconv.o $(PRECONV_OBJS): config.h APROPOS_OBJS = apropos.o mansearch.o manpath.o -$(APROPOS_OBJS): config.h manpath.h mandocdb.h mansearch.h +$(APROPOS_OBJS): config.h manpath.h mansearch.h MANPAGE_OBJS = manpage.o mansearch.o manpath.o -$(MANPAGE_OBJS): config.h manpath.h mandocdb.h mansearch.h +$(MANPAGE_OBJS): config.h manpath.h mansearch.h DEMANDOC_OBJS = demandoc.o $(DEMANDOC_OBJS): config.h -INDEX_MANS = demandoc.1.html \ - demandoc.1.xhtml \ - demandoc.1.ps \ - demandoc.1.pdf \ - demandoc.1.txt \ +INDEX_MANS = apropos.1.html \ + demandoc.1.html \ mandoc.1.html \ - mandoc.1.xhtml \ - mandoc.1.ps \ - mandoc.1.pdf \ - mandoc.1.txt \ + preconv.1.html \ mandoc.3.html \ - mandoc.3.xhtml \ - mandoc.3.ps \ - mandoc.3.pdf \ - mandoc.3.txt \ + tbl.3.html \ eqn.7.html \ - eqn.7.xhtml \ - eqn.7.ps \ - eqn.7.pdf \ - eqn.7.txt \ man.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 \ - 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 + mandocdb.8.html $(INDEX_MANS): mandoc @@ -340,7 +299,7 @@ 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 $(DESTDIR)$(MANDIR)/man3 + $(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_DATA) example.style.css $(DESTDIR)$(EXAMPLEDIR) @@ -398,31 +357,31 @@ config.h: config.h.pre config.h.post rm -f config.log ( cat config.h.pre; \ echo; \ - if $(CC) $(CFLAGS) -Werror -o test-ohash test-ohash.c >> config.log 2>&1; then \ + if $(CC) $(CFLAGS) -Werror -Wno-unused -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 \ + if $(CC) $(CFLAGS) -Werror -Wno-unused -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 \ + if $(CC) $(CFLAGS) -Werror -Wno-unused -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 \ + if $(CC) $(CFLAGS) -Werror -Wno-unused -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 \ + if $(CC) $(CFLAGS) -Werror -Wno-unused -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 \ + if $(CC) $(CFLAGS) -Werror -Wno-unused -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 \ + if $(CC) $(CFLAGS) -Werror -Wno-unused -o test-strlcpy test-strlcpy.c >> config.log 2>&1; then \ echo '#define HAVE_STRLCPY'; \ rm test-strlcpy; \ fi; \ @@ -433,20 +392,8 @@ config.h: config.h.pre 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 $<