Fix in -Tascii where `Lb' causes line-break in any section (should only happen in...

[mandoc.git] / Makefile

diff --git a/Makefile b/Makefile
index 4296f6838471b01876fa6f551942803e8b24e356..962f0a7aa6bbc69673b1fe1b1247fb59a0628056 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
@@ -9,8 +9,8 @@ INSTALL_DATA    = install -m 0444
 INSTALL_LIB    = install -m 0644
 INSTALL_MAN    = $(INSTALL_DATA)
 
-VERSION           = 1.9.2
-VDATE     = 05 September 2009
+VERSION           = 1.9.5
+VDATE     = 21 September 2009
 
 VFLAGS     = -DVERSION=\"$(VERSION)\"
 CFLAGS    += -W -Wall -Wstrict-prototypes -Wno-unused-parameter -g
@@ -36,35 +36,43 @@ MANSRCS        = man_macro.c man.c man_hash.c man_validate.c \
             man_action.c mandoc.c man_argv.c
 
 MAINLNS           = main.ln mdoc_term.ln chars.ln term.ln tree.ln \
-            compat.ln man_term.ln html.ln out.ln
+            compat.ln man_term.ln html.ln mdoc_html.ln \
+            man_html.ln
 MAINOBJS   = main.o mdoc_term.o chars.o term.o tree.o compat.o \
-            man_term.o html.o out.o
+            man_term.o html.o mdoc_html.o man_html.o
 MAINSRCS   = main.c mdoc_term.c chars.c term.c tree.c compat.c \
-            man_term.c html.c out.c
+            man_term.c html.c mdoc_html.c man_html.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)
-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
-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
+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
+HTMLS     = index.html ChangeLog.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.html
+EXAMPLES   = example.style.css
 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
-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) \
-            $(TARGZS) tags $(TEXTS) $(MD5S) $(XMLS) 
+            $(TARGZS) tags $(MD5S) $(XMLS) $(TEXTS) $(GSGMLS)
 INSTALL           = $(SRCS) $(HEADS) Makefile $(MANS) $(SGMLS) $(STATICS) \
-            $(DATAS) $(XSLS)
+            $(DATAS) $(XSLS) $(EXAMPLES)
 
 all:   $(BINS)
 
@@ -78,12 +86,10 @@ cleanlint:
 
 dist:  mdocml-$(VERSION).tar.gz
 
-html:  $(HTMLS)
-
-www:   all $(HTMLS) $(MD5S) $(TARGZS) $(TEXTS) 
+www:   all $(HTMLS) $(TEXTS) $(MD5S) $(TARGZS)
 
 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
@@ -153,14 +159,17 @@ main.o: main.c mdoc.h
 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
 
-html.ln: html.c out.h man.h mdoc.h
-html.o: html.c out.h man.h mdoc.h
+mdoc_html.ln: mdoc_html.c html.h mdoc.h
+mdoc_html.o: mdoc_html.c html.h mdoc.h
 
-out.ln: out.c out.h man.h mdoc.h
-out.o: out.c out.h man.h mdoc.h
+man_html.ln: man_html.c html.h man.h
+man_html.o: man_html.c html.h man.h
 
 tree.ln: tree.c man.h mdoc.h
 tree.o: tree.c man.h mdoc.h
@@ -219,11 +228,20 @@ mandoc: $(MAINOBJS) libmdoc.a libman.a
 .1.1.txt:
        ./mandoc -Wall,error -fstrict $< | col -b > $@
 
+.1.1.sgml:
+       ./mandoc -Thtml -ostyle=style.css -Wall,error -fstrict $< > $@
+
 .3.3.txt:
        ./mandoc -Wall,error -fstrict $< | col -b > $@
 
+.3.3.sgml:
+       ./mandoc -Thtml -ostyle=style.css -Wall,error -fstrict $< > $@
+
 .7.7.txt:
        ./mandoc -Wall,error -fstrict $< | col -b > $@
 
+.7.7.sgml:
+       ./mandoc -Thtml -ostyle=style.css -Wall,error -fstrict $< > $@
+
 .tar.gz.md5:
        md5 $< > $@