===================================================================
RCS file: /cvs/mandoc/Makefile,v
retrieving revision 1.49
retrieving revision 1.74
diff -u -p -r1.49 -r1.74
--- mandoc/Makefile	2008/12/10 17:40:56	1.49
+++ mandoc/Makefile	2009/02/21 19:05:28	1.74
@@ -1,174 +1,214 @@
-VERSION	= 1.0.3
+VERSION	= 1.2.0
 
-# FIXME
-CFLAGS += -W -Wall -Wno-unused-parameter -g -DDEBUG
+CFLAGS += -W -Wall -Wstrict-prototypes -Wno-unused-parameter -g 
 
-LNS	= mdocml.ln html.ln xml.ln libmdocml.ln roff.ln ml.ln mlg.ln \
-	  compat.ln tokens.ln literals.ln tags.ln noop.ln
+LIBLNS	= macro.ln mdoc.ln hash.ln strings.ln xstd.ln argv.ln \
+	  validate.ln action.ln 
 
-LLNS	= llib-lmdocml.ln
+BINLNS	= mdocml.ln term.ln tree.ln termact.ln
 
-LIBS	= libmdocml.a
+LNS	= $(LIBLNS) $(BINLNS)
 
-OBJS	= mdocml.o html.o xml.o libmdocml.o roff.o ml.o mlg.o \
-	  compat.o tokens.o literals.o tags.o noop.o
+LLNS	= llib-llibmdoc.ln llib-lmdocml.ln
 
-SRCS	= mdocml.c html.c xml.c libmdocml.c roff.c ml.c mlg.c \
-	  compat.c tokens.c literals.c tags.c noop.c
+LIBS	= libmdoc.a
 
-HEADS	= libmdocml.h private.h ml.h roff.h html.h
+LIBOBJS	= macro.o mdoc.o hash.o strings.o xstd.o argv.o \
+	  validate.o action.o 
 
-MANS	= mdocml.1 index.7
+BINOBJS	= mdocml.o term.o tree.o termact.o
 
-HTML	= index.html mdocml.html 
+OBJS	= $(LIBOBJS) $(BINOBJS)
 
-XML	= index.xml
+SRCS	= macro.c mdoc.c mdocml.c hash.c strings.c xstd.c argv.c \
+	  validate.c action.c term.c tree.c termact.c
 
-TEXT	= index.txt
+HEADS	= mdoc.h private.h term.h
 
-CLEAN	= mdocml $(LLNS) $(LNS) $(OBJS) $(LIBS) $(HTML) $(XML) $(TEXT) \
-	  mdocml-$(VERSION).tar.gz mdocml-port-$(VERSION).tar.gz
+MANS	= mdocml.1 mdoc.3
 
-INSTALL	= Makefile $(HEADS) $(SRCS) $(MANS) mdocml.css
+BINS	= mdocml
 
-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.61 test.64 test.65 \
-	  test.66 test.69 test.70
+CLEAN	= $(BINS) $(LNS) $(LLNS) $(LIBS) $(OBJS)
 
-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.62 test.63 test.67 test.68 test.71 test.72 test.73
+INSTALL	= $(SRCS) $(HEADS) Makefile Makefile.port DESCR $(MANS)
 
-all: mdocml
+FAIL	= regress/test.empty \
+	  regress/test.prologue.00 \
+	  regress/test.prologue.01 \
+	  regress/test.prologue.02 \
+	  regress/test.prologue.03 \
+	  regress/test.prologue.04 \
+	  regress/test.prologue.06 \
+	  regress/test.prologue.13 \
+	  regress/test.prologue.15 \
+	  regress/test.prologue.16 \
+	  regress/test.prologue.18 \
+	  regress/test.prologue.19 \
+	  regress/test.prologue.21 \
+	  regress/test.prologue.22 \
+	  regress/test.prologue.23 \
+	  regress/test.prologue.24 \
+	  regress/test.prologue.25 \
+	  regress/test.prologue.26 \
+	  regress/test.prologue.27 \
+	  regress/test.prologue.28 \
+	  regress/test.prologue.29 \
+	  regress/test.prologue.30 \
+	  regress/test.prologue.31 \
+	  regress/test.prologue.32 \
+	  regress/test.prologue.33 \
+	  regress/test.sh.01 \
+	  regress/test.sh.02 \
+	  regress/test.sh.03 \
+	  regress/test.name.01 \
+	  regress/test.name.02 \
+	  regress/test.name.03
 
-lint: llib-lmdocml.ln
+SUCCEED	= regress/test.prologue.05 \
+	  regress/test.prologue.07 \
+	  regress/test.prologue.08 \
+	  regress/test.prologue.09 \
+	  regress/test.prologue.10 \
+	  regress/test.prologue.11 \
+	  regress/test.prologue.12 \
+	  regress/test.prologue.14 \
+	  regress/test.prologue.17 \
+	  regress/test.prologue.20 \
+	  regress/test.sh.00 \
+	  regress/test.name.00 \
+	  regress/test.list.00 \
+	  regress/test.list.01 \
+	  regress/test.list.02 \
+	  regress/test.list.03 \
+	  regress/test.list.04 \
+	  regress/test.list.05 \
+	  regress/test.list.06
 
