===================================================================
RCS file: /cvs/mandoc/Makefile,v
retrieving revision 1.63
retrieving revision 1.76
diff -u -p -r1.63 -r1.76
--- mandoc/Makefile	2009/01/20 15:11:16	1.63
+++ mandoc/Makefile	2009/02/22 22:58:39	1.76
@@ -1,38 +1,95 @@
-VERSION	= 1.2.0
+VERSION	= 1.3.0
 
-CFLAGS += -W -Wall -Wno-unused-parameter -g 
+CFLAGS += -W -Wall -Wstrict-prototypes -Wno-unused-parameter -g 
 
 LIBLNS	= macro.ln mdoc.ln hash.ln strings.ln xstd.ln argv.ln \
-	  validate.ln action.ln
+	  validate.ln action.ln 
 
-BINLNS	= tree.ln mdocml.ln
+TREELNS	= mdoctree.ln mmain.ln tree.ln 
 
-LNS	= $(LIBLNS) $(BINLNS)
+TERMLNS	= mdoctree.ln mmain.ln term.ln termact.ln
 
-LLNS	= llib-llibmdoc.ln llib-lmdocml.ln
+LNS	= $(LIBLNS) $(TREELNS) $(TERMLNS)
 
+LLNS	= llib-llibmdoc.ln llib-lmdoctree.ln llib-lmdocterm.ln
+
 LIBS	= libmdoc.a
 
 LIBOBJS	= macro.o mdoc.o hash.o strings.o xstd.o argv.o \
 	  validate.o action.o
 
-BINOBJS	= tree.o mdocml.o
+TERMOBJS= mdocterm.o mmain.o term.o termact.o
 
-OBJS	= $(LIBOBJS) $(BINOBJS)
+TREEOBJS= mdoctree.o mmain.o tree.o 
 
-SRCS	= macro.c mdoc.c mdocml.c hash.c strings.c xstd.c argv.c \
-	  validate.c action.c tree.c
+OBJS	= $(LIBOBJS) $(TERMOBJS) $(TREEOBJS)
 
-HEADS	= mdoc.h private.h
+SRCS	= macro.c mdoc.c hash.c strings.c xstd.c argv.c validate.c \
+	  action.c term.c tree.c termact.c mdoctree.c mdocterm.c \
+	  mmain.c
 
-MANS	= mdocml.1 mdoc.3
+HEADS	= mdoc.h private.h term.h mmain.h
 
-BINS	= mdocml
+MANS	= mdoctree.1 mdocterm.1 mdoc.3
 
+BINS	= mdocterm mdoctree
+
 CLEAN	= $(BINS) $(LNS) $(LLNS) $(LIBS) $(OBJS)
 
 INSTALL	= $(SRCS) $(HEADS) Makefile Makefile.port DESCR $(MANS)
 
+FAIL	= regress/test.empty \
+	  regress/test.prologue.00 \
+	  regress/test.prologue.01 \
+	  regress/test.prologue.02 \
+	  regress/test.prologue.03 \
+	  regress/test.prologue.04 \
+	  regress/test.prologue.06 \
+	  regress/test.prologue.13 \
+	  regress/test.prologue.15 \
+	  regress/test.prologue.16 \
+	  regress/test.prologue.18 \
+	  regress/test.prologue.19 \
+	  regress/test.prologue.21 \
+	  regress/test.prologue.22 \
+	  regress/test.prologue.23 \
+	  regress/test.prologue.24 \
+	  regress/test.prologue.25 \
+	  regress/test.prologue.26 \
+	  regress/test.prologue.27 \
+	  regress/test.prologue.28 \
+	  regress/test.prologue.29 \
+	  regress/test.prologue.30 \
+	  regress/test.prologue.31 \
+	  regress/test.prologue.32 \
+	  regress/test.prologue.33 \
+	  regress/test.sh.01 \
+	  regress/test.sh.02 \
+	  regress/test.sh.03 \
+	  regress/test.name.01 \
+	  regress/test.name.02 \
+	  regress/test.name.03
+
+SUCCEED	= regress/test.prologue.05 \
+	  regress/test.prologue.07 \
+	  regress/test.prologue.08 \
+	  regress/test.prologue.09 \
+	  regress/test.prologue.10 \
+	  regress/test.prologue.11 \
+	  regress/test.prologue.12 \
+	  regress/test.prologue.14 \
+	  regress/test.prologue.17 \
+	  regress/test.prologue.20 \
+	  regress/test.sh.00 \
+	  regress/test.name.00 \
+	  regress/test.list.00 \
+	  regress/test.list.01 \
+	  regress/test.list.02 \
+	  regress/test.list.03 \
+	  regress/test.list.04 \
+	  regress/test.list.05 \
+	  regress/test.list.06
+
 all:	$(BINS)
 
 lint:	$(LLNS)
