===================================================================
RCS file: /cvs/mandoc/Makefile,v
retrieving revision 1.75
retrieving revision 1.79
diff -u -p -r1.75 -r1.79
--- mandoc/Makefile	2009/02/21 21:00:06	1.75
+++ mandoc/Makefile	2009/02/23 15:19:47	1.79
@@ -1,3 +1,5 @@
+.SUFFIXES:	.html .sgml
+
 VERSION	= 1.3.0
 
 CFLAGS += -W -Wall -Wstrict-prototypes -Wno-unused-parameter -g 
@@ -5,10 +7,12 @@ CFLAGS += -W -Wall -Wstrict-prototypes -Wno-unused-par
 LIBLNS	= macro.ln mdoc.ln hash.ln strings.ln xstd.ln argv.ln \
 	  validate.ln action.ln 
 
-TREELNS	= mdoctree.ln tree.ln 
+TREELNS	= mdoctree.ln mmain.ln 
 
-TERMLNS	= mdoctree.ln term.ln termact.ln
+TERMLNS	= mdoctree.ln mmain.ln term.ln
 
+LINTLNS	= mdoclint.ln mmain.ln
+
 LNS	= $(LIBLNS) $(TREELNS) $(TERMLNS)
 
 LLNS	= llib-llibmdoc.ln llib-lmdoctree.ln llib-lmdocterm.ln
@@ -18,24 +22,33 @@ LIBS	= libmdoc.a
 LIBOBJS	= macro.o mdoc.o hash.o strings.o xstd.o argv.o \
 	  validate.o action.o
 
-TERMOBJS= mdocterm.o term.o termact.o
+TERMOBJS= mdocterm.o mmain.o term.o
 
-TREEOBJS= mdoctree.o tree.o 
+TREEOBJS= mdoctree.o mmain.o
 
+LINTOBJS= mdoclint.o mmain.o
+
 OBJS	= $(LIBOBJS) $(TERMOBJS) $(TREEOBJS)
 
 SRCS	= macro.c mdoc.c hash.c strings.c xstd.c argv.c validate.c \
-	  action.c term.c tree.c termact.c mdoctree.c mdocterm.c
+	  action.c term.c mdoctree.c mdocterm.c mmain.c mdoclint.c
 
-HEADS	= mdoc.h private.h term.h
+HEADS	= mdoc.h private.h term.h mmain.h
 
+SGMLS	= index.sgml
+
+HTMLS	= index.html
+
+STATICS	= style.css external.png
+
 MANS	= mdoctree.1 mdocterm.1 mdoc.3
 
-BINS	= mdocterm mdoctree
+BINS	= mdocterm mdoctree mdoclint
 
-CLEAN	= $(BINS) $(LNS) $(LLNS) $(LIBS) $(OBJS)
+CLEAN	= $(BINS) $(LNS) $(LLNS) $(LIBS) $(OBJS) $(HTMLS)
 
-INSTALL	= $(SRCS) $(HEADS) Makefile Makefile.port DESCR $(MANS)
+INSTALL	= $(SRCS) $(HEADS) Makefile Makefile.port DESCR $(MANS) \
+	  $(SGMLS) $(STATICS)
 
 FAIL	= regress/test.empty \
 	  regress/test.prologue.00 \
@@ -64,10 +77,7 @@ FAIL	= regress/test.empty \
 	  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
+	  regress/test.sh.03
 
 SUCCEED	= regress/test.prologue.05 \
 	  regress/test.prologue.07 \
@@ -81,6 +91,9 @@ SUCCEED	= regress/test.prologue.05 \
 	  regress/test.prologue.20 \
 	  regress/test.sh.00 \
 	  regress/test.name.00 \
+	  regress/test.name.01 \
+	  regress/test.name.02 \
+	  regress/test.name.03 \
 	  regress/test.list.00 \
 	  regress/test.list.01 \
 	  regress/test.list.02 \
@@ -100,13 +113,15 @@ dist:	mdocml-$(VERSION).tar.gz
 
 port:	mdocml-oport-$(VERSION).tar.gz
 
-regress:: mdocml
+www:	$(HTMLS)
+
+regress:: mdoclint
 	@for f in $(FAIL); do \
