===================================================================
RCS file: /cvs/mandoc/Makefile,v
retrieving revision 1.225
retrieving revision 1.237
diff -u -p -r1.225 -r1.237
--- mandoc/Makefile	2009/10/10 18:43:55	1.225
+++ mandoc/Makefile	2009/10/28 08:00:17	1.237
@@ -9,16 +9,17 @@ INSTALL_DATA	= install -m 0444
 INSTALL_LIB	= install -m 0644
 INSTALL_MAN	= $(INSTALL_DATA)
 
-VERSION	   = 1.9.8
-VDATE	   = 10 October 2009
+VERSION	   = 1.9.11
+VDATE	   = 26 October 2009
 
-VFLAGS     = -DVERSION=\"$(VERSION)\"
-CFLAGS    += -W -Wall -Wstrict-prototypes -Wno-unused-parameter -g
+VFLAGS     = -DVERSION="\"$(VERSION)\""
+CFLAGS    += -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings -g
 CFLAGS    += $(VFLAGS)
+#CFLAGS	  += -DOSNAME="\"OpenBSD 4.5\""
 LINTFLAGS += $(VFLAGS)
 
-MANDOCFLAGS	= -Wall -fstrict
-MANDOCHTML	= -Thtml -ostyle=style.css,man=%N.%S.html,includes=%I.html
+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 \
@@ -54,12 +55,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 \
@@ -87,6 +88,9 @@ clean:
 cleanlint:
 	rm -f $(LNS) $(LLNS)
 
+cleanhtml:
+	rm -f $(HTML) $(GSGMLS)
+
 dist:	mdocml-$(VERSION).tar.gz
 
 www:	all $(HTMLS) $(TEXTS) $(MD5S) $(TARGZS)
@@ -234,22 +238,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: