===================================================================
RCS file: /cvs/mandoc/Makefile,v
retrieving revision 1.303
retrieving revision 1.315
diff -u -p -r1.303 -r1.315
--- mandoc/Makefile	2010/12/29 14:38:14	1.303
+++ mandoc/Makefile	2011/03/20 11:41:24	1.315
@@ -18,8 +18,8 @@ INSTALL_DATA	= $(INSTALL) -m 0444
 INSTALL_LIB	= $(INSTALL) -m 0644
 INSTALL_MAN	= $(INSTALL_DATA)
 
-VERSION	   = 1.10.8
-VDATE	   = 24 December 2010
+VERSION	   = 1.10.10
+VDATE	   = 20 March 2011
 
 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 tbl.ln tbl_opts.ln tbl_layout.ln
+ROFFLNS    = roff.ln tbl.ln tbl_opts.ln tbl_layout.ln tbl_data.ln eqn.ln
 
-ROFFSRCS   = roff.c tbl.c tbl_opts.c tbl_layout.c
+ROFFSRCS   = roff.c tbl.c tbl_opts.c tbl_layout.c tbl_data.c eqn.c
 
-ROFFOBJS   = roff.o tbl.o tbl_opts.o tbl_layout.o
+ROFFOBJS   = roff.o tbl.o tbl_opts.o tbl_layout.o tbl_data.o eqn.o
 
 MANDOCLNS  = mandoc.ln
 
@@ -43,15 +43,15 @@ MANDOCSRCS = mandoc.c
 
 MANDOCOBJS = mandoc.o
 
-MDOCLNS	   = mdoc_macro.ln mdoc.ln mdoc_hash.ln mdoc_strings.ln \
+MDOCLNS	   = mdoc_macro.ln mdoc.ln mdoc_hash.ln \
 	     mdoc_argv.ln mdoc_validate.ln \
 	     lib.ln att.ln arch.ln vol.ln msec.ln st.ln
 
-MDOCOBJS   = mdoc_macro.o mdoc.o mdoc_hash.o mdoc_strings.o \
+MDOCOBJS   = mdoc_macro.o mdoc.o mdoc_hash.o \
 	     mdoc_argv.o mdoc_validate.o lib.o att.o \
 	     arch.o vol.o msec.o st.o
 
-MDOCSRCS   = mdoc_macro.c mdoc.c mdoc_hash.c mdoc_strings.c \
+MDOCSRCS   = mdoc_macro.c mdoc.c mdoc_hash.c \
 	     mdoc_argv.c mdoc_validate.c lib.c att.c \
 	     arch.c vol.c msec.c st.c
 
@@ -65,15 +65,16 @@ MANSRCS	   = man_macro.c man.c man_hash.c man_validate
 
 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 read.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 read.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 read.c
 
 LLNS	   = llib-llibmdoc.ln llib-llibman.ln llib-lmandoc.ln \
 	     llib-llibmandoc.ln llib-llibroff.ln
@@ -98,30 +99,30 @@ HEADS	   = mdoc.h libmdoc.h man.h libman.h term.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 eqn.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 
+	     roff.7.xhtml roff.3.xhtml tbl.7.xhtml eqn.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 eqn.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 eqn.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 eqn.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 eqn.7.txt
 
 EXAMPLES   = example.style.css
 
@@ -134,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 eqn.7
 
 BINS	   = mandoc
 
@@ -178,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 eqn.7 tbl.7 mandoc_char.7 $(DESTDIR)$(MANDIR)/man7
 	$(INSTALL_DATA) example.style.css $(DESTDIR)$(EXAMPLEDIR)
 
 uninstall:
@@ -186,6 +187,8 @@ 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/eqn.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
@@ -214,8 +217,6 @@ mdoc_macro.ln mdoc_macro.o: mdoc_macro.c libmdoc.h
 
 mdoc_term.ln mdoc_term.o: mdoc_term.c term.h mdoc.h
 
-mdoc_strings.ln mdoc_strings.o: mdoc_strings.c libmdoc.h
-
 man_hash.ln man_hash.o: man_hash.c libman.h
 
 mdoc_hash.ln mdoc_hash.o: mdoc_hash.c libmdoc.h
@@ -330,13 +331,13 @@ config.h: config.h.pre config.h.post
 	rm -f config.log
 	( cat config.h.pre; \
 	echo; \
-	if $(CC) $(CFLAGS) -Werror -c test-strlcat.c >> config.log 2>&1; then \
+	if $(CC) $(CFLAGS) -Werror -o test-strlcat test-strlcat.c >> config.log 2>&1; then \
 		echo '#define HAVE_STRLCAT'; \
-		rm test-strlcat.o; \
+		rm test-strlcat; \
 	fi; \
-	if $(CC) $(CFLAGS) -Werror -c test-strlcpy.c >> config.log 2>&1; then \
+	if $(CC) $(CFLAGS) -Werror -o test-strlcpy test-strlcpy.c >> config.log 2>&1; then \
 		echo '#define HAVE_STRLCPY'; \
-		rm test-strlcpy.o; \
+		rm test-strlcpy; \
 	fi; \
 	echo; \
 	cat config.h.post \