===================================================================
RCS file: /cvs/docbook2mdoc/Makefile,v
retrieving revision 1.16
retrieving revision 1.29
diff -u -p -r1.16 -r1.29
--- docbook2mdoc/Makefile	2015/03/19 10:04:32	1.16
+++ docbook2mdoc/Makefile	2019/04/29 11:14:08	1.29
@@ -1,15 +1,23 @@
-VERSION = 0.0.9
+VERSION = 1.0.2
 CFLAGS += -g -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings
-WWWPREFIX = /usr/vhosts/mdocml.bsd.lv/www/htdocs/docbook2mdoc
+WWWPREFIX = /var/www/vhosts/mdocml.bsd.lv/htdocs/docbook2mdoc
 PREFIX = /usr/local
 
+HEADS =	xmalloc.h node.h parse.h reorg.h macro.h format.h
+SRCS =	xmalloc.c node.c parse.c reorg.c macro.c docbook2mdoc.c tree.c main.c
+OBJS =	xmalloc.o node.o parse.o reorg.o macro.o docbook2mdoc.o tree.o main.o
+DISTFILES = Makefile NEWS docbook2mdoc.1
+
 all: docbook2mdoc
 
-docbook2mdoc: docbook2mdoc.o rules.o
-	$(CC) -o $@ docbook2mdoc.o rules.o -lexpat
+docbook2mdoc: $(OBJS)
+	$(CC) -g -o $@ $(OBJS)
 
-www: index.html docbook2mdoc.1.html docbook2mdoc-$(VERSION).tgz README.txt
+statistics: statistics.o xmalloc.o
+	$(CC) -g -o $@ statistics.o xmalloc.o
 
+www: docbook2mdoc.1.html docbook2mdoc-$(VERSION).tgz README.txt
+
 install: all
 	mkdir -p $(DESTDIR)$(PREFIX)/bin
 	mkdir -p $(DESTDIR)$(PREFIX)/man/man1
@@ -18,30 +26,39 @@ install: all
 
 installwww: www
 	mkdir -p $(WWWPREFIX)/snapshots
-	install -m 0444 index.html docbook2mdoc.1.html README.txt $(WWWPREFIX)
+	install -m 0444 docbook2mdoc.1.html README.txt NEWS $(WWWPREFIX)
 	install -m 0444 docbook2mdoc-$(VERSION).tgz $(WWWPREFIX)/snapshots
-	install -m 0444 docbook2mdoc-$(VERSION).tgz $(WWWPREFIX)/snapshots/docbook2mdoc.tgz
+	ln -f $(WWWPREFIX)/snapshots/docbook2mdoc-$(VERSION).tgz \
+	    $(WWWPREFIX)/snapshots/docbook2mdoc.tgz
 
 dist: docbook2mdoc-$(VERSION).tgz
 
 docbook2mdoc-$(VERSION).tgz:
 	mkdir -p .dist/docbook2mdoc-$(VERSION)
-	install -m 0444 docbook2mdoc.c rules.c extern.h Makefile docbook2mdoc.1 .dist/docbook2mdoc-$(VERSION)
+	install -m 0444 $(HEADS) $(SRCS) $(DISTFILES) \
+	    .dist/docbook2mdoc-$(VERSION)
 	(cd .dist && tar zcf ../$@ docbook2mdoc-$(VERSION))
 	rm -rf .dist
 
-docbook2mdoc.o rules.o: extern.h
+xmalloc.o: xmalloc.h
+node.o: xmalloc.h node.h
+parse.o: xmalloc.h node.h parse.h
+reorg.o: node.h reorg.h
+macro.o: node.h macro.h
+docbook2mdoc.o: xmalloc.h node.h macro.h format.h
+tree.o: node.h format.h
+main.o: node.h parse.h format.h
+statistics.c: xmalloc.h
 
-index.html: index.xml
-	sed "s!@VERSION@!$(VERSION)!g" index.xml >$@
-
 docbook2mdoc.1.html: docbook2mdoc.1
-	mandoc -Thtml docbook2mdoc.1 >$@
+	mandoc -T html -O style=/mandoc.css docbook2mdoc.1 >$@
 
 README.txt: README
-	cp README $@
+	cp -p README $@
 
 clean:
-	rm -f docbook2mdoc docbook2mdoc.o rules.o
+	rm -f docbook2mdoc $(OBJS) docbook2mdoc.core
+	rm -f statistics statistics.o statistics.core
 	rm -rf docbook2mdoc.dSYM
-	rm -f index.html docbook2mdoc.1.html docbook2mdoc-$(VERSION).tgz README.txt
+	rm -f index.html docbook2mdoc.1.html README.txt
+	rm -f docbook2mdoc-$(VERSION).tgz