===================================================================
RCS file: /cvs/mandoc/Makefile,v
retrieving revision 1.19
retrieving revision 1.46
diff -u -p -r1.19 -r1.46
--- mandoc/Makefile	2008/12/02 13:20:24	1.19
+++ mandoc/Makefile	2008/12/10 13:41:58	1.46
@@ -1,44 +1,66 @@
-CFLAGS += -W -Wall -Wno-unused-parameter -g 
+VERSION	= 1.0.2
 
-LINTFLAGS += -c -e -f -u
+# FIXME
+CFLAGS += -W -Wall -Wno-unused-parameter -g -DDEBUG
 
-LNS	= mdocml.ln html4_strict.ln xml.ln libmdocml.ln roff.ln
+LNS	= mdocml.ln html.ln xml.ln libmdocml.ln roff.ln ml.ln mlg.ln \
+	  compat.ln tokens.ln literals.ln tags.ln
 
 LLNS	= llib-lmdocml.ln
 
 LIBS	= libmdocml.a
 
-OBJS	= mdocml.o html4_strict.o xml.o libmdocml.o roff.o
+OBJS	= mdocml.o html.o xml.o libmdocml.o roff.o ml.o mlg.o \
+	  compat.o tokens.o literals.o tags.o
 
-SRCS	= mdocml.c html4_strict.c xml.c libmdocml.c roff.c
+SRCS	= mdocml.c html.c xml.c libmdocml.c roff.c ml.c mlg.c \
+	  compat.c tokens.c literals.c tags.c
 
-HEADS	= libmdocml.h private.h
+HEADS	= libmdocml.h private.h ml.h roff.h html.h
 
-MANS	= mdocml.1
+MANS	= mdocml.1 index.7
 
-CLEAN	= mdocml mdocml.tgz $(LLNS) $(LNS) $(OBJS) $(LIBS)
+HTML	= index.html mdocml.html 
 
+XML	= index.xml
+
+TEXT	= index.txt
+
+CLEAN	= mdocml mdocml.tgz $(LLNS) $(LNS) $(OBJS) $(LIBS) $(HTML) \
+	  $(XML) $(TEXT)
+
 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.36 test.37 test.40 test.50 test.61 test.64 test.65 \
+	  test.66 test.69 test.70
 
 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.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.62 test.63 test.67 test.68 test.71 test.72 test.73
 
-
 all: mdocml
 
 lint: llib-lmdocml.ln
 
-dist: mdocml.tgz
+dist: mdocml.tgz mdocml-port.tgz
 
+www: all $(HTML) $(XML) $(TEXT)
+
 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
+	@for f in $(FAIL); do \
+		echo "./mdocml $$f" ; \
+		./mdocml -v $$f 1>/dev/null 2>/dev/null || continue ; \
+	done
+	@for f in $(SUCCEED); do \
+		echo "./mdocml $$f" ; \
+		./mdocml -v $$f 1>/dev/null || exit 1 ; \
+	done
 
 mdocml: mdocml.o libmdocml.a
 	$(CC) $(CFLAGS) -o $@ mdocml.o libmdocml.a
@@ -46,34 +68,89 @@ mdocml: mdocml.o libmdocml.a
 clean:
 	rm -f $(CLEAN)
 
+index.html: index.7 mdocml.css
+	./mdocml -Wall -fhtml -e -o $@ index.7
+
+index.xml: index.7 mdocml.css
+	./mdocml -Wall -o $@ index.7
+
+index.txt: index.7
+	cp -f index.7 index.txt
+
+mdocml.html: mdocml.1 mdocml.css
+	./mdocml -Wall -fhtml -e -o $@ mdocml.1
+
+install-www: www dist
+	install -m 0644 mdocml.tgz $(PREFIX)/mdocml-$(VERSION).tgz
+	install -m 0644 mdocml.tgz $(PREFIX)/mdocml.tgz
+	install -m 0644 mdocml-port.tgz $(PREFIX)/mdocml-port-$(VERSION).tgz
+	install -m 0644 mdocml-port.tgz $(PREFIX)/mdocml-port.tgz
+	install -m 0644 $(HTML) $(XML) $(TEXT) $(PREFIX)/
+
 mdocml.tgz: $(INSTALL)
-	mkdir -p .dist/mdocml/
-	install -m 0644 $(INSTALL) .dist/mdocml/
-	( cd .dist/ && tar zcf ../mdocml.tgz mdocml/ )
+	mkdir -p .dist/mdocml/mdocml-$(VERSION)/
+	install -m 0644 $(INSTALL) .dist/mdocml/mdocml-$(VERSION)/
+	( cd .dist/mdocml/ && tar zcf ../../$@ mdocml-$(VERSION)/ )
 	rm -rf .dist/
 
-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-port.tgz: $(INSTALL)
+	mkdir -p .dist/mdocml/pkg
+	sed -e "s!@VERSION@!$(VERSION)!" Makefile.port > .dist/mdocml/Makefile
+	md5 mdocml-$(VERSION).tgz > .dist/mdocml/distinfo
+	rmd160 mdocml-$(VERSION).tgz >> .dist/mdocml/distinfo
+	sha1 mdocml-$(VERSION).tgz >> .dist/mdocml/distinfo
+	install -m 0644 DESCR .dist/mdocml/pkg/DESCR
+	echo @comment $$OpenBSD: Makefile,v 1.46 2008/12/10 13:41:58 kristaps Exp $$ > .dist/mdocml/pkg/PLIST
+	echo bin/mdocml >> .dist/mdocml/pkg/PLIST
+	echo @man man/man1/mdocml.1 >> .dist/mdocml/pkg/PLIST
+	( cd .dist/ && tar zcf ../$@ mdocml/ )
+	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 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 html4_strict.o xml.o roff.o
-	$(AR) rs $@ libmdocml.o html4_strict.o xml.o roff.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
+xml.ln: xml.c private.h libmdocml.h ml.h
 
-xml.o: xml.c private.h libmdocml.h
+xml.o: xml.c private.h libmdocml.h ml.h
 
-html4_strict.ln: html4_strict.c private.h libmdocml.h
+html.ln: html.c private.h libmdocml.h
 
-html4_strict.o: html4_strict.c private.h libmdocml.h
+html.o: html.c private.h libmdocml.h
 
-roff.ln: roff.c private.h libmdocml.h
+tags.ln: tags.c html.h 
 
-roff.o: roff.c private.h libmdocml.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
+
 libmdocml.ln: libmdocml.c private.h libmdocml.h
 
 libmdocml.o: libmdocml.c private.h libmdocml.h
+
+ml.ln: ml.c private.h libmdocml.h ml.h
+
+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
+
+html.h: ml.h
+
+ml.h: private.h
+
+private.h: libmdocml.h
+