===================================================================
RCS file: /cvs/mandoc/Makefile,v
retrieving revision 1.27
retrieving revision 1.52
diff -u -p -r1.27 -r1.52
--- mandoc/Makefile	2008/12/05 22:54:44	1.27
+++ mandoc/Makefile	2008/12/15 03:13:01	1.52
@@ -1,97 +1,61 @@
-CFLAGS += -W -Wall -Wno-unused-parameter -g -DDEBUG
+VERSION	= 1.1.0
 
-LINTFLAGS += -c -e -f -u
+CFLAGS += -W -Wall -Wno-unused-parameter -g 
 
-LNS	= mdocml.ln html.ln xml.ln libmdocml.ln roff.ln ml.ln mlg.ln compat.ln tokens.ln
+LNS	= macro.ln mdoc.ln mdocml.ln hash.ln strings.ln
 
-LLNS	= llib-lmdocml.ln
+LLNS	= llib-llibmdoc.ln llib-lmdocml.ln
 
-LIBS	= libmdocml.a
+LIBS	= libmdoc.a
 
-OBJS	= mdocml.o html.o xml.o libmdocml.o roff.o ml.o mlg.o compat.o tokens.o
+OBJS	= macro.o mdoc.o mdocml.o hash.o strings.o
 
-SRCS	= mdocml.c html.c xml.c libmdocml.c roff.c ml.c mlg.c compat.c tokens.c
+SRCS	= macro.c mdoc.c mdocml.c hash.c strings.c
 
-HEADS	= libmdocml.h private.h ml.h roff.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 test.22 test.24 test.26 test.27 test.30 \
-	  test.36 test.37 test.40
+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 test.23 \
-	  test.25 test.28 test.29 test.31 test.32 test.33 test.34 \
-	  test.35 test.38 test.39 test.41
+mdocml:	mdocml.o libmdoc.a
+	$(CC) $(CFLAGS) -o $@ mdocml.o libmdoc.a
 
-
-all: mdocml
-
-lint: llib-lmdocml.ln
-
-dist: mdocml.tgz
-
-regress: mdocml
-	@for f in $(FAIL); do \
-		echo "./mdocml $$f" ; \
-		./mdocml $$f 1>/dev/null 2>/dev/null || continue ; \
-	done
-	@for f in $(SUCCEED); do \
-		echo "./mdocml $$f" ; \
-		./mdocml $$f 1>/dev/null || exit 1 ; \
-	done
-
-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
+	$(LINT) $(LINTFLAGS) -Clibmdoc mdoc.ln macro.ln hash.ln strings.ln
 
-llib-lmdocml.ln: mdocml.ln libmdocml.ln html.ln xml.ln roff.ln ml.ln mlg.ln compat.ln tokens.ln
-	$(LINT) $(LINTFLAGS) -Cmdocml mdocml.ln libmdocml.ln html.ln xml.ln roff.ln ml.ln mlg.ln compat.ln tokens.ln
+llib-lmdocml.ln: mdocml.ln llib-llibmdoc.ln
+	$(LINT) $(LINTFLAGS) -Cmdocml mdocml.ln llib-llibmdoc.ln
 
-mdocml.ln: mdocml.c libmdocml.h
+macro.ln: macro.c private.h
 
-mdocml.o: mdocml.c libmdocml.h
+macro.o: macro.c private.h
 
-libmdocml.a: libmdocml.o html.o xml.o roff.o ml.o mlg.o compat.o tokens.o
-	$(AR) rs $@ libmdocml.o html.o xml.o roff.o ml.o mlg.o compat.o tokens.o
+strings.ln: strings.c private.h
 
-xml.ln: xml.c private.h libmdocml.h ml.h
+strings.o: strings.c private.h
 
-xml.o: xml.c private.h libmdocml.h ml.h
+hash.ln: hash.c private.h
 
-html.ln: html.c private.h libmdocml.h
+hash.o: hash.c private.h
 
-html.o: html.c private.h libmdocml.h
+mdoc.ln: mdoc.c private.h
 
-roff.ln: roff.c private.h roff.h libmdocml.h
+mdoc.o: mdoc.c private.h
 
-roff.o: roff.c private.h roff.h libmdocml.h
+mdocml.ln: mdocml.c mdoc.h
 
-libmdocml.ln: libmdocml.c private.h libmdocml.h
+mdocml.o: mdocml.c mdoc.h
 
-libmdocml.o: libmdocml.c private.h libmdocml.h
+private.h: mdoc.h
 
-ml.ln: ml.c private.h libmdocml.h ml.h
+libmdoc.a: macro.o mdoc.o hash.o strings.o
+	$(AR) rs $@ macro.o mdoc.o hash.o strings.o
 
-ml.o: ml.c private.h libmdocml.h ml.h
-
-mlg.ln: mlg.c private.h libmdocml.h ml.h
-
-mlg.o: mlg.c private.h libmdocml.h ml.h
-
-compat.ln: compat.c
-
-compat.o: compat.c