===================================================================
RCS file: /cvs/mandoc/Makefile,v
retrieving revision 1.14
retrieving revision 1.54
diff -u -p -r1.14 -r1.54
--- mandoc/Makefile	2008/11/30 21:41:35	1.14
+++ mandoc/Makefile	2008/12/30 18:15:26	1.54
@@ -1,76 +1,73 @@
-CFLAGS += -W -Wall -Wno-unused-parameter -g
+VERSION	= 1.1.0
 
-LINTFLAGS += -c -e -f -u
+CFLAGS += -W -Wall -Wno-unused-parameter -g 
 
-LNS	= mdocml.ln html4_strict.ln xml.ln libmdocml.ln roff.ln
+LNS	= macro.ln mdoc.ln mdocml.ln hash.ln strings.ln xstd.ln argv.ln validate.ln
 
-LLNS	= llib-lmdocml.ln
+LLNS	= llib-llibmdoc.ln llib-lmdocml.ln
 
-LIBS	= libmdocml.a
+LIBS	= libmdoc.a
 
-OBJS	= mdocml.o html4_strict.o xml.o libmdocml.o roff.o
+OBJS	= macro.o mdoc.o mdocml.o hash.o strings.o xstd.o argv.o validate.o
 
-SRCS	= mdocml.c html4_strict.c xml.c libmdocml.c roff.c
+SRCS	= macro.c mdoc.c mdocml.c hash.c strings.c xstd.c argv.c validate.c
 
-HEADS	= libmdocml.h private.h
+HEADS	= mdoc.h
 
-MANS	= mdocml.1
+BINS	= mdocml
 
-CLEAN	= mdocml mdocml.tgz $(LLNS) $(LNS) $(OBJS) $(LIBS)
+CLEAN	= $(BINS) $(LNS) $(LLNS) $(LIBS) $(OBJS)
 
-INSTALL	= Makefile $(HEADS) $(SRCS) $(MANS)
+all:	$(BINS)
 
-FAIL	= test.0 test.1 test.2 test.3 test.4 test.5 test.6 \
-	  test.15 test.20
+lint:	$(LLNS)
 
-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
+mdocml:	mdocml.o libmdoc.a
+	$(CC) $(CFLAGS) -o $@ mdocml.o libmdoc.a
 
+clean:
+	rm -f $(CLEAN)
 
-all: mdocml
+llib-llibmdoc.ln: macro.ln mdoc.ln hash.ln strings.ln xstd.ln argv.ln validate.ln
+	$(LINT) $(LINTFLAGS) -Clibmdoc mdoc.ln macro.ln hash.ln strings.ln xstd.ln argv.ln validate.ln
 
-lint: llib-lmdocml.ln
+llib-lmdocml.ln: mdocml.ln llib-llibmdoc.ln
+	$(LINT) $(LINTFLAGS) -Cmdocml mdocml.ln llib-llibmdoc.ln
 
-dist: mdocml.tgz
+macro.ln: macro.c private.h
 
-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
+macro.o: macro.c private.h
 
-mdocml: mdocml.o libmdocml.a
-	$(CC) $(CFLAGS) -o $@ mdocml.o libmdocml.a
+strings.ln: strings.c private.h
 
-clean:
-	rm -f $(CLEAN)
+strings.o: strings.c private.h
 
-mdocml.tgz: $(INSTALL)
-	mkdir -p .dist/mdocml/
-	install -m 0644 $(INSTALL) .dist/mdocml/
-	( cd .dist/ && tar zcf ../mdocml.tgz mdocml/ )
-	rm -rf .dist/
+hash.ln: hash.c private.h
 
-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
+hash.o: hash.c private.h
 
-mdocml.ln: mdocml.c libmdocml.h
+mdoc.ln: mdoc.c private.h
 
-mdocml.o: mdocml.c libmdocml.h
+mdoc.o: mdoc.c private.h
 
-libmdocml.a: libmdocml.o html4_strict.o xml.o roff.o
-	$(AR) rs $@ libmdocml.o html4_strict.o xml.o roff.o
+mdocml.ln: mdocml.c mdoc.h
 
-xml.ln: xml.c private.h libmdocml.h
+mdocml.o: mdocml.c mdoc.h
 
-xml.o: xml.c private.h libmdocml.h
+xstd.ln: xstd.c private.h
 
-html4_strict.ln: html4_strict.c private.h libmdocml.h
+xstd.o: xstd.c private.h
 
-html4_strict.o: html4_strict.c private.h libmdocml.h
+argv.ln: argv.c private.h
 
-roff.ln: roff.c private.h libmdocml.h
+argv.o: argv.c private.h
 
-roff.o: roff.c private.h libmdocml.h
+validate.ln: validate.c private.h
 
-libmdocml.ln: libmdocml.c private.h libmdocml.h
+validate.o: validate.c private.h
 
-libmdocml.o: libmdocml.c private.h libmdocml.h
+private.h: mdoc.h
+
+libmdoc.a: macro.o mdoc.o hash.o strings.o xstd.o argv.o validate.o
+	$(AR) rs $@ macro.o mdoc.o hash.o strings.o xstd.o argv.o validate.o
+