=================================================================== RCS file: /cvs/mandoc/Makefile,v retrieving revision 1.395.2.2 retrieving revision 1.395.2.4 diff -u -p -r1.395.2.2 -r1.395.2.4 --- mandoc/Makefile 2013/09/18 02:24:37 1.395.2.2 +++ mandoc/Makefile 2013/09/29 23:28:48 1.395.2.4 @@ -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.12.2beta1 +VDATE = 30 September 2013 # IFF your system supports multi-byte functions (setlocale(), wcwidth(), # putwchar()) AND has __STDC_ISO_10646__ (that is, wchar_t is simply a @@ -25,10 +25,11 @@ CFLAGS += -DUSE_WCHAR # 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 += -g -DHAVE_CONFIG_H -DVERSION="\"$(VERSION)\"" CFLAGS += -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings @@ -88,6 +89,7 @@ SRCS = Makefile \ eqn_term.c \ example.style.css \ external.png \ + gmdiff \ html.c \ html.h \ index.css \ @@ -143,6 +145,7 @@ SRCS = Makefile \ st.c \ st.in \ style.css \ + tbl.3 \ tbl.7 \ tbl.c \ tbl_data.c \ @@ -154,6 +157,7 @@ SRCS = Makefile \ term.h \ term_ascii.c \ term_ps.c \ + test-betoh64.c \ test-fgetln.c \ test-getsubopt.c \ test-mmap.c \ @@ -273,6 +277,7 @@ INDEX_MANS = apropos.1.html \ mandoc.1.html \ whatis.1.html \ mandoc.3.html \ + tbl.3.html \ eqn.7.html \ man.7.html \ man.cgi.7.html \ @@ -320,7 +325,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) @@ -407,6 +412,10 @@ config.h: config.h.pre config.h.post if $(CC) $(CFLAGS) -Werror -o test-strlcpy test-strlcpy.c >> config.log 2>&1; then \ echo '#define HAVE_STRLCPY'; \ rm test-strlcpy; \ + fi; \ + if $(CC) $(CFLAGS) -Werror -o test-betoh64 test-betoh64.c >> config.log 2>&1; then \ + echo '#define HAVE_BETOH64'; \ + rm test-betoh64; \ fi; \ echo; \ cat config.h.post \