@@ -44,13 +101,23 @@ dist:	mdocml-$(VERSION).tar.gz
 
 port:	mdocml-oport-$(VERSION).tar.gz
 
+regress:: mdocml
+	@for f in $(FAIL); do \
+		echo "./mdocml $$f" ; \
+		./mdocml $$f 2>/dev/null || continue ; exit 1 ; done
+	@for f in $(SUCCEED); do \
+		echo "./mdocml $$f" ; \
+		./mdocml $$f 2>/dev/null || exit 1 ; done
+
 install:
 	mkdir -p $(PREFIX)/bin/
 	mkdir -p $(PREFIX)/include/mdoc/
 	mkdir -p $(PREFIX)/lib/
 	mkdir -p $(PREFIX)/man/man1/
-	install -m 0755 mdocml $(PREFIX)/bin/
-	install -m 0444 mdocml.1 $(PREFIX)/man/man1/
+	install -m 0755 mdocterm $(PREFIX)/bin/
+	install -m 0755 mdoctree $(PREFIX)/bin/
+	install -m 0444 mdocterm.1 $(PREFIX)/man/man1/
+	install -m 0444 mdocterm.1 $(PREFIX)/man/man1/
 	install -m 0444 mdoc.3 $(PREFIX)/man/man3/
 	install -m 0644 libmdoc.a $(PREFIX)/lib/
 	install -m 0444 mdoc.h $(PREFIX)/include/
