===================================================================
RCS file: /cvs/mandoc/Makefile,v
retrieving revision 1.32
retrieving revision 1.40
diff -u -p -r1.32 -r1.40
--- mandoc/Makefile	2008/12/07 23:44:19	1.32
+++ mandoc/Makefile	2008/12/10 00:58:15	1.40
@@ -1,6 +1,6 @@
 .SUFFIXES:	.html .7
 
-VERSION	= 1.0.0
+VERSION	= 1.0.1
 
 # FIXME
 CFLAGS += -W -Wall -Wno-unused-parameter -g -DDEBUG
@@ -8,19 +8,19 @@ CFLAGS += -W -Wall -Wno-unused-parameter -g -DDEBUG
 LINTFLAGS += -c -e -f -u
 
 LNS	= mdocml.ln html.ln xml.ln libmdocml.ln roff.ln ml.ln mlg.ln \
-	  compat.ln tokens.ln literals.ln
+	  compat.ln tokens.ln literals.ln tags.ln
 
 LLNS	= llib-lmdocml.ln
 
 LIBS	= libmdocml.a
 
 OBJS	= mdocml.o html.o xml.o libmdocml.o roff.o ml.o mlg.o \
-	  compat.o tokens.o literals.o
+	  compat.o tokens.o literals.o tags.o
 
 SRCS	= mdocml.c html.c xml.c libmdocml.c roff.c ml.c mlg.c \
-	  compat.c tokens.c literals.c
+	  compat.c tokens.c literals.c tags.c
 
-HEADS	= libmdocml.h private.h ml.h roff.h
+HEADS	= libmdocml.h private.h ml.h roff.h html.h
 
 MANS	= mdocml.1 index.7
 
@@ -35,14 +35,16 @@ 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 test.37 test.40 test.50
+	  test.36 test.37 test.40 test.50 test.61 test.64 test.65 \
+	  test.66
 
 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 test.42 test.43 test.44 \
 	  test.45 test.46 test.47 test.48 test.49 test.51 test.52 \
-	  test.54 test.55 test.56 test.57 test.58 test.59 test.60
+	  test.54 test.55 test.56 test.57 test.58 test.59 test.60 \
+	  test.62 test.63 test.67
 
 all: mdocml
 
@@ -50,16 +52,16 @@ lint: llib-lmdocml.ln
 
 dist: mdocml.tgz
 
-www: $(HTML) $(XML)
+www: all $(HTML) $(XML)
 
 regress: mdocml
 	@for f in $(FAIL); do \
 		echo "./mdocml $$f" ; \
-		./mdocml $$f 1>/dev/null 2>/dev/null || continue ; \
+		./mdocml -v $$f 1>/dev/null 2>/dev/null || continue ; \
 	done
 	@for f in $(SUCCEED); do \
 		echo "./mdocml $$f" ; \
-		./mdocml $$f 1>/dev/null || exit 1 ; \
+		./mdocml -v $$f 1>/dev/null || exit 1 ; \
 	done
 
 mdocml: mdocml.o libmdocml.a
@@ -69,34 +71,34 @@ clean:
 	rm -f $(CLEAN)
 
 index.html: index.7 mdocml.css
-	./mdocml -W -fhtml -e -o $@ index.7
+	./mdocml -Wall -fhtml -e -o $@ index.7
 
 index.xml: index.7 mdocml.css
-	./mdocml -W -fhtml -e -o $@ index.7
+	./mdocml -Wall -o $@ index.7
 
 mdocml.html: mdocml.1 mdocml.css
-	./mdocml -W -fhtml -e -o $@ mdocml.1
+	./mdocml -Wall -fhtml -e -o $@ mdocml.1
 
 install-www: www dist
 	install -m 0644 mdocml.tgz $(PREFIX)/mdocml-$(VERSION).tgz
-	( cd $(PREFIX)/ && ln -sf mdocml-$(VERSION).tgz mdocml.tgz )
+	install -m 0644 mdocml.tgz $(PREFIX)/mdocml.tgz
 	install -m 0644 $(HTML) $(XML) $(PREFIX)/
 
 mdocml.tgz: $(INSTALL)
 	mkdir -p .dist/mdocml/mdocml-$(VERSION)/
 	install -m 0644 $(INSTALL) .dist/mdocml/mdocml-$(VERSION)/
-	( cd .dist/mdocml/ && tar zcf ../mdocml.tgz mdocml-$(VERSION)/ )
+	( cd .dist/mdocml/ && tar zcf ../../mdocml.tgz mdocml-$(VERSION)/ )
 	rm -rf .dist/
 
-llib-lmdocml.ln: mdocml.ln libmdocml.ln html.ln xml.ln roff.ln ml.ln mlg.ln compat.ln tokens.ln literals.ln
-	$(LINT) $(LINTFLAGS) -Cmdocml mdocml.ln libmdocml.ln html.ln xml.ln roff.ln ml.ln mlg.ln compat.ln tokens.ln literals.ln
+llib-lmdocml.ln: mdocml.ln libmdocml.ln html.ln xml.ln roff.ln ml.ln mlg.ln compat.ln tokens.ln literals.ln tags.ln
+	$(LINT) $(LINTFLAGS) -Cmdocml mdocml.ln libmdocml.ln html.ln xml.ln roff.ln ml.ln mlg.ln compat.ln tokens.ln literals.ln tags.ln
 
 mdocml.ln: mdocml.c libmdocml.h
 
 mdocml.o: mdocml.c libmdocml.h
 
-libmdocml.a: libmdocml.o html.o xml.o roff.o ml.o mlg.o compat.o tokens.o literals.o
-	$(AR) rs $@ libmdocml.o html.o xml.o roff.o ml.o mlg.o compat.o tokens.o literals.o
+libmdocml.a: libmdocml.o html.o xml.o roff.o ml.o mlg.o compat.o tokens.o literals.o tags.o
+	$(AR) rs $@ libmdocml.o html.o xml.o roff.o ml.o mlg.o compat.o tokens.o literals.o tags.o
 
 xml.ln: xml.c private.h libmdocml.h ml.h
 
@@ -106,6 +108,10 @@ html.ln: html.c private.h libmdocml.h
 
 html.o: html.c private.h libmdocml.h
 
+tags.ln: tags.c html.h 
+
+tags.o: tags.c html.h
+
 roff.ln: roff.c private.h roff.h libmdocml.h
 
 roff.o: roff.c private.h roff.h libmdocml.h
@@ -125,3 +131,10 @@ mlg.o: mlg.c private.h libmdocml.h ml.h
 compat.ln: compat.c
 
 compat.o: compat.c
+
+html.h: ml.h
+
+ml.h: private.h
+
+private.h: libmdocml.h
+