===================================================================
RCS file: /cvs/mandoc/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.19
diff -u -p -r1.1.1.1 -r1.19
--- mandoc/Makefile	2008/11/22 14:53:29	1.1.1.1
+++ mandoc/Makefile	2008/12/02 13:20:24	1.19
@@ -1,35 +1,79 @@
-CFLAGS += -W -Wall -g
+CFLAGS += -W -Wall -Wno-unused-parameter -g 
 
 LINTFLAGS += -c -e -f -u
 
-CLEAN = mdocml mdocml.o mdocml.ln libmdocml.o libmdocml.ln
+LNS	= mdocml.ln html4_strict.ln xml.ln libmdocml.ln roff.ln
 
-INSTALL = Makefile libmdocml.h mdocml.c libmdocml.c mdocml.1
+LLNS	= llib-lmdocml.ln
 
+LIBS	= libmdocml.a
+
+OBJS	= mdocml.o html4_strict.o xml.o libmdocml.o roff.o
+
+SRCS	= mdocml.c html4_strict.c xml.c libmdocml.c roff.c
+
+HEADS	= libmdocml.h private.h
+
+MANS	= mdocml.1
+
+CLEAN	= mdocml mdocml.tgz $(LLNS) $(LNS) $(OBJS) $(LIBS)
+
+INSTALL	= Makefile $(HEADS) $(SRCS) $(MANS)
+
+FAIL	= test.0 test.1 test.2 test.3 test.4 test.5 test.6 \
+	  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 \
+	  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
 
-lint: mdocml.ln libmdocml.ln
+lint: llib-lmdocml.ln
 
-mdocml: mdocml.o libmdocml.o
-	$(CC) $(CFLAGS) -o $@ mdocml.o libmdocml.o
+dist: mdocml.tgz
 
+regress: mdocml
+	@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
+
 clean:
 	rm -f $(CLEAN)
 
-dist:
+mdocml.tgz: $(INSTALL)
 	mkdir -p .dist/mdocml/
 	install -m 0644 $(INSTALL) .dist/mdocml/
 	( cd .dist/ && tar zcf ../mdocml.tgz mdocml/ )
 	rm -rf .dist/
 
-mdocml.ln: mdocml.c 
+llib-lmdocml.ln: mdocml.ln libmdocml.ln html4_strict.ln xml.ln roff.ln
+	$(LINT) $(LINTFLAGS) -Cmdocml mdocml.ln libmdocml.ln html4_strict.ln xml.ln roff.ln
 
-mdocml.o: mdocml.c 
+mdocml.ln: mdocml.c libmdocml.h
 
-mdocml.c: libmdocml.h
+mdocml.o: mdocml.c libmdocml.h
 
-libmdocml.ln: libmdocml.c 
+libmdocml.a: libmdocml.o html4_strict.o xml.o roff.o
+	$(AR) rs $@ libmdocml.o html4_strict.o xml.o roff.o
 
-libmdocml.o: libmdocml.c 
+xml.ln: xml.c private.h libmdocml.h
 
-libmdocml.c: libmdocml.h
+xml.o: xml.c private.h libmdocml.h
+
+html4_strict.ln: html4_strict.c private.h libmdocml.h
+
+html4_strict.o: html4_strict.c private.h libmdocml.h
+
+roff.ln: roff.c private.h libmdocml.h
+
+roff.o: roff.c private.h libmdocml.h
+
+libmdocml.ln: libmdocml.c private.h libmdocml.h
+
+libmdocml.o: libmdocml.c private.h libmdocml.h