===================================================================
RCS file: /cvs/mandoc/Makefile,v
retrieving revision 1.233
retrieving revision 1.254
diff -u -p -r1.233 -r1.254
--- mandoc/Makefile	2009/10/22 17:54:24	1.233
+++ mandoc/Makefile	2010/03/30 08:24:01	1.254
@@ -4,22 +4,23 @@ BINDIR		= $(PREFIX)/bin
 INCLUDEDIR	= $(PREFIX)/include
 LIBDIR		= $(PREFIX)/lib
 MANDIR		= $(PREFIX)/man
+EXAMPLEDIR	= $(PREFIX)/share/examples/mandoc
 INSTALL_PROGRAM	= install -m 0755
 INSTALL_DATA	= install -m 0444
 INSTALL_LIB	= install -m 0644
 INSTALL_MAN	= $(INSTALL_DATA)
 
-VERSION	   = 1.9.9
-VDATE	   = 21 October 2009
+VERSION	   = 1.9.20
+VDATE	   = 30 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)
 
 MANDOCFLAGS = -Wall -fstrict
-MANDOCHTML = -Thtml -ostyle=style.css,man=%N.%S.html,includes=%I.html
+MANDOCHTML = -Thtml -Ostyle=style.css,man=%N.%S.html,includes=%I.html
 
 MDOCLNS	   = mdoc_macro.ln mdoc.ln mdoc_hash.ln mdoc_strings.ln \
 	     mdoc_argv.ln mdoc_validate.ln mdoc_action.ln \
@@ -58,11 +59,11 @@ HEADS	   = mdoc.h libmdoc.h man.h libman.h term.h \
 	     libmandoc.h html.h chars.h out.h main.h
 GSGMLS	   = mandoc.1.sgml mdoc.3.sgml mdoc.7.sgml manuals.7.sgml \
 	     mandoc_char.7.sgml man.7.sgml man.3.sgml
-SGMLS	   = index.sgml $(GSGMLS)
+SGMLS	   = index.sgml
+HTMLS	   = ChangeLog.html index.html
 XSLS	   = ChangeLog.xsl
-HTMLS	   = index.html mandoc.1.html mdoc.3.html ChangeLog.html \
-	     man.3.html mdoc.7.html man.7.html mandoc_char.7.html \
-	     manuals.7.html
+GHTMLS	   = mandoc.1.html mdoc.3.html man.3.html mdoc.7.html \
+	     man.7.html mandoc_char.7.html manuals.7.html
 TEXTS	   = mandoc.1.txt mdoc.3.txt man.3.txt mdoc.7.txt man.7.txt \
 	     mandoc_char.7.txt manuals.7.txt ChangeLog.txt
 EXAMPLES   = example.style.css
@@ -73,10 +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)
+	     $(TARGZS) tags $(MD5S) $(XMLS) $(TEXTS) $(GSGMLS) \
+	     $(GHTMLS) config.h config.log
 INSTALL	   = $(SRCS) $(HEADS) Makefile $(MANS) $(SGMLS) $(STATICS) \
-	     $(DATAS) $(XSLS) $(EXAMPLES)
+	     $(DATAS) $(XSLS) $(EXAMPLES) $(TESTS) $(CONFIGS)
 
 all:	$(BINS)
 
@@ -88,12 +92,17 @@ clean:
 cleanlint:
 	rm -f $(LNS) $(LLNS)
 
+cleanhtml:
+	rm -f $(HTMLS) $(GSGMLS) $(GHTMLS)
+
 dist:	mdocml-$(VERSION).tar.gz
 
-www:	all $(HTMLS) $(TEXTS) $(MD5S) $(TARGZS)
+www:	all $(GSGMLS) $(GHTMLS) $(HTMLS) $(TEXTS) $(MD5S) $(TARGZS)
 
+htmls:	all $(GSGMLS) $(GHTMLS)
+
 installwww: www
-	install -m 0444 $(HTMLS) $(TEXTS) $(STATICS) $(PREFIX)/
+	install -m 0444 $(GHTMLS) $(HTMLS) $(TEXTS) $(STATICS) $(PREFIX)/
 	install -m 0444 mdocml-$(VERSION).tar.gz $(PREFIX)/snapshots/
 	install -m 0444 mdocml-$(VERSION).md5 $(PREFIX)/snapshots/
 	install -m 0444 mdocml-$(VERSION).tar.gz $(PREFIX)/snapshots/mdocml.tar.gz
@@ -101,101 +110,81 @@ installwww: www
 
 install:
 	mkdir -p $(BINDIR)
+	mkdir -p $(EXAMPLEDIR)
 	mkdir -p $(MANDIR)/man1
 	mkdir -p $(MANDIR)/man7
 	$(INSTALL_PROGRAM) mandoc $(BINDIR)
 	$(INSTALL_MAN) mandoc.1 $(MANDIR)/man1
-	$(INSTALL_MAN) mdoc.7 $(MANDIR)/man7
+	$(INSTALL_MAN) man.7 mdoc.7 $(MANDIR)/man7
+	$(INSTALL_DATA) example.style.css $(EXAMPLEDIR)
 
 uninstall:
 	rm -f $(BINDIR)/mandoc
 	rm -f $(MANDIR)/man1/mandoc.1
 	rm -f $(MANDIR)/man7/mdoc.7
+	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:
@@ -232,7 +221,7 @@ mandoc: $(MAINOBJS) libmdoc.a libman.a
 	$(CC) $(CFLAGS) -o $@ $(MAINOBJS) libmdoc.a libman.a
 
 .sgml.html:
-	#validate $<
+	validate --warn $<
 	sed -e "s!@VERSION@!$(VERSION)!" -e "s!@VDATE@!$(VDATE)!" $< > $@
 
 .1.1.txt .3.3.txt .7.7.txt:
@@ -243,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 \
+	) > $@