===================================================================
RCS file: /cvs/mandoc/Makefile,v
retrieving revision 1.64
retrieving revision 1.71
diff -u -p -r1.64 -r1.71
--- mandoc/Makefile	2009/01/20 22:55:46	1.64
+++ mandoc/Makefile	2009/02/20 11:04:23	1.71
@@ -3,9 +3,9 @@ VERSION	= 1.2.0
 CFLAGS += -W -Wall -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
+BINLNS	= mdocml.ln term.ln tree.ln
 
 LNS	= $(LIBLNS) $(BINLNS)
 
@@ -14,14 +14,14 @@ LLNS	= llib-llibmdoc.ln llib-lmdocml.ln
 LIBS	= libmdoc.a
 
 LIBOBJS	= macro.o mdoc.o hash.o strings.o xstd.o argv.o \
-	  validate.o action.o
+	  validate.o action.o 
 
-BINOBJS	= tree.o mdocml.o
+BINOBJS	= mdocml.o term.o tree.o
 
 OBJS	= $(LIBOBJS) $(BINOBJS)
 
 SRCS	= macro.c mdoc.c mdocml.c hash.c strings.c xstd.c argv.c \
-	  validate.c action.c tree.c
+	  validate.c action.c 
 
 HEADS	= mdoc.h private.h
 
@@ -48,7 +48,22 @@ FAIL	= regress/test.empty \
 	  regress/test.prologue.21 \
 	  regress/test.prologue.22 \
 	  regress/test.prologue.23 \
-	  regress/test.prologue.24
+	  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 \
@@ -59,7 +74,16 @@ SUCCEED	= regress/test.prologue.05 \
 	  regress/test.prologue.12 \
 	  regress/test.prologue.14 \
 	  regress/test.prologue.17 \
-	  regress/test.prologue.20
+	  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)
 
@@ -72,7 +96,7 @@ dist:	mdocml-$(VERSION).tar.gz
 
 port:	mdocml-oport-$(VERSION).tar.gz
 
-regress::
+regress:: mdocml
 	@for f in $(FAIL); do \
 		echo "./mdocml $$f" ; \
 		./mdocml $$f 2>/dev/null || continue ; exit 1 ; done
@@ -108,14 +132,18 @@ macro.ln: macro.c private.h
 
 macro.o: macro.c private.h
 
-strings.ln: strings.c private.h
-
-strings.o: strings.c private.h
-
 tree.ln: tree.c mdoc.h
 
 tree.o: tree.c mdoc.h
 
+term.ln: term.c mdoc.h
+
+term.o: term.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
@@ -153,7 +181,7 @@ 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.64 2009/01/20 22:55:46 kristaps Exp $$ > .dist/mdocml/pkg/PLIST
+	echo @comment $$OpenBSD: Makefile,v 1.71 2009/02/20 11:04:23 kristaps Exp $$ > .dist/mdocml/pkg/PLIST
 	echo bin/mdocml >> .dist/mdocml/pkg/PLIST
 	echo lib/libmdoc.a >> .dist/mdocml/pkg/PLIST
 	echo include/mdoc.h >> .dist/mdocml/pkg/PLIST
@@ -178,5 +206,5 @@ libmdoc.a: $(LIBOBJS)
 	$(AR) rs $@ $(LIBOBJS)
 
 mdocml:	$(BINOBJS) libmdoc.a
-	$(CC) $(CFLAGS) -o $@ $(BINOBJS) libmdoc.a
+	$(CC) $(CFLAGS) -o $@ $(BINOBJS) libmdoc.a -lcurses