===================================================================
RCS file: /cvs/mandoc/Makefile,v
retrieving revision 1.138
retrieving revision 1.233
diff -u -p -r1.138 -r1.233
--- mandoc/Makefile	2009/03/21 09:45:49	1.138
+++ mandoc/Makefile	2009/10/22 17:54:24	1.233
@@ -1,4 +1,4 @@
-.SUFFIXES:	.html .sgml
+.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,44 +9,74 @@ INSTALL_DATA	= install -m 0444
 INSTALL_LIB	= install -m 0644
 INSTALL_MAN	= $(INSTALL_DATA)
 
-VERSION	   = 1.6.5
-VDATE	   = 21 March 2009
+VERSION	   = 1.9.9
+VDATE	   = 21 October 2009
 
-VFLAGS     = -DVERSION=\"$(VERSION)\"
-CFLAGS    += -W -Wall -Wstrict-prototypes -Wno-unused-parameter -g 
-LINTFLAGS += $(VFLAGS)
+VFLAGS     = -DVERSION="\"$(VERSION)\""
+CFLAGS    += -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings -g
 CFLAGS    += $(VFLAGS)
+#CFLAGS	  += -DOSNAME="\"OpenBSD 4.5\""
+LINTFLAGS += $(VFLAGS)
 
-LIBLNS	   = macro.ln mdoc.ln hash.ln strings.ln xstd.ln argv.ln \
-	     validate.ln action.ln lib.ln att.ln arch.ln vol.ln \
-	     msec.ln st.ln
-LIBOBJS	   = macro.o mdoc.o hash.o strings.o xstd.o argv.o validate.o \
-	     action.o lib.o att.o arch.o vol.o msec.o st.o
-LIBSRCS	   = macro.c mdoc.c hash.c strings.c xstd.c argv.c validate.c \
-	     action.c lib.c att.c arch.c vol.c msec.c st.c
+MANDOCFLAGS = -Wall -fstrict
+MANDOCHTML = -Thtml -ostyle=style.css,man=%N.%S.html,includes=%I.html
 
-MAINLNS	   = main.ln term.ln ascii.ln terminal.ln tree.ln compat.ln
-MAINOBJS   = main.o term.o ascii.o terminal.o tree.o compat.o
-MAINSRCS   = main.c term.c ascii.c terminal.c tree.c compat.c
+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 \
+	     mandoc.ln
+MDOCOBJS   = mdoc_macro.o mdoc.o mdoc_hash.o mdoc_strings.o \
+	     mdoc_argv.o mdoc_validate.o mdoc_action.o lib.o att.o \
+	     arch.o vol.o msec.o st.o mandoc.o
+MDOCSRCS   = mdoc_macro.c mdoc.c mdoc_hash.c mdoc_strings.c \
+	     mdoc_argv.c mdoc_validate.c mdoc_action.c lib.c att.c \
+	     arch.c vol.c msec.c st.c mandoc.c
 
-LLNS	   = llib-llibmdoc.ln llib-lmandoc.ln
-LNS	   = $(MAINLNS) $(LIBLNS)
-LIBS	   = libmdoc.a
-OBJS	   = $(LIBOBJS) $(MAINOBJS)
-SRCS	   = $(LIBSRCS) $(MAINSRCS)
-DATAS	   = arch.in att.in lib.in msec.in st.in vol.in ascii.in
-HEADS	   = mdoc.h private.h term.h 
-SGMLS	   = index.sgml
-HTMLS	   = index.html
-STATICS	   = style.css external.png
-TARGZS	   = mdocml-$(VERSION).tar.gz \
-	     mdocml-oport-$(VERSION).tar.gz \
-	     mdocml-nport-$(VERSION).tar.gz
-MANS	   = mandoc.1 mdoc.3 mdoc.7
+MANLNS	   = man_macro.ln man.ln man_hash.ln man_validate.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_argv.o
+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 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)
+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 main.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 mandoc.1.html mdoc.3.html ChangeLog.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
+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
 BINS	   = mandoc
-CLEAN	   = $(BINS) $(LNS) $(LLNS) $(LIBS) $(OBJS) $(HTMLS) $(TARGZS) 
-INSTALL	   = $(SRCS) $(HEADS) Makefile DESCR $(MANS) $(SGMLS) \
-	     $(STATICS) Makefile.netbsd Makefile.openbsd $(DATAS)
+CLEAN	   = $(BINS) $(LNS) $(LLNS) $(LIBS) $(OBJS) $(HTMLS) \
+	     $(TARGZS) tags $(MD5S) $(XMLS) $(TEXTS) $(GSGMLS)
+INSTALL	   = $(SRCS) $(HEADS) Makefile $(MANS) $(SGMLS) $(STATICS) \
+	     $(DATAS) $(XSLS) $(EXAMPLES)
 
 all:	$(BINS)
 