-dist: mdocml-$(VERSION).tar.gz mdocml-port-$(VERSION).tar.gz
+all:	$(BINS)
 
-www: all $(HTML) $(XML) $(TEXT)
+lint:	$(LLNS)
 
-regress: mdocml
-	@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
-
 clean:
 	rm -f $(CLEAN)
 
-index.html: index.7 mdocml.css
-	./mdocml -fhtml -Wall -e -o $@ index.7
+dist:	mdocml-$(VERSION).tar.gz
 
-index.xml: index.7 mdocml.css
-	./mdocml -fxml -Wall -o $@ index.7
+port:	mdocml-oport-$(VERSION).tar.gz
 
-index.txt: index.7
-	cp -f index.7 index.txt
+regress:: mdocml
+	@for f in $(FAIL); do \
+		echo "./mdocml $$f" ; \
+		./mdocml $$f 2>/dev/null || continue ; exit 1 ; done
+	@for f in $(SUCCEED); do \
+		echo "./mdocml $$f" ; \
+		./mdocml $$f 2>/dev/null || exit 1 ; done
 
-mdocml.html: mdocml.1 mdocml.css
-	./mdocml -Wall -fhtml -e -o $@ mdocml.1
-
 install:
 	mkdir -p $(PREFIX)/bin/
-	install -m 0755 mdocml $(PREFIX)/bin/
+	mkdir -p $(PREFIX)/include/mdoc/
+	mkdir -p $(PREFIX)/lib/
 	mkdir -p $(PREFIX)/man/man1/
+	install -m 0755 mdocml $(PREFIX)/bin/
 	install -m 0444 mdocml.1 $(PREFIX)/man/man1/
-	mkdir -p $(PREFIX)/share/mdocml/
-	install -m 0444 mdocml.css $(PREFIX)/share/mdocml/
+	install -m 0444 mdoc.3 $(PREFIX)/man/man3/
+	install -m 0644 libmdoc.a $(PREFIX)/lib/
+	install -m 0444 mdoc.h $(PREFIX)/include/
 
+install-dist: mdocml-$(VERSION).tar.gz mdocml-oport-$(VERSION).tar.gz
+	install -m 0644 mdocml-$(VERSION).tar.gz $(PREFIX)/
+	install -m 0644 mdocml-$(VERSION).tar.gz $(PREFIX)/mdocml.tar.gz
+	install -m 0644 mdocml-oport-$(VERSION).tar.gz $(PREFIX)/
+	install -m 0644 mdocml-oport-$(VERSION).tar.gz $(PREFIX)/mdocml-oport.tar.gz
+
 uninstall:
 	rm -f $(PREFIX)/bin/mdocml
 	rm -f $(PREFIX)/man/man1/mdocml.1
-	rm -f $(PREFIX)/share/mdocml/mdocml.css
+	rm -f $(PREFIX)/man/man3/mdoc.3
+	rm -f $(PREFIX)/lib/libmdoc.a
+	rm -f $(PREFIX)/include/mdoc.h
 
-install-www: www dist
-	install -m 0644 mdocml-$(VERSION).tar.gz $(PREFIX)/
-	install -m 0644 mdocml-$(VERSION).tar.gz $(PREFIX)/mdocml.tar.gz
-	install -m 0644 mdocml-port-$(VERSION).tar.gz $(PREFIX)/
-	install -m 0644 mdocml-port-$(VERSION).tar.gz $(PREFIX)/mdocml-port.tar.gz
-	install -m 0644 $(HTML) $(XML) $(TEXT) $(PREFIX)/
+macro.ln: macro.c private.h
 
-mdocml-$(VERSION).tar.gz: $(INSTALL)
-	mkdir -p .dist/mdocml/mdocml-$(VERSION)/
-	install -m 0644 $(INSTALL) .dist/mdocml/mdocml-$(VERSION)/
-	( cd .dist/mdocml/ && tar zcf ../../$@ mdocml-$(VERSION)/ )
-	rm -rf .dist/
+macro.o: macro.c private.h
 
-mdocml-port-$(VERSION).tar.gz: $(INSTALL)
-	mkdir -p .dist/mdocml/pkg
-	sed -e "s!@VERSION@!$(VERSION)!" Makefile.port > .dist/mdocml/Makefile
-	md5 mdocml-$(VERSION).tar.gz > .dist/mdocml/distinfo
-	rmd160 mdocml-$(VERSION).tar.gz >> .dist/mdocml/distinfo
-	sha1 mdocml-$(VERSION).tar.gz >> .dist/mdocml/distinfo
-	install -m 0644 DESCR .dist/mdocml/pkg/DESCR
-	echo @comment $$OpenBSD: Makefile,v 1.49 2008/12/10 17:40:56 kristaps Exp $$ > .dist/mdocml/pkg/PLIST
-	echo bin/mdocml >> .dist/mdocml/pkg/PLIST
-	echo share/mdocml/mdocml.css >> .dist/mdocml/pkg/PLIST
-	echo @man man/man1/mdocml.1 >> .dist/mdocml/pkg/PLIST
-	( cd .dist/ && tar zcf ../$@ mdocml/ )
-	rm -rf .dist/
+tree.ln: tree.c mdoc.h
 
