Make -T[x]html for tables structure cells with a width. I don't

[mandoc.git] / Makefile

diff --git a/Makefile b/Makefile
index 7fa0cde14013d3f2bb3b5962c63e125022e724db..20416b85521d85026a15604fa1af86faa56b04fc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@ INSTALL_LIB   = $(INSTALL) -m 0644
 INSTALL_MAN    = $(INSTALL_DATA)
 
 VERSION           = 1.10.8
-VDATE     = 23 December 2010
+VDATE     = 24 December 2010
 
 VFLAGS    = -DVERSION="\"$(VERSION)\""
 WFLAGS     = -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings
@@ -31,11 +31,11 @@ CFLAGS    += -g $(WFLAGS) $(VFLAGS) -DHAVE_CONFIG_H
 
 LINTFLAGS += $(VFLAGS)
 
-ROFFLNS    = roff.ln
+ROFFLNS    = roff.ln tbl.ln tbl_opts.ln tbl_layout.ln tbl_data.ln
 
-ROFFSRCS   = roff.c
+ROFFSRCS   = roff.c tbl.c tbl_opts.c tbl_layout.c tbl_data.c
 
-ROFFOBJS   = roff.o
+ROFFOBJS   = roff.o tbl.o tbl_opts.o tbl_layout.o tbl_data.o
 
 MANDOCLNS  = mandoc.ln
 
@@ -65,15 +65,16 @@ 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 out.ln term_ps.ln term_ascii.ln
+            man_html.ln out.ln term_ps.ln term_ascii.ln \
+            tbl_term.ln tbl_html.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 \
-            term_ps.o term_ascii.o
+            term_ps.o term_ascii.o tbl_term.o tbl_html.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 \
-            term_ps.c term_ascii.c
+            term_ps.c term_ascii.c tbl_term.c tbl_html.c
 
 LLNS      = llib-llibmdoc.ln llib-llibman.ln llib-lmandoc.ln \
             llib-llibmandoc.ln llib-llibroff.ln
@@ -94,30 +95,34 @@ DATAS          = arch.in att.in lib.in msec.in st.in \
 
 HEADS     = mdoc.h libmdoc.h man.h libman.h term.h \
             libmandoc.h html.h chars.h out.h main.h roff.h \
-            mandoc.h
+            mandoc.h libroff.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 tbl.7.sgml
 
 SGMLS     = index.sgml
 
+XHTMLS    = mandoc.1.xhtml mdoc.3.xhtml \
+            man.3.xhtml mdoc.7.xhtml man.7.xhtml mandoc_char.7.xhtml \
+            roff.7.xhtml roff.3.xhtml tbl.7.xhtml
+
 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 tbl.7.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 tbl.7.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 
+            mandoc_char.7.pdf roff.7.pdf roff.3.pdf tbl.7.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 tbl.7.txt
 
 EXAMPLES   = example.style.css
 
@@ -130,7 +135,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 tbl.7
 
 BINS      = mandoc
 
@@ -140,7 +145,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) $(PDFS)
+            config.h config.log $(PSS) $(PDFS) $(XHTMLS)
 
 DOINSTALL  = $(SRCS) $(HEADS) Makefile $(MANS) $(SGMLS) $(STATICS) \
             $(DATAS) $(XSLS) $(EXAMPLES) $(TESTS) $(CONFIGS)
@@ -154,14 +159,14 @@ clean:
 
 dist:  mdocml-$(VERSION).tar.gz
 
-www:   all $(GSGMLS) $(HTMLS) $(TEXTS) $(MD5S) $(TARGZS) $(PSS) $(PDFS)
+www:   all $(GSGMLS) $(HTMLS) $(XHTMLS) $(TEXTS) $(MD5S) $(TARGZS) $(PSS) $(PDFS)
 
 ps:    $(PSS)
 
 pdf:   $(PDFS)
 
 installwww: www
-       $(INSTALL_DATA) $(HTMLS) $(PSS) $(PDFS) $(TEXTS) $(STATICS) $(DESTDIR)$(PREFIX)/
+       $(INSTALL_DATA) $(HTMLS) $(XHTMLS) $(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
@@ -174,7 +179,7 @@ install:
        mkdir -p $(DESTDIR)$(MANDIR)/man7
        $(INSTALL_PROGRAM) mandoc $(DESTDIR)$(BINDIR)
        $(INSTALL_MAN) mandoc.1 $(DESTDIR)$(MANDIR)/man1
-       $(INSTALL_MAN) man.7 mdoc.7 roff.7 mandoc_char.7 $(DESTDIR)$(MANDIR)/man7
+       $(INSTALL_MAN) man.7 mdoc.7 roff.7 tbl.7 mandoc_char.7 $(DESTDIR)$(MANDIR)/man7
        $(INSTALL_DATA) example.style.css $(DESTDIR)$(EXAMPLEDIR)
 
 uninstall:
@@ -182,6 +187,7 @@ uninstall:
        rm -f $(DESTDIR)$(MANDIR)/man1/mandoc.1
        rm -f $(DESTDIR)$(MANDIR)/man7/mdoc.7
        rm -f $(DESTDIR)$(MANDIR)/man7/roff.7
+       rm -f $(DESTDIR)$(MANDIR)/man7/tbl.7
        rm -f $(DESTDIR)$(MANDIR)/man7/man.7
        rm -f $(DESTDIR)$(MANDIR)/man7/mandoc_char.7
        rm -f $(DESTDIR)$(EXAMPLEDIR)/example.style.css