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 967bb7f0a6d39be3c65b0142778b675050f5bea8..47414afc5f9196607ac44fc8dea8b76afeb66933 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-.SUFFIXES:     .html .xml .sgml .1.txt .3.txt .7.txt .1 .3 .7 .md5 .tar.gz 
+.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
 
 BINDIR         = $(PREFIX)/bin
 INCLUDEDIR     = $(PREFIX)/include


@@ -9,14 +9,17 @@ INSTALL_DATA  = install -m 0444
 INSTALL_LIB    = install -m 0644
 INSTALL_MAN    = $(INSTALL_DATA)
 
 INSTALL_LIB    = install -m 0644
 INSTALL_MAN    = $(INSTALL_DATA)
 

-VERSION           = 1.8.4
-VDATE     = 26 July 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)
 
 
 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 \
 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 \


@@ -29,42 +32,50 @@ MDOCSRCS   = mdoc_macro.c mdoc.c mdoc_hash.c mdoc_strings.c \
             arch.c vol.c msec.c st.c mandoc.c
 
 MANLNS    = man_macro.ln man.ln man_hash.ln man_validate.ln \
             arch.c vol.c msec.c st.c mandoc.c
 
 MANLNS    = man_macro.ln man.ln man_hash.ln man_validate.ln \

-            man_action.ln mandoc.ln
+            man_action.ln mandoc.ln man_argv.ln

 MANOBJS           = man_macro.o man.o man_hash.o man_validate.o \
 MANOBJS           = man_macro.o man.o man_hash.o man_validate.o \

-            man_action.o mandoc.o
+            man_action.o mandoc.o man_argv.o

 MANSRCS           = man_macro.c man.c man_hash.c man_validate.c \
 MANSRCS           = man_macro.c man.c man_hash.c man_validate.c \

-            man_action.c mandoc.c
+            man_action.c mandoc.c man_argv.c

 
 

-MAINLNS           = main.ln mdoc_term.ln ascii.ln term.ln tree.ln \
-            compat.ln man_term.ln
-MAINOBJS   = main.o mdoc_term.o ascii.o term.o tree.o compat.o \
-            man_term.o
-MAINSRCS   = main.c mdoc_term.c ascii.c term.c tree.c compat.c \
-            man_term.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
+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
+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

 
 LLNS      = llib-llibmdoc.ln llib-llibman.ln llib-lmandoc.ln
 LNS       = $(MAINLNS) $(MDOCLNS) $(MANLNS)
 LIBS      = libmdoc.a libman.a
 OBJS      = $(MDOCOBJS) $(MAINOBJS) $(MANOBJS)
 SRCS      = $(MDOCSRCS) $(MAINSRCS) $(MANSRCS)
 
 LLNS      = llib-llibmdoc.ln llib-llibman.ln llib-lmandoc.ln
 LNS       = $(MAINLNS) $(MDOCLNS) $(MANLNS)
 LIBS      = libmdoc.a libman.a
 OBJS      = $(MDOCOBJS) $(MAINOBJS) $(MANOBJS)
 SRCS      = $(MDOCSRCS) $(MAINSRCS) $(MANSRCS)

-DATAS     = arch.in att.in lib.in msec.in st.in vol.in ascii.in
-HEADS     = mdoc.h libmdoc.h man.h libman.h term.h libmandoc.h
-SGMLS     = index.sgml 
+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
+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
 XSLS      = ChangeLog.xsl

-HTMLS     = index.html ChangeLog.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
 XMLS      = ChangeLog.xml

-STATICS           = style.css external.png
+STATICS           = index.css style.css external.png

 MD5S      = mdocml-$(VERSION).md5 
 TARGZS    = mdocml-$(VERSION).tar.gz
 MANS      = mandoc.1 mdoc.3 mdoc.7 manuals.7 mandoc_char.7 \
             man.7 man.3
 MD5S      = mdocml-$(VERSION).md5 
 TARGZS    = mdocml-$(VERSION).tar.gz
 MANS      = mandoc.1 mdoc.3 mdoc.7 manuals.7 mandoc_char.7 \
             man.7 man.3

-TEXTS     = mandoc.1.txt mdoc.3.txt mdoc.7.txt manuals.7.txt \
-            mandoc_char.7.txt man.7.txt man.3.txt

 BINS      = mandoc
 CLEAN     = $(BINS) $(LNS) $(LLNS) $(LIBS) $(OBJS) $(HTMLS) \
 BINS      = mandoc
 CLEAN     = $(BINS) $(LNS) $(LLNS) $(LIBS) $(OBJS) $(HTMLS) \

-            $(TARGZS) tags $(TEXTS) $(MD5S) $(XMLS) 
+            $(TARGZS) tags $(MD5S) $(XMLS) $(TEXTS) $(GSGMLS)

 INSTALL           = $(SRCS) $(HEADS) Makefile $(MANS) $(SGMLS) $(STATICS) \
 INSTALL           = $(SRCS) $(HEADS) Makefile $(MANS) $(SGMLS) $(STATICS) \

-            $(DATAS) $(XSLS)
+            $(DATAS) $(XSLS) $(EXAMPLES)

 
 all:   $(BINS)
 
 
 all:   $(BINS)
 


