===================================================================
RCS file: /cvs/mandoc/Makefile,v
retrieving revision 1.5
retrieving revision 1.57
diff -u -p -r1.5 -r1.57
--- mandoc/Makefile	2008/11/23 22:30:53	1.5
+++ mandoc/Makefile	2009/01/08 15:05:50	1.57
@@ -1,63 +1,77 @@
-CFLAGS += -W -Wall -Wno-unused-parameter -g
-LINTFLAGS += -c -e -f -u
+VERSION	= 1.1.0
 
-LNS	= mdocml.ln html4_strict.ln dummy.ln libmdocml.ln
+CFLAGS += -W -Wall -Wno-unused-parameter -g 
 
-LLNS	= llib-lmdocml.ln
+LNS	= macro.ln mdoc.ln mdocml.ln hash.ln strings.ln xstd.ln argv.ln validate.ln action.ln
 
-LIBS	= libmdocml.a
+LLNS	= llib-llibmdoc.ln llib-lmdocml.ln
 
-OBJS	= mdocml.o html4_strict.o dummy.o libmdocml.o
+LIBS	= libmdoc.a
 
-SRCS	= mdocml.c html4_strict.c dummy.c libmdocml.c
+OBJS	= macro.o mdoc.o mdocml.o hash.o strings.o xstd.o argv.o validate.o action.o
 
-HEADS	= libmdocml.h private.h
+SRCS	= macro.c mdoc.c mdocml.c hash.c strings.c xstd.c argv.c validate.c action.c
 
-MANS	= mdocml.1
+HEADS	= mdoc.h
 
-CLEAN	= mdocml mdocml.tgz $(LLNS) $(LNS) $(OBJS) $(LIBS)
+BINS	= mdocml
 
-INSTALL	= Makefile $(HEADS) $(SRCS) $(MANS)
+CLEAN	= $(BINS) $(LNS) $(LLNS) $(LIBS) $(OBJS)
 
+all:	$(BINS)
 
-all: mdocml
+lint:	$(LLNS)
 
-lint: llib-lmdocml.ln
+mdocml:	mdocml.o libmdoc.a
+	$(CC) $(CFLAGS) -o $@ mdocml.o libmdoc.a
 
-dist: mdocml.tgz
-
-mdocml: mdocml.o libmdocml.a
-	$(CC) $(CFLAGS) -o $@ mdocml.o libmdocml.a
-
 clean:
 	rm -f $(CLEAN)
 
-mdocml.tgz: $(INSTALL)
-	mkdir -p .dist/mdocml/
-	install -m 0644 $(INSTALL) .dist/mdocml/
-	( cd .dist/ && tar zcf ../mdocml.tgz mdocml/ )
-	rm -rf .dist/
+llib-llibmdoc.ln: macro.ln mdoc.ln hash.ln strings.ln xstd.ln argv.ln validate.ln action.ln
+	$(LINT) $(LINTFLAGS) -Clibmdoc mdoc.ln macro.ln hash.ln strings.ln xstd.ln argv.ln validate.ln action.ln
 
-llib-lmdocml.ln: mdocml.ln libmdocml.ln html4_strict.ln dummy.ln
-	$(LINT) $(LINTFLAGS) -Cmdocml mdocml.ln libmdocml.ln html4_strict.ln dummy.ln
+llib-lmdocml.ln: mdocml.ln llib-llibmdoc.ln
+	$(LINT) $(LINTFLAGS) -Cmdocml mdocml.ln llib-llibmdoc.ln
 
-mdocml.ln: mdocml.c 
+macro.ln: macro.c private.h
 
-mdocml.o: mdocml.c 
+macro.o: macro.c private.h
 
-mdocml.c: libmdocml.h
+strings.ln: strings.c private.h
 
-libmdocml.a: libmdocml.o html4_strict.o dummy.o
-	$(AR) rs $@ libmdocml.o html4_strict.o dummy.o
+strings.o: strings.c private.h
 
-html4_strict.ln: html4_strict.c 
+hash.ln: hash.c private.h
 
-html4_strict.o: html4_strict.c 
+hash.o: hash.c private.h
 
-html4_strict.c: private.h libmdocml.h
+mdoc.ln: mdoc.c private.h
 
-libmdocml.ln: libmdocml.c 
+mdoc.o: mdoc.c private.h
 
-libmdocml.o: libmdocml.c 
+mdocml.ln: mdocml.c mdoc.h
 
-libmdocml.c: private.h libmdocml.h
+mdocml.o: mdocml.c mdoc.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
+
+private.h: mdoc.h
+
+libmdoc.a: macro.o mdoc.o hash.o strings.o xstd.o argv.o validate.o action.o
+	$(AR) rs $@ macro.o mdoc.o hash.o strings.o xstd.o argv.o validate.o action.o
+