===================================================================
RCS file: /cvs/mandoc/Makefile,v
retrieving revision 1.197
retrieving revision 1.211
diff -u -p -r1.197 -r1.211
--- mandoc/Makefile	2009/07/19 09:22:05	1.197
+++ mandoc/Makefile	2009/09/21 00:39:02	1.211
@@ -9,8 +9,8 @@ INSTALL_DATA	= install -m 0444
 INSTALL_LIB	= install -m 0644
 INSTALL_MAN	= $(INSTALL_DATA)
 
-VERSION	   = 1.8.1
-VDATE	   = 19 July 2009
+VERSION	   = 1.9.2
+VDATE	   = 05 September 2009
 
 VFLAGS     = -DVERSION=\"$(VERSION)\"
 CFLAGS    += -W -Wall -Wstrict-prototypes -Wno-unused-parameter -g
@@ -29,25 +29,25 @@ MDOCSRCS   = mdoc_macro.c mdoc.c mdoc_hash.c mdoc_stri
 	     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 \
-	     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 \
-	     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 out.ln
+MAINOBJS   = main.o mdoc_term.o chars.o term.o tree.o compat.o \
+	     man_term.o html.o out.o
+MAINSRCS   = main.c mdoc_term.c chars.c term.c tree.c compat.c \
+	     man_term.c 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)
-DATAS	   = arch.in att.in lib.in msec.in st.in vol.in ascii.in
+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 
 XSLS	   = ChangeLog.xsl
@@ -63,8 +63,8 @@ TEXTS	   = mandoc.1.txt mdoc.3.txt mdoc.7.txt manuals.
 BINS	   = mandoc
 CLEAN	   = $(BINS) $(LNS) $(LLNS) $(LIBS) $(OBJS) $(HTMLS) \
 	     $(TARGZS) tags $(TEXTS) $(MD5S) $(XMLS) 
-INSTALL	   = $(SRCS) $(HEADS) Makefile DESCR $(MANS) $(SGMLS) \
-	     $(STATICS) $(DATAS) $(XSLS)
+INSTALL	   = $(SRCS) $(HEADS) Makefile $(MANS) $(SGMLS) $(STATICS) \
+	     $(DATAS) $(XSLS)
 
 all:	$(BINS)
 
@@ -117,8 +117,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
 
-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
@@ -156,9 +156,21 @@ compat.o: compat.c
 term.ln: term.c term.h man.h mdoc.h
 term.o: term.c term.h man.h mdoc.h
 
+html.ln: html.c out.h man.h mdoc.h
+html.o: html.c out.h man.h mdoc.h
+
+out.ln: out.c out.h man.h mdoc.h
+out.o: out.c out.h man.h mdoc.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
 
+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
 
@@ -178,7 +190,7 @@ ChangeLog.html: ChangeLog.xml ChangeLog.xsl
 
 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/