===================================================================
RCS file: /cvs/mandoc/Makefile,v
retrieving revision 1.211
retrieving revision 1.215
diff -u -p -r1.211 -r1.215
--- mandoc/Makefile	2009/09/21 00:39:02	1.211
+++ mandoc/Makefile	2009/09/21 15:01:33	1.215
@@ -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.html .3.html .7.html
 
 BINDIR		= $(PREFIX)/bin
 INCLUDEDIR	= $(PREFIX)/include
@@ -9,8 +9,8 @@ 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.5
+VDATE	   = 21 September 2009
 
 VFLAGS     = -DVERSION=\"$(VERSION)\"
 CFLAGS    += -W -Wall -Wstrict-prototypes -Wno-unused-parameter -g
@@ -36,11 +36,12 @@ 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
 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
 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
 
 LLNS	   = llib-llibmdoc.ln llib-llibman.ln llib-lmandoc.ln
 LNS	   = $(MAINLNS) $(MDOCLNS) $(MANLNS)
@@ -51,18 +52,18 @@ DATAS	   = arch.in att.in lib.in msec.in st.in vol.in 
 HEADS	   = mdoc.h libmdoc.h man.h libman.h term.h libmandoc.h
 SGMLS	   = index.sgml 
 XSLS	   = ChangeLog.xsl
-HTMLS	   = index.html ChangeLog.html
+HTMLS	   = index.html ChangeLog.html mandoc.1.html mdoc.3.html \
+	     man.3.html mdoc.7.html man.7.html mandoc_char.7.html \
+	     manuals.7.html
 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) 
 INSTALL	   = $(SRCS) $(HEADS) Makefile $(MANS) $(SGMLS) $(STATICS) \
 	     $(DATAS) $(XSLS)
 
@@ -78,12 +79,10 @@ cleanlint:
 
 dist:	mdocml-$(VERSION).tar.gz
 
-html:	$(HTMLS)
+www:	all $(HTMLS) $(MD5S) $(TARGZS)
 
-www:	all $(HTMLS) $(MD5S) $(TARGZS) $(TEXTS) 
-
 installwww: www
-	install -m 0444 $(TEXTS) $(HTMLS) $(STATICS) $(PREFIX)/
+	install -m 0444 $(HTMLS) $(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 +152,18 @@ 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
+man_html.o: man_html.c html.h man.h
+
 tree.ln: tree.c man.h mdoc.h
 tree.o: tree.c man.h mdoc.h
 
@@ -219,11 +221,20 @@ mandoc: $(MAINOBJS) libmdoc.a libman.a
 .1.1.txt:
 	./mandoc -Wall,error -fstrict $< | col -b > $@
 
+.1.1.html:
+	./mandoc -Thtml -ostyle=style.css -Wall,error -fstrict $< > $@
+
 .3.3.txt:
 	./mandoc -Wall,error -fstrict $< | col -b > $@
 
+.3.3.html:
+	./mandoc -Thtml -ostyle=style.css -Wall,error -fstrict $< > $@
+
 .7.7.txt:
 	./mandoc -Wall,error -fstrict $< | col -b > $@
+
+.7.7.html:
+	./mandoc -Thtml -ostyle=style.css -Wall,error -fstrict $< > $@
 
 .tar.gz.md5:
 	md5 $< > $@