Removed TODO that was fixed by parsing escapes in offset strings.

[mandoc.git] / Makefile

diff --git a/Makefile b/Makefile
index 3ff9892b7c1655941a4bee1a1ca20c2243b431c9..620d3182daecd41935eb100a9f3ccab1c5bda0ab 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -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.1
-VDATE     = 07 June 2010
+VERSION           = 1.10.5
+VDATE     = 27 July 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,17 +55,19 @@ MANLNS         = man_macro.ln man.ln man_hash.ln man_validate.ln \
 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 \
-            man_html.ln out.ln
+            man_html.ln out.ln term_ps.ln term_ascii.ln
 
 MAINOBJS   = main.o mdoc_term.o chars.o term.o tree.o compat.o \
-            man_term.o html.o mdoc_html.o man_html.o out.o
+            man_term.o html.o mdoc_html.o man_html.o out.o \
+            term_ps.o term_ascii.o
 
 MAINSRCS   = main.c mdoc_term.c chars.c term.c tree.c compat.c \
-            man_term.c html.c mdoc_html.c man_html.c out.c
+            man_term.c html.c mdoc_html.c man_html.c out.c \
+            term_ps.c term_ascii.c
 
 LLNS      = llib-llibmdoc.ln llib-llibman.ln llib-lmandoc.ln \
             llib-llibmandoc.ln llib-llibroff.ln
@@ -112,6 +104,9 @@ HTMLS          = ChangeLog.html index.html man.h.html mdoc.h.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
 
+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 \
@@ -139,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)
@@ -153,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) $(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
@@ -223,6 +220,10 @@ compat.ln compat.o: compat.c
 
 term.ln term.o: term.c term.h man.h mdoc.h chars.h
 
+term_ps.ln term_ps.o: term_ps.c term.h main.h
+
+term_ascii.ln term_ascii.o: term_ascii.c term.h main.h
+
 html.ln html.o: html.c html.h chars.h
 
 mdoc_html.ln mdoc_html.o: mdoc_html.c html.h mdoc.h
@@ -297,13 +298,16 @@ 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.pdf .3.3.pdf .7.7.pdf:
+       ./mandoc -Tpdf -Wall,stop $< > $@
 
 .tar.gz.md5:
        md5 $< > $@