===================================================================
RCS file: /cvs/mandoc/Makefile,v
retrieving revision 1.245
retrieving revision 1.255
diff -u -p -r1.245 -r1.255
--- mandoc/Makefile	2009/12/02 10:16:55	1.245
+++ mandoc/Makefile	2010/03/31 06:29:42	1.255
@@ -10,12 +10,12 @@ INSTALL_DATA	= install -m 0444
 INSTALL_LIB	= install -m 0644
 INSTALL_MAN	= $(INSTALL_DATA)
 
-VERSION	   = 1.9.14
-VDATE	   = 16 November 2009
+VERSION	   = 1.9.21
+VDATE	   = 31 March 2010
 
-VFLAGS     = -DVERSION="\"$(VERSION)\""
-CFLAGS    += -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings -g
-CFLAGS    += $(VFLAGS)
+VFLAGS     = -DVERSION="\"$(VERSION)\"" -DHAVE_CONFIG_H
+WFLAGS     = -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings
+CFLAGS    += -g $(VFLAGS) $(WFLAGS)
 #CFLAGS	  += -DOSNAME="\"OpenBSD 4.5\""
 LINTFLAGS += $(VFLAGS)
 
@@ -74,11 +74,13 @@ TARGZS	   = mdocml-$(VERSION).tar.gz
 MANS	   = mandoc.1 mdoc.3 mdoc.7 manuals.7 mandoc_char.7 \
 	     man.7 man.3
 BINS	   = mandoc
+TESTS	   = test-strlcat.c test-strlcpy.c
+CONFIGS	   = config.h.pre config.h.post
 CLEAN	   = $(BINS) $(LNS) $(LLNS) $(LIBS) $(OBJS) $(HTMLS) \
 	     $(TARGZS) tags $(MD5S) $(XMLS) $(TEXTS) $(GSGMLS) \
-	     $(GHTMLS)
+	     $(GHTMLS) config.h config.log
 INSTALL	   = $(SRCS) $(HEADS) Makefile $(MANS) $(SGMLS) $(STATICS) \
-	     $(DATAS) $(XSLS) $(EXAMPLES)
+	     $(DATAS) $(XSLS) $(EXAMPLES) $(TESTS) $(CONFIGS)
 
 all:	$(BINS)
 
@@ -123,90 +125,66 @@ uninstall:
 	rm -f $(MANDIR)/man7/man.7
 	rm -f $(EXAMPLEDIR)/example.style.css
 
-man_macro.ln: man_macro.c libman.h
-man_macro.o: man_macro.c libman.h
+$(OBJS): config.h
 
-lib.ln: lib.c lib.in libmdoc.h
-lib.o: lib.c lib.in libmdoc.h
+$(LNS): config.h
 
-att.ln: att.c att.in libmdoc.h
-att.o: att.c att.in libmdoc.h
+man_macro.ln man_macro.o: man_macro.c libman.h
 
-arch.ln: arch.c arch.in libmdoc.h
-arch.o: arch.c arch.in libmdoc.h
+lib.ln lib.o: lib.c lib.in libmdoc.h
 
-vol.ln: vol.c vol.in libmdoc.h
-vol.o: vol.c vol.in libmdoc.h
+att.ln att.o: att.c att.in libmdoc.h
 
-chars.ln: chars.c chars.in chars.h
-chars.o: chars.c chars.in chars.h
+arch.ln arch.o: arch.c arch.in libmdoc.h
 
-msec.ln: msec.c msec.in libmdoc.h
-msec.o: msec.c msec.in libmdoc.h
+vol.ln vol.o: vol.c vol.in libmdoc.h
 
-st.ln: st.c st.in libmdoc.h
-st.o: st.c st.in libmdoc.h
+chars.ln chars.o: chars.c chars.in chars.h
 
-mdoc_macro.ln: mdoc_macro.c libmdoc.h
-mdoc_macro.o: mdoc_macro.c libmdoc.h
+msec.ln msec.o: msec.c msec.in libmdoc.h
 
-mdoc_term.ln: mdoc_term.c term.h mdoc.h
-mdoc_term.o: mdoc_term.c term.h mdoc.h
+st.ln st.o: st.c st.in libmdoc.h
 
