===================================================================
RCS file: /cvs/mandoc/Makefile,v
retrieving revision 1.220
retrieving revision 1.225
diff -u -p -r1.220 -r1.225
--- mandoc/Makefile	2009/09/25 13:33:47	1.220
+++ mandoc/Makefile	2009/10/10 18:43:55	1.225
@@ -9,14 +9,17 @@ INSTALL_DATA	= install -m 0444
 INSTALL_LIB	= install -m 0644
 INSTALL_MAN	= $(INSTALL_DATA)
 
-VERSION	   = 1.9.6
-VDATE	   = 25 September 2009
+VERSION	   = 1.9.8
+VDATE	   = 10 October 2009
 
 VFLAGS     = -DVERSION=\"$(VERSION)\"
 CFLAGS    += -W -Wall -Wstrict-prototypes -Wno-unused-parameter -g
 CFLAGS    += $(VFLAGS)
 LINTFLAGS += $(VFLAGS)
 
+MANDOCFLAGS	= -Wall -fstrict
+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 \
 	     lib.ln att.ln arch.ln vol.ln msec.ln st.ln \
@@ -37,11 +40,11 @@ MANSRCS	   = man_macro.c man.c man_hash.c man_validate
 
 MAINLNS	   = main.ln mdoc_term.ln chars.ln term.ln tree.ln \
 	     compat.ln man_term.ln html.ln mdoc_html.ln \
-	     man_html.ln
+	     man_html.ln out.ln
 MAINOBJS   = main.o mdoc_term.o chars.o term.o tree.o compat.o \
-	     man_term.o html.o mdoc_html.o man_html.o
+	     man_term.o html.o mdoc_html.o man_html.o out.o
 MAINSRCS   = main.c mdoc_term.c chars.c term.c tree.c compat.c \
-	     man_term.c html.c mdoc_html.c man_html.c
+	     man_term.c html.c mdoc_html.c man_html.c out.c
 
 LLNS	   = llib-llibmdoc.ln llib-llibman.ln llib-lmandoc.ln
 LNS	   = $(MAINLNS) $(MDOCLNS) $(MANLNS)
@@ -51,16 +54,16 @@ SRCS	   = $(MDOCSRCS) $(MAINSRCS) $(MANSRCS)
 DATAS	   = arch.in att.in lib.in msec.in st.in \
 	     vol.in chars.in
 HEADS	   = mdoc.h libmdoc.h man.h libman.h term.h \
-	     libmandoc.h html.h chars.h
+	     libmandoc.h html.h chars.h out.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)
 XSLS	   = ChangeLog.xsl
-HTMLS	   = index.html ChangeLog.html mandoc.1.html mdoc.3.html \
+HTMLS	   = index.html 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.html
+	     mandoc_char.7.txt manuals.7.txt ChangeLog.txt
 EXAMPLES   = example.style.css
 XMLS	   = ChangeLog.xml
 STATICS	   = index.css style.css external.png
@@ -168,9 +171,12 @@ html.o: html.c html.h chars.h
 mdoc_html.ln: mdoc_html.c html.h mdoc.h
 mdoc_html.o: mdoc_html.c html.h mdoc.h
 
-man_html.ln: man_html.c html.h man.h
-man_html.o: man_html.c html.h man.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
 
+out.ln: out.c out.h
+out.o: out.c out.h
+
 tree.ln: tree.c man.h mdoc.h
 tree.o: tree.c man.h mdoc.h
 
@@ -194,6 +200,9 @@ libmdoc.h: mdoc.h
 ChangeLog.xml:
 	cvs2cl --xml --xml-encoding iso-8859-15 -t --noxmlns -f $@
 
+ChangeLog.txt:
+	cvs2cl -t -f $@
+
 ChangeLog.html: ChangeLog.xml ChangeLog.xsl
 	xsltproc -o $@ ChangeLog.xsl ChangeLog.xml
 
@@ -226,22 +235,22 @@ mandoc: $(MAINOBJS) libmdoc.a libman.a
 	sed -e "s!@VERSION@!$(VERSION)!" -e "s!@VDATE@!$(VDATE)!" $< > $@
 
 .1.1.txt:
-	./mandoc -Wall,error -fstrict $< | col -b > $@
+	./mandoc $(MANDOCFLAGS) $< | col -b > $@
 
 .1.1.sgml:
-	./mandoc -Thtml -ostyle=style.css -Wall,error -fstrict $< > $@
+	./mandoc $(MANDOCFLAGS) $(MANDOCHTML) $< > $@
 
 .3.3.txt:
-	./mandoc -Wall,error -fstrict $< | col -b > $@
+	./mandoc $(MANDOCFLAGS) $< | col -b > $@
 
 .3.3.sgml:
-	./mandoc -Thtml -ostyle=style.css -Wall,error -fstrict $< > $@
+	./mandoc $(MANDOCFLAGS) $(MANDOCHTML) $< > $@
 
 .7.7.txt:
-	./mandoc -Wall,error -fstrict $< | col -b > $@
+	./mandoc $(MANDOCFLAGS) $< | col -b > $@
 
 .7.7.sgml:
-	./mandoc -Thtml -ostyle=style.css -Wall,error -fstrict $< > $@
+	./mandoc $(MANDOCFLAGS) $(MANDOCHTML) $< > $@
 
 .tar.gz.md5:
 	md5 $< > $@