===================================================================
RCS file: /cvs/mandoc/Makefile,v
retrieving revision 1.225
retrieving revision 1.229
diff -u -p -r1.225 -r1.229
--- mandoc/Makefile	2009/10/10 18:43:55	1.225
+++ mandoc/Makefile	2009/10/18 11:13:39	1.229
@@ -13,7 +13,7 @@ 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)
 
@@ -54,12 +54,12 @@ 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 out.h
+	     libmandoc.h html.h chars.h out.h main.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 mandoc.1.html mdoc.3.html \
+HTMLS	   = index.html mandoc.1.html mdoc.3.html ChangeLog.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 \
@@ -234,22 +234,10 @@ mandoc: $(MAINOBJS) libmdoc.a libman.a
 	validate $<
 	sed -e "s!@VERSION@!$(VERSION)!" -e "s!@VDATE@!$(VDATE)!" $< > $@
 
-.1.1.txt:
+.1.1.txt .3.3.txt .7.7.txt:
 	./mandoc $(MANDOCFLAGS) $< | col -b > $@
 
-.1.1.sgml:
-	./mandoc $(MANDOCFLAGS) $(MANDOCHTML) $< > $@
-
-.3.3.txt:
-	./mandoc $(MANDOCFLAGS) $< | col -b > $@
-
-.3.3.sgml:
-	./mandoc $(MANDOCFLAGS) $(MANDOCHTML) $< > $@
-
-.7.7.txt:
-	./mandoc $(MANDOCFLAGS) $< | col -b > $@
-
-.7.7.sgml:
+.1.1.sgml 3.3.sgml .7.7.sgml:
 	./mandoc $(MANDOCFLAGS) $(MANDOCHTML) $< > $@
 
 .tar.gz.md5: