===================================================================
RCS file: /cvs/mandoc/Makefile,v
retrieving revision 1.7
retrieving revision 1.20
diff -u -p -r1.7 -r1.20
--- mandoc/Makefile	2008/11/26 16:50:34	1.7
+++ mandoc/Makefile	2008/12/02 18:26:57	1.20
@@ -1,16 +1,16 @@
-CFLAGS += -W -Wall -Wno-unused-parameter -g
+CFLAGS += -W -Wall -Wno-unused-parameter -g 
 
 LINTFLAGS += -c -e -f -u
 
-LNS	= mdocml.ln html4_strict.ln dummy.ln libmdocml.ln roff.ln
+LNS	= mdocml.ln html4_strict.ln xml.ln libmdocml.ln roff.ln ml.ln
 
 LLNS	= llib-lmdocml.ln
 
 LIBS	= libmdocml.a
 
-OBJS	= mdocml.o html4_strict.o dummy.o libmdocml.o roff.o
+OBJS	= mdocml.o html4_strict.o xml.o libmdocml.o roff.o ml.o
 
-SRCS	= mdocml.c html4_strict.c dummy.c libmdocml.c roff.c
+SRCS	= mdocml.c html4_strict.c xml.c libmdocml.c roff.c ml.c
 
 HEADS	= libmdocml.h private.h
 
@@ -21,9 +21,13 @@ CLEAN	= mdocml mdocml.tgz $(LLNS) $(LNS) $(OBJS) $(LIB
 INSTALL	= Makefile $(HEADS) $(SRCS) $(MANS)
 
 FAIL	= test.0 test.1 test.2 test.3 test.4 test.5 test.6 \
-	  test.15
+	  test.15 test.20 test.22 test.24 test.26 test.27 test.30 \
+	  test.36
 
-SUCCEED	= test.7 test.8 test.9 test.10 test.11 test.12 test.13
+SUCCEED	= test.7 test.8 test.9 test.10 test.11 test.12 test.13 \
+	  test.14 test.16 test.17 test.18 test.19 test.21 test.23 \
+	  test.25 test.28 test.29 test.31 test.32 test.33 test.34 \
+	  test.35
 
 
 all: mdocml
@@ -33,8 +37,8 @@ lint: llib-lmdocml.ln
 dist: mdocml.tgz
 
 regress: mdocml
-	@for f in $(FAIL); do ./mdocml $$f 2>/dev/null || continue ; done
-	@for f in $(SUCCEED); do ./mdocml $$f || exit 1 ; done
+	@for f in $(FAIL); do ./mdocml $$f 1>/dev/null 2>/dev/null || continue ; done
+	@for f in $(SUCCEED); do ./mdocml $$f 1>/dev/null || exit 1 ; done
 
 mdocml: mdocml.o libmdocml.a
 	$(CC) $(CFLAGS) -o $@ mdocml.o libmdocml.a
@@ -48,33 +52,32 @@ mdocml.tgz: $(INSTALL)
 	( cd .dist/ && tar zcf ../mdocml.tgz mdocml/ )
 	rm -rf .dist/
 
-llib-lmdocml.ln: mdocml.ln libmdocml.ln html4_strict.ln dummy.ln roff.ln
-	$(LINT) $(LINTFLAGS) -Cmdocml mdocml.ln libmdocml.ln html4_strict.ln dummy.ln roff.ln
+llib-lmdocml.ln: mdocml.ln libmdocml.ln html4_strict.ln xml.ln roff.ln ml.ln
+	$(LINT) $(LINTFLAGS) -Cmdocml mdocml.ln libmdocml.ln html4_strict.ln xml.ln roff.ln ml.ln
 
-mdocml.ln: mdocml.c 
+mdocml.ln: mdocml.c libmdocml.h
 
-mdocml.o: mdocml.c 
+mdocml.o: mdocml.c libmdocml.h
 
-mdocml.c: libmdocml.h
+libmdocml.a: libmdocml.o html4_strict.o xml.o roff.o ml.o
+	$(AR) rs $@ libmdocml.o html4_strict.o xml.o roff.o ml.o
 
-libmdocml.a: libmdocml.o html4_strict.o dummy.o roff.o
-	$(AR) rs $@ libmdocml.o html4_strict.o dummy.o roff.o
+xml.ln: xml.c private.h libmdocml.h
 
-html4_strict.ln: html4_strict.c 
+xml.o: xml.c private.h libmdocml.h
 
-html4_strict.o: html4_strict.c 
+html4_strict.ln: html4_strict.c private.h libmdocml.h
 
-html4_strict.c: private.h libmdocml.h
+html4_strict.o: html4_strict.c private.h libmdocml.h
 
-roff.ln: roff.c 
+roff.ln: roff.c private.h libmdocml.h
 
-roff.o: roff.c 
+roff.o: roff.c private.h libmdocml.h
 
-roff.c: private.h libmdocml.h
+libmdocml.ln: libmdocml.c private.h libmdocml.h
 
-libmdocml.ln: libmdocml.c 
+libmdocml.o: libmdocml.c private.h libmdocml.h
 
-libmdocml.o: libmdocml.c 
+ml.ln: ml.c private.h libmdocml.h
 
-libmdocml.c: private.h libmdocml.h
-
+ml.o: ml.c private.h libmdocml.h