Added last version notes and bumped version number and date.

[mandoc.git] / Makefile

diff --git a/Makefile b/Makefile
index 761a4c0d676582e694b8dbb4c4507fcbd636ccc3..7fa0cde14013d3f2bb3b5962c63e125022e724db 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,10 @@
-.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 
+.SUFFIXES:     .1.txt .3.txt .7.txt
+.SUFFIXES:     .1.xhtml .3.xhtml .7.xhtml
+.SUFFIXES:     .1.sgml .3.sgml .7.sgml 
+.SUFFIXES:     .h .h.html 
+.SUFFIXES:     .1.ps .3.ps .7.ps
+.SUFFIXES:     .1.pdf .3.pdf .7.pdf
 
 PREFIX         = /usr/local
 BINDIR         = $(PREFIX)/bin
@@ -12,8 +18,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.8
+VDATE     = 23 December 2010
 
 VFLAGS    = -DVERSION="\"$(VERSION)\""
 WFLAGS     = -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings
@@ -23,18 +29,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
@@ -48,24 +44,24 @@ MANDOCSRCS = mandoc.c
 MANDOCOBJS = mandoc.o
 
 MDOCLNS           = mdoc_macro.ln mdoc.ln mdoc_hash.ln mdoc_strings.ln \
-            mdoc_argv.ln mdoc_validate.ln mdoc_action.ln \
+            mdoc_argv.ln mdoc_validate.ln \
             lib.ln att.ln arch.ln vol.ln msec.ln st.ln
 
 MDOCOBJS   = mdoc_macro.o mdoc.o mdoc_hash.o mdoc_strings.o \
-            mdoc_argv.o mdoc_validate.o mdoc_action.o lib.o att.o \
+            mdoc_argv.o mdoc_validate.o lib.o att.o \
             arch.o vol.o msec.o st.o
 
 MDOCSRCS   = mdoc_macro.c mdoc.c mdoc_hash.c mdoc_strings.c \
-            mdoc_argv.c mdoc_validate.c mdoc_action.c lib.c att.c \
+            mdoc_argv.c mdoc_validate.c lib.c att.c \
             arch.c vol.c msec.c st.c
 
 MANLNS    = man_macro.ln man.ln man_hash.ln man_validate.ln \
-            man_action.ln man_argv.ln
+            man_argv.ln
 
 MANOBJS           = man_macro.o man.o man_hash.o man_validate.o \
-            man_action.o man_argv.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_argv.c
 
 MAINLNS           = main.ln mdoc_term.ln chars.ln term.ln tree.ln \
             compat.ln man_term.ln html.ln mdoc_html.ln \
@@ -102,23 +98,26 @@ HEADS         = mdoc.h libmdoc.h man.h libman.h term.h \
 
 GSGMLS    = mandoc.1.sgml mdoc.3.sgml mdoc.7.sgml \
             mandoc_char.7.sgml man.7.sgml man.3.sgml roff.7.sgml \
-            roff.3.sgml
+            roff.3.sgml 
 
 SGMLS     = index.sgml
 
 HTMLS     = ChangeLog.html index.html man.h.html mdoc.h.html \
             mandoc.h.html roff.h.html mandoc.1.html mdoc.3.html \
             man.3.html mdoc.7.html man.7.html mandoc_char.7.html \
-            roff.7.html roff.3.html
+            roff.7.html roff.3.html 
 
 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
+            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 \
             mandoc_char.7.txt ChangeLog.txt \
-            roff.7.txt roff.3.txt
+            roff.7.txt roff.3.txt 
 
 EXAMPLES   = example.style.css
 
@@ -131,7 +130,7 @@ MD5S           = mdocml-$(VERSION).md5
 TARGZS    = mdocml-$(VERSION).tar.gz
 
 MANS      = mandoc.1 mdoc.3 mdoc.7 mandoc_char.7 man.7 \
-            man.3 roff.7 roff.3
+            man.3 roff.7 roff.3 
 
 BINS      = mandoc
 
@@ -141,7 +140,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 +154,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) $(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
@@ -249,8 +250,6 @@ man_validate.ln man_validate.o: man_validate.c libman.h
 
 mdoc_validate.ln mdoc_validate.o: mdoc_validate.c libmdoc.h
 
-mdoc_action.ln mdoc_action.o: mdoc_action.c libmdoc.h
-
 libmdoc.h: mdoc.h
 
 ChangeLog.xml:
@@ -303,13 +302,19 @@ mandoc: $(MAINOBJS) libroff.a libmdoc.a libman.a libmandoc.a
        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.xhtml .3.3.xhtml .7.7.xhtml:
+       ./mandoc -Txhtml -Wall,stop -Ostyle=style.css,man=%N.%S.xhtml,includes=%I.html $< > $@
+
+.1.1.pdf .3.3.pdf .7.7.pdf:
+       ./mandoc -Tpdf -Wall,stop $< > $@
 
 .tar.gz.md5:
        md5 $< > $@