===================================================================
RCS file: /cvs/mandoc/Makefile,v
retrieving revision 1.64
retrieving revision 1.139
diff -u -p -r1.64 -r1.139
--- mandoc/Makefile	2009/01/20 22:55:46	1.64
+++ mandoc/Makefile	2009/03/21 13:21:35	1.139
@@ -1,164 +1,176 @@
-VERSION	= 1.2.0
+.SUFFIXES:	.html .sgml
 
-CFLAGS += -W -Wall -Wno-unused-parameter -g 
+BINDIR		= $(PREFIX)/bin
+INCLUDEDIR	= $(PREFIX)/include
+LIBDIR		= $(PREFIX)/lib
+MANDIR		= $(PREFIX)/man
+INSTALL_PROGRAM	= install -m 0755
+INSTALL_DATA	= install -m 0444
+INSTALL_LIB	= install -m 0644
+INSTALL_MAN	= $(INSTALL_DATA)
 
-LIBLNS	= macro.ln mdoc.ln hash.ln strings.ln xstd.ln argv.ln \
-	  validate.ln action.ln
+VERSION	   = 1.6.6
+VDATE	   = 21 March 2009
 
-BINLNS	= tree.ln mdocml.ln
+VFLAGS     = -DVERSION=\"$(VERSION)\"
+CFLAGS    += -W -Wall -Wstrict-prototypes -Wno-unused-parameter -g 
+LINTFLAGS += $(VFLAGS)
+CFLAGS    += $(VFLAGS)
 
-LNS	= $(LIBLNS) $(BINLNS)
+LIBLNS	   = macro.ln mdoc.ln hash.ln strings.ln xstd.ln argv.ln \
+	     validate.ln action.ln lib.ln att.ln arch.ln vol.ln \
+	     msec.ln st.ln
+LIBOBJS	   = macro.o mdoc.o hash.o strings.o xstd.o argv.o validate.o \
+	     action.o lib.o att.o arch.o vol.o msec.o st.o
+LIBSRCS	   = macro.c mdoc.c hash.c strings.c xstd.c argv.c validate.c \
+	     action.c lib.c att.c arch.c vol.c msec.c st.c
 
-LLNS	= llib-llibmdoc.ln llib-lmdocml.ln
+MAINLNS	   = main.ln term.ln ascii.ln terminal.ln tree.ln compat.ln
+MAINOBJS   = main.o term.o ascii.o terminal.o tree.o compat.o
+MAINSRCS   = main.c term.c ascii.c terminal.c tree.c compat.c
 
-LIBS	= libmdoc.a
+LLNS	   = llib-llibmdoc.ln llib-lmandoc.ln
+LNS	   = $(MAINLNS) $(LIBLNS)
+LIBS	   = libmdoc.a
+OBJS	   = $(LIBOBJS) $(MAINOBJS)
+SRCS	   = $(LIBSRCS) $(MAINSRCS)
+DATAS	   = arch.in att.in lib.in msec.in st.in vol.in ascii.in
+HEADS	   = mdoc.h private.h term.h 
+SGMLS	   = index.sgml
+HTMLS	   = index.html
+STATICS	   = style.css external.png
+TARGZS	   = mdocml-$(VERSION).tar.gz \
+	     mdocml-oport-$(VERSION).tar.gz \
+	     mdocml-nport-$(VERSION).tar.gz
+MANS	   = mandoc.1 mdoc.3 mdoc.7
+BINS	   = mandoc
+CLEAN	   = $(BINS) $(LNS) $(LLNS) $(LIBS) $(OBJS) $(HTMLS) $(TARGZS) 
+INSTALL	   = $(SRCS) $(HEADS) Makefile DESCR $(MANS) $(SGMLS) \
+	     $(STATICS) Makefile.netbsd Makefile.openbsd $(DATAS)
 
-LIBOBJS	= macro.o mdoc.o hash.o strings.o xstd.o argv.o \
-	  validate.o action.o
+all:	$(BINS)
 
-BINOBJS	= tree.o mdocml.o
+lint:	$(LLNS)
 
-OBJS	= $(LIBOBJS) $(BINOBJS)
+clean:
+	rm -f $(CLEAN)
 
-SRCS	= macro.c mdoc.c mdocml.c hash.c strings.c xstd.c argv.c \
-	  validate.c action.c tree.c
+cleanlint:
+	rm -f $(LNS) $(LLNS)
 
-HEADS	= mdoc.h private.h
+dist:	mdocml-$(VERSION).tar.gz
 
-MANS	= mdocml.1 mdoc.3
+port:	mdocml-oport-$(VERSION).tar.gz mdocml-nport-$(VERSION).tar.gz
 
-BINS	= mdocml
+www:	$(HTMLS) $(TARGZS)
 
-CLEAN	= $(BINS) $(LNS) $(LLNS) $(LIBS) $(OBJS)
+installwww: www
+	install -m 0444 $(HTMLS) $(STATICS) $(PREFIX)/
+	install -m 0444 mdocml-$(VERSION).tar.gz $(PREFIX)/snapshots/
+	install -m 0444 mdocml-$(VERSION).tar.gz $(PREFIX)/snapshots/mdocml.tar.gz
+	install -m 0444 mdocml-oport-$(VERSION).tar.gz $(PREFIX)/ports-openbsd/
+	install -m 0444 mdocml-oport-$(VERSION).tar.gz $(PREFIX)/ports-openbsd/mdocml.tar.gz
+	install -m 0444 mdocml-nport-$(VERSION).tar.gz $(PREFIX)/ports-netbsd/
+	install -m 0444 mdocml-nport-$(VERSION).tar.gz $(PREFIX)/ports-netbsd/mdocml.tar.gz
 
