===================================================================
RCS file: /cvs/mandoc/Makefile,v
retrieving revision 1.282
retrieving revision 1.292
diff -u -p -r1.282 -r1.292
--- mandoc/Makefile	2010/06/26 15:22:19	1.282
+++ mandoc/Makefile	2010/09/27 12:34:21	1.292
@@ -1,4 +1,4 @@
-.SUFFIXES:	.html .xml .sgml .1 .3 .7 .md5 .tar.gz .1.txt .3.txt .7.txt .1.sgml .3.sgml .7.sgml .h .h.html .1.ps .3.ps .7.ps
+.SUFFIXES:	.html .xml .sgml .1 .3 .7 .md5 .tar.gz .1.txt .3.txt .7.txt .1.sgml .3.sgml .7.sgml .h .h.html .1.ps .3.ps .7.ps .1.pdf .3.pdf .7.pdf
 
 PREFIX		= /usr/local
 BINDIR		= $(PREFIX)/bin
@@ -12,8 +12,8 @@ INSTALL_DATA	= $(INSTALL) -m 0444
 INSTALL_LIB	= $(INSTALL) -m 0644
 INSTALL_MAN	= $(INSTALL_DATA)
 
-VERSION	   = 1.10.2
-VDATE	   = 19 June 2010
+VERSION	   = 1.10.6
+VDATE	   = 27 September 2010
 
 VFLAGS	   = -DVERSION="\"$(VERSION)\""
 WFLAGS     = -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings
@@ -23,18 +23,8 @@ CFLAGS    += -g $(WFLAGS) $(VFLAGS) -DHAVE_CONFIG_H
 # in the lower-left hand corner of -mdoc manuals.
 # CFLAGS += -DOSNAME="\"OpenBSD 4.5\""
 
-# Unset this if you don't want Xo/Xc allowing split `It' lines, which
-# breaks symmetry.
-CFLAGS	  += -DUGLY
-
 LINTFLAGS += $(VFLAGS)
 
-MANDOCFLAGS = -Wall -fstrict
-
-MANDOCHTML = -Thtml -Ostyle=style.css,man=%N.%S.html,includes=%I.html
-
-MANDOCPS   = -Tps
-
 ROFFLNS    = roff.ln
 
 ROFFSRCS   = roff.c
@@ -65,7 +55,7 @@ MANLNS	   = man_macro.ln man.ln man_hash.ln man_valida
 MANOBJS	   = man_macro.o man.o man_hash.o man_validate.o \
 	     man_action.o man_argv.o
 MANSRCS	   = man_macro.c man.c man_hash.c man_validate.c \
-	     man_action.c mandoc.c man_argv.c
+	     man_action.c man_argv.c
 
 MAINLNS	   = main.ln mdoc_term.ln chars.ln term.ln tree.ln \
 	     compat.ln man_term.ln html.ln mdoc_html.ln \
@@ -98,7 +88,7 @@ DATAS	   = arch.in att.in lib.in msec.in st.in \
 
 HEADS	   = mdoc.h libmdoc.h man.h libman.h term.h \
 	     libmandoc.h html.h chars.h out.h main.h roff.h \
-	     mandoc.h regs.h
+	     mandoc.h
 
 GSGMLS	   = mandoc.1.sgml mdoc.3.sgml mdoc.7.sgml \
 	     mandoc_char.7.sgml man.7.sgml man.3.sgml roff.7.sgml \
@@ -114,6 +104,9 @@ HTMLS	   = ChangeLog.html index.html man.h.html mdoc.h
 PSS	   = mandoc.1.ps mdoc.3.ps man.3.ps mdoc.7.ps man.7.ps \
 	     mandoc_char.7.ps roff.7.ps roff.3.ps
 
+PDFS	   = mandoc.1.pdf mdoc.3.pdf man.3.pdf mdoc.7.pdf man.7.pdf \
+	     mandoc_char.7.pdf roff.7.pdf roff.3.pdf
+
 XSLS	   = ChangeLog.xsl
 
 TEXTS	   = mandoc.1.txt mdoc.3.txt man.3.txt mdoc.7.txt man.7.txt \
@@ -141,7 +134,7 @@ CONFIGS	   = config.h.pre config.h.post
 
 DOCLEAN	   = $(BINS) $(LNS) $(LLNS) $(LIBS) $(OBJS) $(HTMLS) \
 	     $(TARGZS) tags $(MD5S) $(XMLS) $(TEXTS) $(GSGMLS) \
-	     config.h config.log $(PSS)
+	     config.h config.log $(PSS) $(PDFS)
 
 DOINSTALL  = $(SRCS) $(HEADS) Makefile $(MANS) $(SGMLS) $(STATICS) \
 	     $(DATAS) $(XSLS) $(EXAMPLES) $(TESTS) $(CONFIGS)
@@ -155,12 +148,14 @@ clean:
 
 dist:	mdocml-$(VERSION).tar.gz
 
-www:	all $(GSGMLS) $(HTMLS) $(TEXTS) $(MD5S) $(TARGZS) $(PSS)
+www:	all $(GSGMLS) $(HTMLS) $(TEXTS) $(MD5S) $(TARGZS) $(PSS) $(PDFS)
 
 ps:	$(PSS)
 
+pdf:	$(PDFS)
+
 installwww: www
-	$(INSTALL_DATA) $(HTMLS) $(PSS) $(TEXTS) $(STATICS) $(DESTDIR)$(PREFIX)/
+	$(INSTALL_DATA) $(HTMLS) $(PSS) $(PDFS) $(TEXTS) $(STATICS) $(DESTDIR)$(PREFIX)/
 	$(INSTALL_DATA) mdocml-$(VERSION).tar.gz $(DESTDIR)$(PREFIX)/snapshots/
 	$(INSTALL_DATA) mdocml-$(VERSION).md5 $(DESTDIR)$(PREFIX)/snapshots/
 	$(INSTALL_DATA) mdocml-$(VERSION).tar.gz $(DESTDIR)$(PREFIX)/snapshots/mdocml.tar.gz
@@ -303,13 +298,16 @@ mandoc: $(MAINOBJS) libroff.a libmdoc.a libman.a libma
 	sed -e "s!@VERSION@!$(VERSION)!" -e "s!@VDATE@!$(VDATE)!" $< > $@
 
 .1.1.txt .3.3.txt .7.7.txt:
-	./mandoc $(MANDOCFLAGS) $< | col -b > $@
+	./mandoc -Tascii -Wall,stop $< | col -b > $@
 
 .1.1.sgml .3.3.sgml .7.7.sgml:
-	./mandoc $(MANDOCFLAGS) $(MANDOCHTML) $< > $@
+	./mandoc -Thtml -Wall,stop -Ostyle=style.css,man=%N.%S.html,includes=%I.html $< > $@
 
 .1.1.ps .3.3.ps .7.7.ps:
-	./mandoc $(MANDOCFLAGS) $(MANDOCPS) $< > $@
+	./mandoc -Tps -Wall,stop $< > $@
+
+.1.1.pdf .3.3.pdf .7.7.pdf:
+	./mandoc -Tpdf -Wall,stop $< > $@
 
 .tar.gz.md5:
 	md5 $< > $@