@@ -60,18 +90,14 @@ cleanlint:
 
 dist:	mdocml-$(VERSION).tar.gz
 
-port:	mdocml-oport-$(VERSION).tar.gz mdocml-nport-$(VERSION).tar.gz
+www:	all $(HTMLS) $(TEXTS) $(MD5S) $(TARGZS)
 
-www:	$(HTMLS) $(TARGZS)
-
 installwww: www
-	install -m 0444 $(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-oport-$(VERSION).tar.gz $(PREFIX)/ports-openbsd/
-	install -m 0444 mdocml-oport-$(VERSION).tar.gz $(PREFIX)/ports-openbsd/mdocml.tar.gz
-	install -m 0444 mdocml-nport-$(VERSION).tar.gz $(PREFIX)/ports-netbsd/
-	install -m 0444 mdocml-nport-$(VERSION).tar.gz $(PREFIX)/ports-netbsd/mdocml.tar.gz
+	install -m 0444 mdocml-$(VERSION).md5 $(PREFIX)/snapshots/mdocml.md5
 
 install:
 	mkdir -p $(BINDIR)
@@ -86,112 +112,134 @@ uninstall:
 	rm -f $(MANDIR)/man1/mandoc.1
 	rm -f $(MANDIR)/man7/mdoc.7
 
-lib.ln: lib.c lib.in private.h
-lib.o: lib.c lib.in private.h
+man_macro.ln: man_macro.c libman.h
+man_macro.o: man_macro.c libman.h
 
-att.ln: att.c att.in private.h
-att.o: att.c att.in private.h
+lib.ln: lib.c lib.in libmdoc.h
+lib.o: lib.c lib.in libmdoc.h
 
-arch.ln: arch.c arch.in private.h
-arch.o: arch.c arch.in private.h
+att.ln: att.c att.in libmdoc.h
+att.o: att.c att.in libmdoc.h
 
-vol.ln: vol.c vol.in private.h
-vol.o: vol.c vol.in private.h
+arch.ln: arch.c arch.in libmdoc.h
+arch.o: arch.c arch.in libmdoc.h
 
-ascii.ln: ascii.c ascii.in term.h
-ascii.o: ascii.c ascii.in term.h
+vol.ln: vol.c vol.in libmdoc.h
+vol.o: vol.c vol.in libmdoc.h
 
-msec.ln: msec.c msec.in private.h
-msec.o: msec.c msec.in private.h
+chars.ln: chars.c chars.in chars.h
+chars.o: chars.c chars.in chars.h
 
-st.ln: st.c st.in private.h
-st.o: st.c st.in private.h
+msec.ln: msec.c msec.in libmdoc.h
+msec.o: msec.c msec.in libmdoc.h
 
-macro.ln: macro.c private.h
-macro.o: macro.c private.h
+st.ln: st.c st.in libmdoc.h
+st.o: st.c st.in libmdoc.h
 
-term.ln: term.c term.h 
-term.o: term.c term.h
+mdoc_macro.ln: mdoc_macro.c libmdoc.h
+mdoc_macro.o: mdoc_macro.c libmdoc.h
 
-strings.ln: strings.c private.h
-strings.o: strings.c private.h
+mdoc_term.ln: mdoc_term.c term.h mdoc.h
+mdoc_term.o: mdoc_term.c term.h mdoc.h
 
-hash.ln: hash.c private.h
-hash.o: hash.c private.h
+mdoc_strings.ln: mdoc_strings.c libmdoc.h
+mdoc_strings.o: mdoc_strings.c libmdoc.h
 
-mdoc.ln: mdoc.c private.h
-mdoc.o: mdoc.c private.h
+man_hash.ln: man_hash.c libman.h
+man_hash.o: man_hash.c libman.h
 
+mdoc_hash.ln: mdoc_hash.c libmdoc.h
+mdoc_hash.o: mdoc_hash.c libmdoc.h
+
+mdoc.ln: mdoc.c libmdoc.h
+mdoc.o: mdoc.c libmdoc.h
+
+man.ln: man.c libman.h
+man.o: man.c libman.h
+
 main.ln: main.c mdoc.h
 main.o: main.c mdoc.h
 
-terminal.ln: terminal.c term.h
-terminal.o: terminal.c term.h
+compat.ln: compat.c 
+compat.o: compat.c
 
-xstd.ln: xstd.c private.h
-xstd.o: xstd.c private.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
 
-argv.ln: argv.c private.h
-argv.o: argv.c private.h
+html.ln: html.c html.h chars.h
+html.o: html.c html.h chars.h
 
-validate.ln: validate.c private.h
-validate.o: validate.c private.h
+mdoc_html.ln: mdoc_html.c html.h mdoc.h
+mdoc_html.o: mdoc_html.c html.h mdoc.h
 
-action.ln: action.c private.h
-action.o: action.c private.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
 
-private.h: mdoc.h
+out.ln: out.c out.h
+out.o: out.c out.h
 
-term.h: mdoc.h
+tree.ln: tree.c man.h mdoc.h
+tree.o: tree.c man.h mdoc.h
 
-mdocml-nport-$(VERSION).tar.gz: mdocml-$(VERSION).tar.gz Makefile.netbsd DESCR
-	mkdir -p .dist/mdocml/
-	sed -e "s!@VERSION@!$(VERSION)!" Makefile.netbsd > \
-		.dist/mdocml/Makefile
-	md5 mdocml-$(VERSION).tar.gz > .dist/mdocml/distinfo
-	rmd160 mdocml-$(VERSION).tar.gz >> .dist/mdocml/distinfo
-	sha1 mdocml-$(VERSION).tar.gz >> .dist/mdocml/distinfo
-	install -m 0644 DESCR .dist/mdocml/
-	echo @comment $$NetBSD$$ > .dist/mdocml/PLIST
-	echo bin/mandoc >> .dist/mdocml/PLIST
-	echo man/man1/mandoc.1 >> .dist/mdocml/PLIST
-	echo man/man7/mdoc.7 >> .dist/mdocml/PLIST
-	( cd .dist/ && tar zcf ../$@ mdocml/ )
-	rm -rf .dist/
+mdoc_argv.ln: mdoc_argv.c libmdoc.h
+mdoc_argv.o: mdoc_argv.c libmdoc.h
 
-mdocml-oport-$(VERSION).tar.gz: mdocml-$(VERSION).tar.gz Makefile.openbsd DESCR
-	mkdir -p .dist/mdocml/pkg
-	sed -e "s!@VERSION@!$(VERSION)!" Makefile.openbsd > \
-		.dist/mdocml/Makefile
-	md5 mdocml-$(VERSION).tar.gz > .dist/mdocml/distinfo
-	rmd160 mdocml-$(VERSION).tar.gz >> .dist/mdocml/distinfo
-	sha1 mdocml-$(VERSION).tar.gz >> .dist/mdocml/distinfo
-	install -m 0644 DESCR .dist/mdocml/pkg/DESCR
-	echo @comment $$OpenBSD: Makefile,v 1.138 2009/03/21 09:45:49 kristaps Exp $$ > .dist/mdocml/pkg/PLIST
-	echo bin/mandoc >> .dist/mdocml/pkg/PLIST
-	echo @man man/man1/mandoc.1 >> .dist/mdocml/pkg/PLIST
-	echo @man man/man7/mdoc.7 >> .dist/mdocml/pkg/PLIST
-	( cd .dist/ && tar zcf ../$@ mdocml/ )
-	rm -rf .dist/
+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
+
+mdoc_validate.ln: mdoc_validate.c libmdoc.h
+mdoc_validate.o: mdoc_validate.c libmdoc.h
+
+mdoc_action.ln: mdoc_action.c libmdoc.h
+mdoc_action.o: mdoc_action.c libmdoc.h
+
+libmdoc.h: mdoc.h
+
+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)/
-	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/
 