-INSTALL	= $(SRCS) $(HEADS) Makefile Makefile.port DESCR $(MANS)
+install:
+	mkdir -p $(BINDIR)
+	mkdir -p $(MANDIR)/man1
+	mkdir -p $(MANDIR)/man7
+	$(INSTALL_PROGRAM) mandoc $(BINDIR)
+	$(INSTALL_MAN) mandoc.1 $(MANDIR)/man1
+	$(INSTALL_MAN) mdoc.7 $(MANDIR)/man7
 
-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
+uninstall:
+	rm -f $(BINDIR)/mandoc
+	rm -f $(MANDIR)/man1/mandoc.1
+	rm -f $(MANDIR)/man7/mdoc.7
 
-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
+lib.ln: lib.c lib.in private.h
+lib.o: lib.c lib.in private.h
 
-all:	$(BINS)
+att.ln: att.c att.in private.h
+att.o: att.c att.in private.h
 
-lint:	$(LLNS)
+arch.ln: arch.c arch.in private.h
+arch.o: arch.c arch.in private.h
 
-clean:
-	rm -f $(CLEAN)
+vol.ln: vol.c vol.in private.h
+vol.o: vol.c vol.in private.h
 
-dist:	mdocml-$(VERSION).tar.gz
+ascii.ln: ascii.c ascii.in term.h
+ascii.o: ascii.c ascii.in term.h
 
-port:	mdocml-oport-$(VERSION).tar.gz
+msec.ln: msec.c msec.in private.h
+msec.o: msec.c msec.in private.h
 
-regress::
-	@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
+st.ln: st.c st.in private.h
+st.o: st.c st.in private.h
 
-install:
-	mkdir -p $(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/
-	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)/man/man3/mdoc.3
-	rm -f $(PREFIX)/lib/libmdoc.a
-	rm -f $(PREFIX)/include/mdoc.h
-
 macro.ln: macro.c private.h
-
 macro.o: macro.c private.h
 
-strings.ln: strings.c private.h
+term.ln: term.c term.h 
+term.o: term.c term.h
 
+strings.ln: strings.c private.h
 strings.o: strings.c private.h
 
-tree.ln: tree.c mdoc.h
-
-tree.o: tree.c mdoc.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
 
-mdocml.ln: mdocml.c mdoc.h
+main.ln: main.c mdoc.h
+main.o: main.c mdoc.h
 
-mdocml.o: mdocml.c mdoc.h
+terminal.ln: terminal.c term.h
+terminal.o: terminal.c term.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
 
 private.h: mdoc.h
 
-mdocml-oport-$(VERSION).tar.gz: Makefile.port DESCR
+term.h: mdoc.h
+
+mdocml-nport-$(VERSION).tar.gz: mdocml-$(VERSION).tar.gz Makefile.netbsd DESCR
+	mkdir -p .dist/mdocml/
+	sed -e "s!@VERSION@!$(VERSION)!" Makefile.netbsd > \
+		.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/
+	echo @comment $$NetBSD$$ > .dist/mdocml/PLIST
+	echo bin/mandoc >> .dist/mdocml/PLIST
+	echo man/man1/mandoc.1 >> .dist/mdocml/PLIST
+	echo man/man7/mdoc.7 >> .dist/mdocml/PLIST
+	( cd .dist/ && tar zcf ../$@ mdocml/ )
+	rm -rf .dist/
+
+mdocml-oport-$(VERSION).tar.gz: mdocml-$(VERSION).tar.gz Makefile.openbsd DESCR
 	mkdir -p .dist/mdocml/pkg
-	sed -e "s!@VERSION@!$(VERSION)!" Makefile.port > .dist/mdocml/Makefile
+	sed -e "s!@VERSION@!$(VERSION)!" Makefile.openbsd > \
+		.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.64 2009/01/20 22:55:46 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
+	echo @comment $$OpenBSD: Makefile,v 1.139 2009/03/21 13:21:35 kristaps Exp $$ > .dist/mdocml/pkg/PLIST
+	echo bin/mandoc >> .dist/mdocml/pkg/PLIST
+	echo @man man/man1/mandoc.1 >> .dist/mdocml/pkg/PLIST
+	echo @man man/man7/mdoc.7 >> .dist/mdocml/pkg/PLIST
 	( cd .dist/ && tar zcf ../$@ mdocml/ )
 	rm -rf .dist/
 
@@ -171,12 +183,15 @@ mdocml-$(VERSION).tar.gz: $(INSTALL)
 llib-llibmdoc.ln: $(LIBLNS)
 	$(LINT) $(LINTFLAGS) -Clibmdoc $(LIBLNS)
 
-llib-lmdocml.ln: $(BINLNS) llib-llibmdoc.ln
-	$(LINT) $(LINTFLAGS) -Cmdocml $(BINLNS) llib-llibmdoc.ln
+llib-lmandoc.ln: $(MAINLNS) llib-llibmdoc.ln
+	$(LINT) $(LINTFLAGS) -Cmandoc $(MAINLNS) llib-llibmdoc.ln
 
 libmdoc.a: $(LIBOBJS)
 	$(AR) rs $@ $(LIBOBJS)
 
-mdocml:	$(BINOBJS) libmdoc.a
-	$(CC) $(CFLAGS) -o $@ $(BINOBJS) libmdoc.a
+mandoc: $(MAINOBJS) libmdoc.a
+	$(CC) $(CFLAGS) -o $@ $(MAINOBJS) libmdoc.a 
 
+.sgml.html:
+	validate $<
+	sed -e "s!@VERSION@!$(VERSION)!" -e "s!@VDATE@!$(VDATE)!" $< > $@