=================================================================== RCS file: /cvs/mandoc/Makefile,v retrieving revision 1.429 retrieving revision 1.432 diff -u -p -r1.429 -r1.432 --- mandoc/Makefile 2014/08/05 05:27:16 1.429 +++ mandoc/Makefile 2014/08/05 12:50:52 1.432 @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.429 2014/08/05 05:27:16 schwarze Exp $ +# $Id: Makefile,v 1.432 2014/08/05 12:50:52 schwarze Exp $ # # Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons # Copyright (c) 2011, 2013, 2014 Ingo Schwarze @@ -121,6 +121,7 @@ TESTSRCS = test-fgetln.c \ test-mmap.c \ test-ohash.c \ test-reallocarray.c \ + test-sqlite3_errstr.c \ test-strcasestr.c \ test-strlcat.c \ test-strlcpy.c \ @@ -136,6 +137,7 @@ SRCS = apropos.c \ compat_getsubopt.c \ compat_ohash.c \ compat_reallocarray.c \ + compat_sqlite3_errstr.c \ compat_strcasestr.c \ compat_strlcat.c \ compat_strlcpy.c \ @@ -223,10 +225,13 @@ DISTFILES = LICENSE \ mandoc.h \ mandoc_aux.h \ mandoc_char.7 \ + mandoc_escape.3 \ mandoc_html.3 \ + mandoc_malloc.3 \ manpath.h \ mansearch.3 \ mansearch.h \ + mchars_alloc.3 \ mdoc.7 \ mdoc.h \ msec.in \ @@ -278,6 +283,7 @@ COMPAT_OBJS = compat_fgetln.o \ compat_getsubopt.o \ compat_ohash.o \ compat_reallocarray.o \ + compat_sqlite3_errstr.o \ compat_strcasestr.o \ compat_strlcat.o \ compat_strlcpy.o \ @@ -327,8 +333,11 @@ WWW_MANS = apropos.1.html \ mandoc.1.html \ preconv.1.html \ mandoc.3.html \ + mandoc_escape.3.html \ mandoc_html.3.html \ + mandoc_malloc.3.html \ mansearch.3.html \ + mchars_alloc.3.html \ tbl.3.html \ mandoc.db.5.html \ eqn.7.html \ @@ -363,7 +372,7 @@ install: base-install $(INSTALL_TARGETS) www: $(WWW_OBJS) $(WWW_MANS) -.include "Makefile.depend" +include Makefile.depend # === TARGETS CONTAINING SHELL COMMANDS ================================ @@ -393,7 +402,8 @@ base-install: base-build $(INSTALL_LIB) man.h mandoc.h mandoc_aux.h mdoc.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 mandoc_escape.3 mandoc_malloc.3 \ + mchars_alloc.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) @@ -435,7 +445,7 @@ www-install: www $(INSTALL_DATA) mdocml.sha256 \ $(DESTDIR)$(HTDOCDIR)/snapshots/mdocml-$(VERSION).sha256 -Makefile.depend: $(SRCS) config.h Makefile +depend: config.h mkdep -f Makefile.depend $(CFLAGS) $(SRCS) perl -e 'undef $$/; $$_ = <>; s|/usr/include/\S+||g; \ s|\\\n||g; s| +| |g; print;' Makefile.depend > Makefile.tmp @@ -479,7 +489,8 @@ config.h: configure config.h.pre config.h.post $(TESTS rm -f config.log CC="$(CC)" CFLAGS="$(CFLAGS)" VERSION="$(VERSION)" ./configure -.PHONY: base-install clean cgi-install db-install install www-install +.PHONY: base-install cgi-install db-install install www-install +.PHONY: clean depend .SUFFIXES: .1 .3 .5 .7 .8 .h .SUFFIXES: .1.html .3.html .5.html .7.html .8.html .h.html