=================================================================== RCS file: /cvs/mandoc/Makefile,v retrieving revision 1.400 retrieving revision 1.410 diff -u -p -r1.400 -r1.410 --- mandoc/Makefile 2012/06/09 14:19:55 1.400 +++ mandoc/Makefile 2014/01/04 15:00:02 1.410 @@ -6,10 +6,10 @@ # 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.13.0 +VDATE = 4 January 2014 # IFF your system supports multi-byte functions (setlocale(), wcwidth(), # putwchar()) AND has __STDC_ISO_10646__ (that is, wchar_t is simply a @@ -24,12 +24,13 @@ 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 += -I/usr/local/include -g -DHAVE_CONFIG_H CFLAGS += -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings PREFIX = /usr/local WWWPREFIX = /var/www @@ -52,8 +53,20 @@ DBBIN = mandocdb manpage apropos all: mandoc preconv demandoc $(DBBIN) +TESTSRCS = test-fgetln.c \ + test-getsubopt.c \ + test-mmap.c \ + test-ohash.c \ + test-strlcat.c \ + test-strlcpy.c \ + test-strnlen.c \ + test-strptime.c + SRCS = Makefile \ + NEWS \ TODO \ + apropos.1 \ + apropos.c \ arch.c \ arch.in \ att.c \ @@ -63,10 +76,16 @@ SRCS = Makefile \ chars.in \ compat_fgetln.c \ compat_getsubopt.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 \ + configure \ demandoc.1 \ demandoc.c \ eqn.7 \ @@ -75,6 +94,7 @@ SRCS = Makefile \ eqn_term.c \ example.style.css \ external.png \ + gmdiff \ html.c \ html.h \ index.css \ @@ -103,8 +123,11 @@ SRCS = Makefile \ mandoc_char.7 \ mandocdb.8 \ mandocdb.c \ + manpage.c \ manpath.c \ manpath.h \ + mansearch.c \ + mansearch.h \ mdoc.7 \ mdoc.c \ mdoc.h \ @@ -128,6 +151,7 @@ SRCS = Makefile \ st.c \ st.in \ style.css \ + tbl.3 \ tbl.7 \ tbl.c \ tbl_data.c \ @@ -139,16 +163,10 @@ 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 + vol.in \ + $(TESTSRCS) LIBMAN_OBJS = man.o \ man_hash.o \ @@ -184,8 +202,11 @@ LIBMANDOC_OBJS = $(LIBMAN_OBJS) \ COMPAT_OBJS = compat_fgetln.o \ compat_getsubopt.o \ compat_ohash.o \ + compat_strcasestr.o \ compat_strlcat.o \ - compat_strlcpy.o + compat_strlcpy.o \ + compat_strnlen.o \ + compat_strsep.o arch.o: arch.in att.o: att.in @@ -243,14 +264,16 @@ $(MANPAGE_OBJS): config.h manpath.h mansearch.h DEMANDOC_OBJS = demandoc.o $(DEMANDOC_OBJS): config.h -INDEX_MANS = demandoc.1.html \ +INDEX_MANS = apropos.1.html \ + demandoc.1.html \ mandoc.1.html \ + preconv.1.html \ mandoc.3.html \ + tbl.3.html \ eqn.7.html \ man.7.html \ mandoc_char.7.html \ mdoc.7.html \ - preconv.1.html \ roff.7.html \ tbl.7.html \ mandocdb.8.html @@ -291,7 +314,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) @@ -340,46 +363,15 @@ mdocml.md5: mdocml.tar.gz mdocml.tar.gz: $(SRCS) mkdir -p .dist/mdocml-$(VERSION)/ $(INSTALL_SOURCE) $(SRCS) .dist/mdocml-$(VERSION) - ( cd .dist/ && tar zcf ../$@ ./ ) + chmod 755 .dist/mdocml-$(VERSION)/configure + ( cd .dist/ && tar zcf ../$@ mdocml-$(VERSION) ) rm -rf .dist/ index.html: $(INDEX_OBJS) -config.h: config.h.pre config.h.post +config.h: configure config.h.pre config.h.post $(TESTSRCS) rm -f config.log - ( 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 \ - ) > $@ + CC="$(CC)" CFLAGS="$(CFLAGS)" VERSION="$(VERSION)" ./configure .h.h.html: highlight -I $< >$@