-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 noop.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 noop.ln
+tree.o: tree.c mdoc.h
 
-mdocml.ln: mdocml.c libmdocml.h
+term.ln: term.c term.h 
 
-mdocml.o: mdocml.c libmdocml.h
+term.o: term.c term.h
 
-libmdocml.a: libmdocml.o html.o xml.o roff.o ml.o mlg.o compat.o tokens.o literals.o tags.o noop.o
-	$(AR) rs $@ libmdocml.o html.o xml.o roff.o ml.o mlg.o compat.o tokens.o literals.o tags.o noop.o
+termact.ln: termact.c term.h 
 
-xml.ln: xml.c ml.h
+termact.o: termact.c term.h
 
-xml.o: xml.c ml.h
+strings.ln: strings.c private.h
 
-html.ln: html.c private.h
+strings.o: strings.c private.h
 
-html.o: html.c private.h 
+hash.ln: hash.c private.h
 
-tags.ln: tags.c html.h 
+hash.o: hash.c private.h
 
-tags.o: tags.c html.h
+mdoc.ln: mdoc.c private.h
 
-roff.ln: roff.c private.h
+mdoc.o: mdoc.c private.h
 
-roff.o: roff.c private.h 
+mdocml.ln: mdocml.c mdoc.h
 
-libmdocml.ln: libmdocml.c private.h
+mdocml.o: mdocml.c mdoc.h
 
-libmdocml.o: libmdocml.c private.h
+xstd.ln: xstd.c private.h
 
-ml.ln: ml.c ml.h
+xstd.o: xstd.c private.h
 
-ml.o: ml.c ml.h
+argv.ln: argv.c private.h
 
-mlg.ln: mlg.c ml.h
+argv.o: argv.c private.h
 
-mlg.o: mlg.c ml.h
+validate.ln: validate.c private.h
 
-compat.ln: compat.c
+validate.o: validate.c private.h
 
-compat.o: compat.c
+action.ln: action.c private.h
 
-noop.ln: noop.c private.h
+action.o: action.c private.h
 
-noop.o: noop.c private.h
+private.h: mdoc.h
 
-html.h: ml.h
+mdocml-oport-$(VERSION).tar.gz: Makefile.port DESCR
+	mkdir -p .dist/mdocml/pkg
+	sed -e "s!@VERSION@!$(VERSION)!" Makefile.port > .dist/mdocml/Makefile
+	md5 mdocml-$(VERSION).tar.gz > .dist/mdocml/distinfo
+	rmd160 mdocml-$(VERSION).tar.gz >> .dist/mdocml/distinfo
+	sha1 mdocml-$(VERSION).tar.gz >> .dist/mdocml/distinfo
+	install -m 0644 DESCR .dist/mdocml/pkg/DESCR
+	echo @comment $$OpenBSD: Makefile,v 1.74 2009/02/21 19:05:28 kristaps Exp $$ > .dist/mdocml/pkg/PLIST
+	echo bin/mdocml >> .dist/mdocml/pkg/PLIST
+	echo lib/libmdoc.a >> .dist/mdocml/pkg/PLIST
+	echo include/mdoc.h >> .dist/mdocml/pkg/PLIST
+	echo @man man/man1/mdocml.1 >> .dist/mdocml/pkg/PLIST
+	echo @man man/man3/mdoc.3 >> .dist/mdocml/pkg/PLIST
+	( cd .dist/ && tar zcf ../$@ mdocml/ )
+	rm -rf .dist/
 
-ml.h: private.h
+mdocml-$(VERSION).tar.gz: $(INSTALL)
+	mkdir -p .dist/mdocml/mdocml-$(VERSION)/
+	install -m 0644 $(INSTALL) .dist/mdocml/mdocml-$(VERSION)/
+	( cd .dist/mdocml/ && tar zcf ../../$@ mdocml-$(VERSION)/ )
+	rm -rf .dist/
 
-private.h: libmdocml.h
+llib-llibmdoc.ln: $(LIBLNS)
+	$(LINT) $(LINTFLAGS) -Clibmdoc $(LIBLNS)
+
+llib-lmdocml.ln: $(BINLNS) llib-llibmdoc.ln
+	$(LINT) $(LINTFLAGS) -Cmdocml $(BINLNS) llib-llibmdoc.ln
+
+libmdoc.a: $(LIBOBJS)
+	$(AR) rs $@ $(LIBOBJS)
+
+mdocml:	$(BINOBJS) libmdoc.a
+	$(CC) $(CFLAGS) -o $@ $(BINOBJS) libmdoc.a