@@ -62,54 +129,62 @@ install-dist: mdocml-$(VERSION).tar.gz mdocml-oport-$(
 	install -m 0644 mdocml-oport-$(VERSION).tar.gz $(PREFIX)/mdocml-oport.tar.gz
 
 uninstall:
-	rm -f $(PREFIX)/bin/mdocml
-	rm -f $(PREFIX)/man/man1/mdocml.1
+	rm -f $(PREFIX)/bin/mdocterm
+	rm -f $(PREFIX)/bin/mdoctree
+	rm -f $(PREFIX)/man/man1/mdocterm.1
+	rm -f $(PREFIX)/man/man1/mdoctree.1
 	rm -f $(PREFIX)/man/man3/mdoc.3
 	rm -f $(PREFIX)/lib/libmdoc.a
 	rm -f $(PREFIX)/include/mdoc.h
 
 macro.ln: macro.c private.h
-
 macro.o: macro.c private.h
 
-strings.ln: strings.c private.h
+tree.ln: tree.c mdoc.h
+tree.o: tree.c mdoc.h
 
-strings.o: strings.c private.h
+term.ln: term.c term.h 
+term.o: term.c term.h
 
-tree.ln: tree.c mdoc.h
+termact.ln: termact.c term.h 
+termact.o: termact.c term.h
 
-tree.o: tree.c mdoc.h
+strings.ln: strings.c private.h
+strings.o: strings.c private.h
 
 hash.ln: hash.c private.h
-
 hash.o: hash.c private.h
 
 mdoc.ln: mdoc.c private.h
-
 mdoc.o: mdoc.c private.h
 
-mdocml.ln: mdocml.c mdoc.h
+mdocterm.ln: mdocterm.c mmain.h
+mdocterm.o: mdocterm.c mmain.h
 
-mdocml.o: mdocml.c mdoc.h
+mdoctree.ln: mdoctree.c mmain.h
+mdoctree.o: mdoctree.c mmain.h
 
 xstd.ln: xstd.c private.h
-
 xstd.o: xstd.c private.h
 
 argv.ln: argv.c private.h
-
 argv.o: argv.c private.h
 
 validate.ln: validate.c private.h
-
 validate.o: validate.c private.h
 
 action.ln: action.c private.h
-
 action.o: action.c private.h
 
+mmain.ln: mmain.c mmain.h
+mmain.o: mmain.c mmain.h
+
 private.h: mdoc.h
 
+mmain.h: mdoc.h
+
+term.h: mdoc.h
+
 mdocml-oport-$(VERSION).tar.gz: Makefile.port DESCR
 	mkdir -p .dist/mdocml/pkg
 	sed -e "s!@VERSION@!$(VERSION)!" Makefile.port > .dist/mdocml/Makefile
@@ -117,11 +192,13 @@ mdocml-oport-$(VERSION).tar.gz: Makefile.port DESCR
 	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.63 2009/01/20 15:11:16 kristaps Exp $$ > .dist/mdocml/pkg/PLIST
-	echo bin/mdocml >> .dist/mdocml/pkg/PLIST
+	echo @comment $$OpenBSD: Makefile,v 1.76 2009/02/22 22:58:39 kristaps Exp $$ > .dist/mdocml/pkg/PLIST
+	echo bin/mdocterm >> .dist/mdocml/pkg/PLIST
+	echo bin/mdoctree >> .dist/mdocml/pkg/PLIST
 	echo lib/libmdoc.a >> .dist/mdocml/pkg/PLIST
 	echo include/mdoc.h >> .dist/mdocml/pkg/PLIST
-	echo @man man/man1/mdocml.1 >> .dist/mdocml/pkg/PLIST
+	echo @man man/man1/mdoctree.1 >> .dist/mdocml/pkg/PLIST
+	echo @man man/man1/mdocterm.1 >> .dist/mdocml/pkg/PLIST
 	echo @man man/man3/mdoc.3 >> .dist/mdocml/pkg/PLIST
 	( cd .dist/ && tar zcf ../$@ mdocml/ )
 	rm -rf .dist/
@@ -135,12 +212,18 @@ mdocml-$(VERSION).tar.gz: $(INSTALL)
 llib-llibmdoc.ln: $(LIBLNS)
 	$(LINT) $(LINTFLAGS) -Clibmdoc $(LIBLNS)
 
-llib-lmdocml.ln: $(BINLNS) llib-llibmdoc.ln
-	$(LINT) $(LINTFLAGS) -Cmdocml $(BINLNS) llib-llibmdoc.ln
+llib-lmdoctree.ln: $(TREELNS) llib-llibmdoc.ln
+	$(LINT) $(LINTFLAGS) -Cmdoctree $(TREELNS) llib-llibmdoc.ln
 
+llib-lmdocterm.ln: $(TERMLNS) llib-llibmdoc.ln
+	$(LINT) $(LINTFLAGS) -Cmdocterm $(TERMLNS) llib-llibmdoc.ln
+
 libmdoc.a: $(LIBOBJS)
 	$(AR) rs $@ $(LIBOBJS)
 
-mdocml:	$(BINOBJS) libmdoc.a
-	$(CC) $(CFLAGS) -o $@ $(BINOBJS) libmdoc.a
+mdocterm: $(TERMOBJS) libmdoc.a
+	$(CC) $(CFLAGS) -o $@ $(TERMOBJS) libmdoc.a 
+
+mdoctree: $(TREEOBJS) libmdoc.a
+	$(CC) $(CFLAGS) -o $@ $(TREEOBJS) libmdoc.a