Scaling factor made floating point (as per groff.7) and, e.g., gnu/usr.bin/cvs/man...

[mandoc.git] / Makefile

diff --git a/Makefile b/Makefile
index 1f8ac1bec7106fd8887c19ca92666f57fc3ade9e..47414afc5f9196607ac44fc8dea8b76afeb66933 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-.SUFFIXES:     .html .xml .sgml .1 .3 .7 .md5 .tar.gz .1.html .3.html .7.html
+.SUFFIXES:     .html .xml .sgml .1 .3 .7 .md5 .tar.gz .1.txt .3.txt .7.txt .1.sgml .3.sgml .7.sgml
 
 BINDIR         = $(PREFIX)/bin
 INCLUDEDIR     = $(PREFIX)/include
@@ -9,14 +9,17 @@ INSTALL_DATA  = install -m 0444
 INSTALL_LIB    = install -m 0644
 INSTALL_MAN    = $(INSTALL_DATA)
 
-VERSION           = 1.9.5
-VDATE     = 21 September 2009
+VERSION           = 1.9.6
+VDATE     = 25 September 2009
 
 VFLAGS     = -DVERSION=\"$(VERSION)\"
 CFLAGS    += -W -Wall -Wstrict-prototypes -Wno-unused-parameter -g
 CFLAGS    += $(VFLAGS)
 LINTFLAGS += $(VFLAGS)
 
+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 \
             lib.ln att.ln arch.ln vol.ln msec.ln st.ln \
@@ -37,11 +40,11 @@ MANSRCS        = man_macro.c man.c man_hash.c man_validate.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
+            man_html.ln out.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
+            man_term.o html.o mdoc_html.o man_html.o out.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
+            man_term.c html.c mdoc_html.c man_html.c out.c
 
 LLNS      = llib-llibmdoc.ln llib-llibman.ln llib-lmandoc.ln
 LNS       = $(MAINLNS) $(MDOCLNS) $(MANLNS)
@@ -51,12 +54,16 @@ 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
-SGMLS     = index.sgml 
+            libmandoc.h html.h chars.h out.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 ChangeLog.html mandoc.1.html mdoc.3.html \
+HTMLS     = index.html mandoc.1.html mdoc.3.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 \
+            mandoc_char.7.txt manuals.7.txt ChangeLog.txt
 EXAMPLES   = example.style.css
 XMLS      = ChangeLog.xml
 STATICS           = index.css style.css external.png
@@ -66,7 +73,7 @@ MANS     = mandoc.1 mdoc.3 mdoc.7 manuals.7 mandoc_char.7 \
             man.7 man.3
 BINS      = mandoc
 CLEAN     = $(BINS) $(LNS) $(LLNS) $(LIBS) $(OBJS) $(HTMLS) \
-            $(TARGZS) tags $(MD5S) $(XMLS) 
+            $(TARGZS) tags $(MD5S) $(XMLS) $(TEXTS) $(GSGMLS)
 INSTALL           = $(SRCS) $(HEADS) Makefile $(MANS) $(SGMLS) $(STATICS) \
             $(DATAS) $(XSLS) $(EXAMPLES)
 
@@ -82,10 +89,10 @@ cleanlint:
 
 dist:  mdocml-$(VERSION).tar.gz
 
-www:   all $(HTMLS) $(MD5S) $(TARGZS)
+www:   all $(HTMLS) $(TEXTS) $(MD5S) $(TARGZS)
 
 installwww: www
-       install -m 0444 $(HTMLS) $(STATICS) $(PREFIX)/
+       install -m 0444 $(HTMLS) $(TEXTS) $(STATICS) $(PREFIX)/
        install -m 0444 mdocml-$(VERSION).tar.gz $(PREFIX)/snapshots/
        install -m 0444 mdocml-$(VERSION).md5 $(PREFIX)/snapshots/
        install -m 0444 mdocml-$(VERSION).tar.gz $(PREFIX)/snapshots/mdocml.tar.gz
@@ -164,8 +171,11 @@ html.o: html.c html.h chars.h
 mdoc_html.ln: mdoc_html.c html.h mdoc.h
 mdoc_html.o: mdoc_html.c html.h mdoc.h
 
-man_html.ln: man_html.c html.h man.h
-man_html.o: man_html.c html.h man.h
+man_html.ln: man_html.c html.h man.h out.h
+man_html.o: man_html.c html.h man.h out.h
+
+out.ln: out.c out.h
+out.o: out.c out.h
 
 tree.ln: tree.c man.h mdoc.h
 tree.o: tree.c man.h mdoc.h
@@ -190,6 +200,9 @@ libmdoc.h: mdoc.h
 ChangeLog.xml:
        cvs2cl --xml --xml-encoding iso-8859-15 -t --noxmlns -f $@
 
+ChangeLog.txt:
+       cvs2cl -t -f $@
+
 ChangeLog.html: ChangeLog.xml ChangeLog.xsl
        xsltproc -o $@ ChangeLog.xsl ChangeLog.xml
 
@@ -222,22 +235,22 @@ mandoc: $(MAINOBJS) libmdoc.a libman.a
        sed -e "s!@VERSION@!$(VERSION)!" -e "s!@VDATE@!$(VDATE)!" $< > $@
 
 .1.1.txt:
-       ./mandoc -Wall,error -fstrict $< | col -b > $@
+       ./mandoc $(MANDOCFLAGS) $< | col -b > $@
 
-.1.1.html:
-       ./mandoc -Thtml -ostyle=style.css -Wall,error -fstrict $< > $@
+.1.1.sgml:
+       ./mandoc $(MANDOCFLAGS) $(MANDOCHTML) $< > $@
 
 .3.3.txt:
-       ./mandoc -Wall,error -fstrict $< | col -b > $@
+       ./mandoc $(MANDOCFLAGS) $< | col -b > $@
 
-.3.3.html:
-       ./mandoc -Thtml -ostyle=style.css -Wall,error -fstrict $< > $@
+.3.3.sgml:
+       ./mandoc $(MANDOCFLAGS) $(MANDOCHTML) $< > $@
 
 .7.7.txt:
-       ./mandoc -Wall,error -fstrict $< | col -b > $@
+       ./mandoc $(MANDOCFLAGS) $< | col -b > $@
 
-.7.7.html:
-       ./mandoc -Thtml -ostyle=style.css -Wall,error -fstrict $< > $@
+.7.7.sgml:
+       ./mandoc $(MANDOCFLAGS) $(MANDOCHTML) $< > $@
 
 .tar.gz.md5:
        md5 $< > $@