@@ -78,12 +89,10 @@ cleanlint:
 
 dist:  mdocml-$(VERSION).tar.gz
 
 
 dist:  mdocml-$(VERSION).tar.gz
 

-html:  $(HTMLS)
-
-www:   all $(HTMLS) $(MD5S) $(TARGZS) $(TEXTS) 
+www:   all $(HTMLS) $(TEXTS) $(MD5S) $(TARGZS)

 
 installwww: www
 
 installwww: www

-       install -m 0444 $(TEXTS) $(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
        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


@@ -117,8 +126,8 @@ arch.o: arch.c arch.in libmdoc.h
 vol.ln: vol.c vol.in libmdoc.h
 vol.o: vol.c vol.in libmdoc.h
 
 vol.ln: vol.c vol.in libmdoc.h
 vol.o: vol.c vol.in libmdoc.h
 

-ascii.ln: ascii.c ascii.in term.h
-ascii.o: ascii.c ascii.in term.h
+chars.ln: chars.c chars.in chars.h
+chars.o: chars.c chars.in chars.h

 
 msec.ln: msec.c msec.in libmdoc.h
 msec.o: msec.c msec.in libmdoc.h
 
 msec.ln: msec.c msec.in libmdoc.h
 msec.o: msec.c msec.in libmdoc.h


@@ -153,12 +162,30 @@ main.o: main.c mdoc.h
 compat.ln: compat.c 
 compat.o: compat.c
 
 compat.ln: compat.c 
 compat.o: compat.c
 

-term.ln: term.c term.h man.h mdoc.h
-term.o: term.c term.h man.h mdoc.h
+term.ln: term.c term.h man.h mdoc.h chars.h
+term.o: term.c term.h man.h mdoc.h chars.h
+
+html.ln: html.c html.h chars.h
+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 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

 
 mdoc_argv.ln: mdoc_argv.c libmdoc.h
 mdoc_argv.o: mdoc_argv.c libmdoc.h
 
 
 mdoc_argv.ln: mdoc_argv.c libmdoc.h
 mdoc_argv.o: mdoc_argv.c libmdoc.h
 

+man_argv.ln: man_argv.c libman.h
+man_argv.o: man_argv.c libman.h
+

 man_validate.ln: man_validate.c libman.h
 man_validate.o: man_validate.c libman.h
 
 man_validate.ln: man_validate.c libman.h
 man_validate.o: man_validate.c libman.h
 


@@ -173,12 +200,15 @@ libmdoc.h: mdoc.h
 ChangeLog.xml:
        cvs2cl --xml --xml-encoding iso-8859-15 -t --noxmlns -f $@
 
 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
 
 mdocml-$(VERSION).tar.gz: $(INSTALL)
        mkdir -p .dist/mdocml/mdocml-$(VERSION)/
 ChangeLog.html: ChangeLog.xml ChangeLog.xsl
        xsltproc -o $@ ChangeLog.xsl ChangeLog.xml
 
 mdocml-$(VERSION).tar.gz: $(INSTALL)
        mkdir -p .dist/mdocml/mdocml-$(VERSION)/

-       install -m 0644 $(INSTALL) .dist/mdocml/mdocml-$(VERSION)/
+       cp -f $(INSTALL) .dist/mdocml/mdocml-$(VERSION)/

        ( cd .dist/mdocml/ && tar zcf ../../$@ mdocml-$(VERSION)/ )
        rm -rf .dist/
 
        ( cd .dist/mdocml/ && tar zcf ../../$@ mdocml-$(VERSION)/ )
        rm -rf .dist/
 


@@ -205,13 +235,22 @@ mandoc: $(MAINOBJS) libmdoc.a libman.a
        sed -e "s!@VERSION@!$(VERSION)!" -e "s!@VDATE@!$(VDATE)!" $< > $@
 
 .1.1.txt:
        sed -e "s!@VERSION@!$(VERSION)!" -e "s!@VDATE@!$(VDATE)!" $< > $@
 
 .1.1.txt:

-       ./mandoc -Wall,error -fstrict $< | col -b > $@
+       ./mandoc $(MANDOCFLAGS) $< | col -b > $@
+
+.1.1.sgml:
+       ./mandoc $(MANDOCFLAGS) $(MANDOCHTML) $< > $@

 
 .3.3.txt:
 
 .3.3.txt:

-       ./mandoc -Wall,error -fstrict $< | col -b > $@
+       ./mandoc $(MANDOCFLAGS) $< | col -b > $@
+
+.3.3.sgml:
+       ./mandoc $(MANDOCFLAGS) $(MANDOCHTML) $< > $@

 
 .7.7.txt:
 
 .7.7.txt:

-       ./mandoc -Wall,error -fstrict $< | col -b > $@
+       ./mandoc $(MANDOCFLAGS) $< | col -b > $@
+
+.7.7.sgml:
+       ./mandoc $(MANDOCFLAGS) $(MANDOCHTML) $< > $@

 
 .tar.gz.md5:
        md5 $< > $@
 
 .tar.gz.md5:
        md5 $< > $@