===================================================================
RCS file: /cvs/mandoc/Makefile,v
retrieving revision 1.246
retrieving revision 1.260
diff -u -p -r1.246 -r1.260
--- mandoc/Makefile	2010/01/01 17:14:26	1.246
+++ mandoc/Makefile	2010/04/05 07:24:55	1.260
@@ -1,4 +1,4 @@
-.SUFFIXES:	.html .xml .sgml .1 .3 .7 .md5 .tar.gz .1.txt .3.txt .7.txt .1.sgml .3.sgml .7.sgml
+.SUFFIXES:	.html .xml .sgml .1 .3 .7 .md5 .tar.gz .1.txt .3.txt .7.txt .1.sgml .3.sgml .7.sgml .h .h.html
 
 BINDIR		= $(PREFIX)/bin
 INCLUDEDIR	= $(PREFIX)/include
@@ -10,13 +10,21 @@ 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.22
+VDATE	   = 31 March 2010
 
-VFLAGS     = -DVERSION="\"$(VERSION)\"" -DHAVE_CONFIG_H
+VFLAGS	   = -DVERSION="\"$(VERSION)\""
 WFLAGS     = -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings
-CFLAGS    += -g $(VFLAGS) $(WFLAGS)
-#CFLAGS	  += -DOSNAME="\"OpenBSD 4.5\""
+CFLAGS    += -g $(WFLAGS) $(VFLAGS) -DHAVE_CONFIG_H
+
+# 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\""
+
+# Specify this if you want to accept Xo/Xc macros extending the head of
+# block full-implicit macros.
+# CFLAGS += -DUGLY
+
 LINTFLAGS += $(VFLAGS)
 
 MANDOCFLAGS = -Wall -fstrict
@@ -60,7 +68,7 @@ HEADS	   = mdoc.h libmdoc.h man.h libman.h term.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
-HTMLS	   = ChangeLog.html index.html
+HTMLS	   = ChangeLog.html index.html man.h.html mdoc.h.html
 XSLS	   = ChangeLog.xsl
 GHTMLS	   = mandoc.1.html mdoc.3.html man.3.html mdoc.7.html \
 	     man.7.html mandoc_char.7.html manuals.7.html
@@ -127,90 +135,64 @@ uninstall:
 
 $(OBJS): config.h
 
-man_macro.ln: man_macro.c libman.h
-man_macro.o: man_macro.c libman.h
+$(LNS): config.h
 
-lib.ln: lib.c lib.in libmdoc.h
-lib.o: lib.c lib.in libmdoc.h
+man_macro.ln man_macro.o: man_macro.c libman.h
 
-att.ln: att.c att.in libmdoc.h
-att.o: att.c att.in libmdoc.h
+lib.ln lib.o: lib.c lib.in libmdoc.h
 
-arch.ln: arch.c arch.in libmdoc.h
-arch.o: arch.c arch.in libmdoc.h
+att.ln att.o: att.c att.in libmdoc.h
 
-vol.ln: vol.c vol.in libmdoc.h
-vol.o: vol.c vol.in libmdoc.h
+arch.ln arch.o: arch.c arch.in libmdoc.h
 
-chars.ln: chars.c chars.in chars.h
-chars.o: chars.c chars.in chars.h
+vol.ln vol.o: vol.c vol.in libmdoc.h
 
-msec.ln: msec.c msec.in libmdoc.h
-msec.o: msec.c msec.in libmdoc.h
+chars.ln chars.o: chars.c chars.in chars.h
 
-st.ln: st.c st.in libmdoc.h
-st.o: st.c st.in libmdoc.h
+msec.ln msec.o: msec.c msec.in libmdoc.h
 
-mdoc_macro.ln: mdoc_macro.c libmdoc.h
-mdoc_macro.o: mdoc_macro.c libmdoc.h
+st.ln st.o: st.c st.in libmdoc.h
 
