===================================================================
RCS file: /cvs/mandoc/Makefile,v
retrieving revision 1.56
retrieving revision 1.60
diff -u -p -r1.56 -r1.60
--- mandoc/Makefile	2009/01/05 14:14:04	1.56
+++ mandoc/Makefile	2009/01/20 13:44:05	1.60
@@ -2,38 +2,64 @@ VERSION	= 1.1.0
 
 CFLAGS += -W -Wall -Wno-unused-parameter -g 
 
-LNS	= macro.ln mdoc.ln mdocml.ln hash.ln strings.ln xstd.ln argv.ln validate.ln prologue.ln action.ln
+LIBLNS	= macro.ln mdoc.ln hash.ln strings.ln xstd.ln argv.ln \
+	  validate.ln action.ln
 
+BINLNS	= tree.ln mdocml.ln
+
+LNS	= $(LIBLNS) $(BINLNS)
+
 LLNS	= llib-llibmdoc.ln llib-lmdocml.ln
 
 LIBS	= libmdoc.a
 
-OBJS	= macro.o mdoc.o mdocml.o hash.o strings.o xstd.o argv.o validate.o prologue.o action.o
+LIBOBJS	= macro.o mdoc.o hash.o strings.o xstd.o argv.o \
+	  validate.o action.o
 
-SRCS	= macro.c mdoc.c mdocml.c hash.c strings.c xstd.c argv.c validate.c prologue.c action.c
+BINOBJS	= tree.o mdocml.o
 
-HEADS	= mdoc.h
+OBJS	= $(LIBOBJS) $(BINOBJS)
 
+SRCS	= macro.c mdoc.c mdocml.c hash.c strings.c xstd.c argv.c \
+	  validate.c action.c tree.c
+
+HEADS	= mdoc.h private.h
+
 BINS	= mdocml
 
 CLEAN	= $(BINS) $(LNS) $(LLNS) $(LIBS) $(OBJS)
 
+INSTALL	= $(SRCS) $(HEADS) Makefile Makefile.port DESCR
+
 all:	$(BINS)
 
 lint:	$(LLNS)
 
-mdocml:	mdocml.o libmdoc.a
-	$(CC) $(CFLAGS) -o $@ mdocml.o libmdoc.a
-
 clean:
 	rm -f $(CLEAN)
 
-llib-llibmdoc.ln: macro.ln mdoc.ln hash.ln strings.ln xstd.ln argv.ln validate.ln prologue.ln action.ln
-	$(LINT) $(LINTFLAGS) -Clibmdoc mdoc.ln macro.ln hash.ln strings.ln xstd.ln argv.ln validate.ln prologue.ln action.ln
+dist:	mdocml-$(VERSION).tar.gz
 
-llib-lmdocml.ln: mdocml.ln llib-llibmdoc.ln
-	$(LINT) $(LINTFLAGS) -Cmdocml mdocml.ln llib-llibmdoc.ln
+port:	mdocml-oport-$(VERSION).tar.gz
 
+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/
+
+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
@@ -42,6 +68,10 @@ 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
@@ -66,16 +96,43 @@ validate.ln: validate.c private.h
 
 validate.o: validate.c private.h
 
-prologue.ln: prologue.c private.h
-
-prologue.o: prologue.c private.h
-
 action.ln: action.c private.h
 
 action.o: action.c private.h
 
 private.h: mdoc.h
 
-libmdoc.a: macro.o mdoc.o hash.o strings.o xstd.o argv.o validate.o prologue.o action.o
-	$(AR) rs $@ macro.o mdoc.o hash.o strings.o xstd.o argv.o validate.o prologue.o action.o
+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.60 2009/01/20 13:44:05 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/
+
+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/
+
+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