===================================================================
RCS file: /cvs/mandoc/Makefile,v
retrieving revision 1.208
retrieving revision 1.212
diff -u -p -r1.208 -r1.212
--- mandoc/Makefile	2009/09/16 14:40:56	1.208
+++ mandoc/Makefile	2009/09/21 13:06:13	1.212
@@ -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.txt .3.txt .7.txt .1 .3 .7 .md5 .tar.gz .1.html .3.html .7.html
 
 BINDIR		= $(PREFIX)/bin
 INCLUDEDIR	= $(PREFIX)/include
@@ -35,23 +35,25 @@ MANOBJS	   = man_macro.o man.o man_hash.o man_validate
 MANSRCS	   = man_macro.c man.c man_hash.c man_validate.c \
 	     man_action.c mandoc.c man_argv.c
 
-MAINLNS	   = main.ln mdoc_term.ln ascii.ln term.ln tree.ln \
-	     compat.ln man_term.ln
-MAINOBJS   = main.o mdoc_term.o ascii.o term.o tree.o compat.o \
-	     man_term.o
-MAINSRCS   = main.c mdoc_term.c ascii.c term.c tree.c compat.c \
-	     man_term.c
+MAINLNS	   = main.ln mdoc_term.ln chars.ln term.ln tree.ln \
+	     compat.ln man_term.ln html.ln
+MAINOBJS   = main.o mdoc_term.o chars.o term.o tree.o compat.o \
+	     man_term.o html.o
+MAINSRCS   = main.c mdoc_term.c chars.c term.c tree.c compat.c \
+	     man_term.c html.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 ascii.in
+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 
 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
 MD5S	   = mdocml-$(VERSION).md5 
@@ -78,8 +80,6 @@ cleanlint:
 
 dist:	mdocml-$(VERSION).tar.gz
 
-html:	$(HTMLS)
-
 www:	all $(HTMLS) $(MD5S) $(TARGZS) $(TEXTS) 
 
 installwww: www
@@ -117,8 +117,8 @@ arch.o: arch.c arch.in libmdoc.h
 vol.ln: vol.c vol.in libmdoc.h
 vol.o: vol.c vol.in libmdoc.h
 
-ascii.ln: ascii.c ascii.in term.h
-ascii.o: ascii.c ascii.in term.h
+chars.ln: chars.c chars.in chars.h
+chars.o: chars.c chars.in chars.h
 
 msec.ln: msec.c msec.in libmdoc.h
 msec.o: msec.c msec.in libmdoc.h
@@ -156,6 +156,9 @@ compat.o: compat.c
 term.ln: term.c term.h man.h mdoc.h
 term.o: term.c term.h man.h mdoc.h
 
+html.ln: html.c man.h mdoc.h
+html.o: html.c man.h mdoc.h
+
 tree.ln: tree.c man.h mdoc.h
 tree.o: tree.c man.h mdoc.h
 
@@ -213,11 +216,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 $< > $@