-llib-llibmdoc.ln: $(LIBLNS)
-	$(LINT) $(LINTFLAGS) -Clibmdoc $(LIBLNS)
+llib-llibmdoc.ln: $(MDOCLNS)
+	$(LINT) -Clibmdoc $(MDOCLNS)
 
+llib-llibman.ln: $(MANLNS)
+	$(LINT) -Clibman $(MANLNS)
+
 llib-lmandoc.ln: $(MAINLNS) llib-llibmdoc.ln
-	$(LINT) $(LINTFLAGS) -Cmandoc $(MAINLNS) llib-llibmdoc.ln
+	$(LINT) -Cmandoc $(MAINLNS) llib-llibmdoc.ln
 
-libmdoc.a: $(LIBOBJS)
-	$(AR) rs $@ $(LIBOBJS)
+libmdoc.a: $(MDOCOBJS)
+	$(AR) rs $@ $(MDOCOBJS)
 
-mandoc: $(MAINOBJS) libmdoc.a
-	$(CC) $(CFLAGS) -o $@ $(MAINOBJS) libmdoc.a 
+libman.a: $(MANOBJS)
+	$(AR) rs $@ $(MANOBJS)
 
+mandoc: $(MAINOBJS) libmdoc.a libman.a
+	$(CC) $(CFLAGS) -o $@ $(MAINOBJS) libmdoc.a libman.a
+
 .sgml.html:
-	validate $<
+	#validate $<
 	sed -e "s!@VERSION@!$(VERSION)!" -e "s!@VDATE@!$(VDATE)!" $< > $@
+
+.1.1.txt .3.3.txt .7.7.txt:
+	./mandoc $(MANDOCFLAGS) $< | col -b > $@
+
+.1.1.sgml .3.3.sgml .7.7.sgml:
+	./mandoc $(MANDOCFLAGS) $(MANDOCHTML) $< > $@
+
+.tar.gz.md5:
+	md5 $< > $@