===================================================================
RCS file: /cvs/mandoc/Makefile,v
retrieving revision 1.211
retrieving revision 1.226
diff -u -p -r1.211 -r1.226
--- mandoc/Makefile	2009/09/21 00:39:02	1.211
+++ mandoc/Makefile	2009/10/13 10:21:24	1.226
@@ -1,4 +1,4 @@
-.SUFFIXES:	.html .xml .sgml .1.txt .3.txt .7.txt .1 .3 .7 .md5 .tar.gz 
+.SUFFIXES:	.html .xml .sgml .1 .3 .7 .md5 .tar.gz .1.txt .3.txt .7.txt .1.sgml .3.sgml .7.sgml
 
 BINDIR		= $(PREFIX)/bin
 INCLUDEDIR	= $(PREFIX)/include
@@ -9,14 +9,17 @@ INSTALL_DATA	= install -m 0444
 INSTALL_LIB	= install -m 0644
 INSTALL_MAN	= $(INSTALL_DATA)
 
-VERSION	   = 1.9.2
-VDATE	   = 05 September 2009
+VERSION	   = 1.9.8
+VDATE	   = 10 October 2009
 
 VFLAGS     = -DVERSION=\"$(VERSION)\"
-CFLAGS    += -W -Wall -Wstrict-prototypes -Wno-unused-parameter -g
+CFLAGS    += -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings -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 \
@@ -36,35 +39,43 @@ MANSRCS	   = man_macro.c man.c man_hash.c man_validate
 	     man_action.c mandoc.c man_argv.c
 
 MAINLNS	   = main.ln mdoc_term.ln chars.ln term.ln tree.ln \
-	     compat.ln man_term.ln html.ln out.ln
+	     compat.ln man_term.ln html.ln mdoc_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 out.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 out.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)
 LIBS	   = libmdoc.a libman.a
 OBJS	   = $(MDOCOBJS) $(MAINOBJS) $(MANOBJS)
 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
-SGMLS	   = index.sgml 
+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 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
+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.txt ChangeLog.txt
+EXAMPLES   = example.style.css
 XMLS	   = ChangeLog.xml
-STATICS	   = style.css external.png
+STATICS	   = index.css style.css external.png
 MD5S	   = mdocml-$(VERSION).md5 
 TARGZS	   = mdocml-$(VERSION).tar.gz
 MANS	   = mandoc.1 mdoc.3 mdoc.7 manuals.7 mandoc_char.7 \
 	     man.7 man.3
-TEXTS	   = mandoc.1.txt mdoc.3.txt mdoc.7.txt manuals.7.txt \
-	     mandoc_char.7.txt man.7.txt man.3.txt
 BINS	   = mandoc
 CLEAN	   = $(BINS) $(LNS) $(LLNS) $(LIBS) $(OBJS) $(HTMLS) \
-	     $(TARGZS) tags $(TEXTS) $(MD5S) $(XMLS) 
+	     $(TARGZS) tags $(MD5S) $(XMLS) $(TEXTS) $(GSGMLS)
 INSTALL	   = $(SRCS) $(HEADS) Makefile $(MANS) $(SGMLS) $(STATICS) \
-	     $(DATAS) $(XSLS)
+	     $(DATAS) $(XSLS) $(EXAMPLES)
 
 all:	$(BINS)
 
@@ -78,12 +89,10 @@ cleanlint:
 
 dist:	mdocml-$(VERSION).tar.gz
 
-html:	$(HTMLS)
+www:	all $(HTMLS) $(TEXTS) $(MD5S) $(TARGZS)
 
-www:	all $(HTMLS) $(MD5S) $(TARGZS) $(TEXTS) 
-
 installwww: www
-	install -m 0444 $(TEXTS) $(HTMLS) $(STATICS) $(PREFIX)/
+	install -m 0444 $(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
@@ -153,15 +162,21 @@ main.o: main.c mdoc.h
 compat.ln: compat.c 
 compat.o: compat.c
 
-term.ln: term.c term.h man.h mdoc.h
-term.o: term.c term.h man.h 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
 
-html.ln: html.c out.h man.h mdoc.h
-html.o: html.c out.h man.h mdoc.h
+html.ln: html.c html.h chars.h
+html.o: html.c html.h chars.h
 
-out.ln: out.c out.h man.h mdoc.h
-out.o: out.c out.h man.h mdoc.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 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
 
@@ -185,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
 
@@ -217,13 +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 $(MANDOCFLAGS) $(MANDOCHTML) $< > $@
+
 .3.3.txt:
-	./mandoc -Wall,error -fstrict $< | col -b > $@
+	./mandoc $(MANDOCFLAGS) $< | col -b > $@
 
+.3.3.sgml:
+	./mandoc $(MANDOCFLAGS) $(MANDOCHTML) $< > $@
+
 .7.7.txt:
-	./mandoc -Wall,error -fstrict $< | col -b > $@
+	./mandoc $(MANDOCFLAGS) $< | col -b > $@
+
+.7.7.sgml:
+	./mandoc $(MANDOCFLAGS) $(MANDOCHTML) $< > $@
 
 .tar.gz.md5:
 	md5 $< > $@