-mdoc_term.ln: mdoc_term.c term.h mdoc.h
-mdoc_term.o: mdoc_term.c term.h mdoc.h
+mdoc_macro.ln mdoc_macro.o: mdoc_macro.c libmdoc.h
 
-mdoc_strings.ln: mdoc_strings.c libmdoc.h
-mdoc_strings.o: mdoc_strings.c libmdoc.h
+mdoc_term.ln mdoc_term.o: mdoc_term.c term.h mdoc.h
 
-man_hash.ln: man_hash.c libman.h
-man_hash.o: man_hash.c libman.h
+mdoc_strings.ln mdoc_strings.o: mdoc_strings.c libmdoc.h
 
-mdoc_hash.ln: mdoc_hash.c libmdoc.h
-mdoc_hash.o: mdoc_hash.c libmdoc.h
+man_hash.ln man_hash.o: man_hash.c libman.h
 
-mdoc.ln: mdoc.c libmdoc.h
-mdoc.o: mdoc.c libmdoc.h
+mdoc_hash.ln mdoc_hash.o: mdoc_hash.c libmdoc.h
 
-man.ln: man.c libman.h
-man.o: man.c libman.h
+mdoc.ln mdoc.o: mdoc.c libmdoc.h
 
-main.ln: main.c mdoc.h
-main.o: main.c mdoc.h
+man.ln man.o: man.c libman.h
 
-compat.ln: compat.c 
-compat.o: compat.c
+main.ln main.o: main.c mdoc.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
+compat.ln compat.o: compat.c 
 
-html.ln: html.c html.h chars.h
-html.o: html.c html.h chars.h
+term.ln term.o: term.c term.h man.h mdoc.h chars.h
 
-mdoc_html.ln: mdoc_html.c html.h mdoc.h
-mdoc_html.o: mdoc_html.c html.h mdoc.h
+html.ln html.o: html.c html.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
+mdoc_html.ln mdoc_html.o: mdoc_html.c html.h mdoc.h
 
-out.ln: out.c out.h
-out.o: out.c out.h
+man_html.ln man_html.o: man_html.c html.h man.h out.h
 
-tree.ln: tree.c man.h mdoc.h
-tree.o: tree.c man.h mdoc.h
+out.ln out.o: out.c out.h
 
-mdoc_argv.ln: mdoc_argv.c libmdoc.h
-mdoc_argv.o: mdoc_argv.c libmdoc.h
+tree.ln tree.o: tree.c man.h mdoc.h
 
-man_argv.ln: man_argv.c libman.h
-man_argv.o: man_argv.c libman.h
+mdoc_argv.ln mdoc_argv.o: mdoc_argv.c libmdoc.h
 
-man_validate.ln: man_validate.c libman.h
-man_validate.o: man_validate.c libman.h
+man_argv.ln man_argv.o: man_argv.c libman.h
 
-mdoc_validate.ln: mdoc_validate.c libmdoc.h
-mdoc_validate.o: mdoc_validate.c libmdoc.h
+man_validate.ln man_validate.o: man_validate.c libman.h
 
-mdoc_action.ln: mdoc_action.c libmdoc.h
-mdoc_action.o: mdoc_action.c libmdoc.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:
@@ -259,15 +241,18 @@ mandoc: $(MAINOBJS) libmdoc.a libman.a
 .tar.gz.md5:
 	md5 $< > $@
 
+.h.h.html:
+	highlight -I $< >$@
+
 config.h: config.h.pre config.h.post
 	rm -f config.log
 	( cat config.h.pre; \
 	echo; \
-	if $(CC) $(CFLAGS) -c test-strlcat.c >> config.log 2>&1; then \
+	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) -c test-strlcpy.c >> config.log 2>&1; then \
+	if $(CC) $(CFLAGS) -Werror -c test-strlcpy.c >> config.log 2>&1; then \
 		echo '#define HAVE_STRLCPY'; \
 		rm test-strlcpy.o; \
 	fi; \