-		echo "./mdocml $$f" ; \
-		./mdocml $$f 2>/dev/null || continue ; exit 1 ; done
+		echo "./mdoclint $$f" ; \
+		./mdoclint $$f 2>/dev/null || continue ; exit 1 ; done
 	@for f in $(SUCCEED); do \
-		echo "./mdocml $$f" ; \
-		./mdocml $$f 2>/dev/null || exit 1 ; done
+		echo "./mdoclint $$f" ; \
+		./mdoclint $$f 2>/dev/null || exit 1 ; done
 
 install:
 	mkdir -p $(PREFIX)/bin/
@@ -137,59 +152,50 @@ uninstall:
 	rm -f $(PREFIX)/include/mdoc.h
 
 macro.ln: macro.c private.h
-
 macro.o: macro.c private.h
 
-tree.ln: tree.c mdoc.h
-
-tree.o: tree.c mdoc.h
-
 term.ln: term.c term.h 
-
 term.o: term.c term.h
 
-termact.ln: termact.c term.h 
-
-termact.o: termact.c term.h
-
 strings.ln: strings.c private.h
-
 strings.o: strings.c private.h
 
 hash.ln: hash.c private.h
-
 hash.o: hash.c private.h
 
 mdoc.ln: mdoc.c private.h
-
 mdoc.o: mdoc.c private.h
 
-mdocterm.ln: mdocterm.c term.h
+mdocterm.ln: mdocterm.c mmain.h
+mdocterm.o: mdocterm.c mmain.h
 
-mdocterm.o: mdocterm.c term.h
+mdoclint.ln: mdoclint.c mmain.h
+mdoclint.o: mdoclint.c mmain.h
 
-mdoctree.ln: mdoctree.c mdoc.h
+mdoctree.ln: mdoctree.c mmain.h
+mdoctree.o: mdoctree.c mmain.h
 
-mdoctree.o: mdoctree.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
 
+mmain.ln: mmain.c mmain.h
+mmain.o: mmain.c mmain.h
+
 private.h: mdoc.h
 
+mmain.h: mdoc.h
+
+term.h: mdoc.h
+
 mdocml-oport-$(VERSION).tar.gz: Makefile.port DESCR
 	mkdir -p .dist/mdocml/pkg
 	sed -e "s!@VERSION@!$(VERSION)!" Makefile.port > .dist/mdocml/Makefile
@@ -197,13 +203,15 @@ mdocml-oport-$(VERSION).tar.gz: Makefile.port DESCR
 	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.75 2009/02/21 21:00:06 kristaps Exp $$ > .dist/mdocml/pkg/PLIST
+	echo @comment $$OpenBSD: Makefile,v 1.79 2009/02/23 15:19:47 kristaps Exp $$ > .dist/mdocml/pkg/PLIST
 	echo bin/mdocterm >> .dist/mdocml/pkg/PLIST
 	echo bin/mdoctree >> .dist/mdocml/pkg/PLIST
+	echo bin/mdoclint >> .dist/mdocml/pkg/PLIST
 	echo lib/libmdoc.a >> .dist/mdocml/pkg/PLIST
 	echo include/mdoc.h >> .dist/mdocml/pkg/PLIST
 	echo @man man/man1/mdoctree.1 >> .dist/mdocml/pkg/PLIST
 	echo @man man/man1/mdocterm.1 >> .dist/mdocml/pkg/PLIST
+	echo @man man/man1/mdoclint.1 >> .dist/mdocml/pkg/PLIST
 	echo @man man/man3/mdoc.3 >> .dist/mdocml/pkg/PLIST
 	( cd .dist/ && tar zcf ../$@ mdocml/ )
 	rm -rf .dist/
@@ -232,3 +240,9 @@ mdocterm: $(TERMOBJS) libmdoc.a
 mdoctree: $(TREEOBJS) libmdoc.a
 	$(CC) $(CFLAGS) -o $@ $(TREEOBJS) libmdoc.a 
 
+mdoclint: $(LINTOBJS) libmdoc.a
+	$(CC) $(CFLAGS) -o $@ $(LINTOBJS) libmdoc.a 
+
+.sgml.html:
+	validate $<
+	cp -f $< $@