-mdoc_strings.ln: mdoc_strings.c libmdoc.h
-mdoc_strings.o: mdoc_strings.c libmdoc.h
+mdoc_macro.ln mdoc_macro.o: mdoc_macro.c libmdoc.h
 
-man_hash.ln: man_hash.c libman.h
-man_hash.o: man_hash.c libman.h
+mdoc_term.ln mdoc_term.o: mdoc_term.c term.h mdoc.h
 
-mdoc_hash.ln: mdoc_hash.c libmdoc.h
-mdoc_hash.o: mdoc_hash.c libmdoc.h
+mdoc_strings.ln mdoc_strings.o: mdoc_strings.c libmdoc.h
 
-mdoc.ln: mdoc.c libmdoc.h
-mdoc.o: mdoc.c libmdoc.h
+man_hash.ln man_hash.o: man_hash.c libman.h
 
-man.ln: man.c libman.h
-man.o: man.c libman.h
+mdoc_hash.ln mdoc_hash.o: mdoc_hash.c libmdoc.h
 
-main.ln: main.c mdoc.h
-main.o: main.c mdoc.h
+mdoc.ln mdoc.o: mdoc.c libmdoc.h
 
-compat.ln: compat.c 
-compat.o: compat.c
+man.ln man.o: man.c libman.h
 
-term.ln: term.c term.h man.h mdoc.h chars.h
-term.o: term.c term.h man.h mdoc.h chars.h
+main.ln main.o: main.c mdoc.h
 
-html.ln: html.c html.h chars.h
-html.o: html.c html.h chars.h
+compat.ln compat.o: compat.c 
 
-mdoc_html.ln: mdoc_html.c html.h mdoc.h
-mdoc_html.o: mdoc_html.c html.h mdoc.h
+term.ln term.o: term.c term.h man.h mdoc.h chars.h
 
-man_html.ln: man_html.c html.h man.h out.h
-man_html.o: man_html.c html.h man.h out.h
+html.ln html.o: html.c html.h chars.h
 
-out.ln: out.c out.h
-out.o: out.c out.h
+mdoc_html.ln mdoc_html.o: mdoc_html.c html.h mdoc.h
 
-tree.ln: tree.c man.h mdoc.h
-tree.o: tree.c man.h mdoc.h
+man_html.ln man_html.o: man_html.c html.h man.h out.h
 
-mdoc_argv.ln: mdoc_argv.c libmdoc.h
-mdoc_argv.o: mdoc_argv.c libmdoc.h
+out.ln out.o: out.c out.h
 
-man_argv.ln: man_argv.c libman.h
-man_argv.o: man_argv.c libman.h
+tree.ln tree.o: tree.c man.h mdoc.h
 
-man_validate.ln: man_validate.c libman.h
-man_validate.o: man_validate.c libman.h
+mdoc_argv.ln mdoc_argv.o: mdoc_argv.c libmdoc.h
 
-mdoc_validate.ln: mdoc_validate.c libmdoc.h
-mdoc_validate.o: mdoc_validate.c libmdoc.h
+man_argv.ln man_argv.o: man_argv.c libman.h
 
-mdoc_action.ln: mdoc_action.c libmdoc.h
-mdoc_action.o: mdoc_action.c libmdoc.h
+man_validate.ln man_validate.o: man_validate.c libman.h
 
+mdoc_validate.ln mdoc_validate.o: mdoc_validate.c libmdoc.h
+
+mdoc_action.ln mdoc_action.o: mdoc_action.c libmdoc.h
+
 libmdoc.h: mdoc.h
 
 ChangeLog.xml:
@@ -254,3 +232,19 @@ mandoc: $(MAINOBJS) libmdoc.a libman.a
 
 .tar.gz.md5:
 	md5 $< > $@
+
+config.h: config.h.pre config.h.post
+	rm -f config.log
+	( cat config.h.pre; \
+	echo; \
+	if $(CC) $(CFLAGS) -Werror -c test-strlcat.c >> config.log 2>&1; then \
+		echo '#define HAVE_STRLCAT'; \
+		rm test-strlcat.o; \
+	fi; \
+	if $(CC) $(CFLAGS) -Werror -c test-strlcpy.c >> config.log 2>&1; then \
+		echo '#define HAVE_STRLCPY'; \
+		rm test-strlcpy.o; \
+	fi; \
+	echo; \
+	cat config.h.post \
+	) > $@