===================================================================
RCS file: /cvs/docbook2mdoc/Makefile,v
retrieving revision 1.9
retrieving revision 1.23
diff -u -p -r1.9 -r1.23
--- docbook2mdoc/Makefile	2014/03/30 18:17:21	1.9
+++ docbook2mdoc/Makefile	2019/04/03 08:36:43	1.23
@@ -1,16 +1,31 @@
-VERSION = 0.0.5
-CFLAGS += -g -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings 
-BUILT = printf.html iovec.html ls.html as.html
+VERSION = 0.0.9
+CFLAGS += -g -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings
 WWWPREFIX = /usr/vhosts/mdocml.bsd.lv/www/htdocs/docbook2mdoc
+PREFIX = /usr/local
 
-docbook2mdoc: docbook2mdoc.o rules.o
-	$(CC) -o $@ docbook2mdoc.o rules.o -lexpat
+HEADS =	node.h parse.h macro.h format.h
+SRCS =	node.c parse.c macro.c docbook2mdoc.c main.c
+OBJS =	node.o parse.o macro.o docbook2mdoc.o main.o
 
-www: index.html docbook2mdoc.1.html docbook2mdoc-$(VERSION).tgz $(BUILT)
+all: docbook2mdoc
 
+docbook2mdoc: $(OBJS)
+	$(CC) -g -o $@ $(OBJS)
+
+statistics: statistics.o
+	$(CC) -g -o $@ statistics.c
+
+www: index.html docbook2mdoc.1.html docbook2mdoc-$(VERSION).tgz README.txt
+
+install: all
+	mkdir -p $(DESTDIR)$(PREFIX)/bin
+	mkdir -p $(DESTDIR)$(PREFIX)/man/man1
+	install -m 0755 docbook2mdoc $(DESTDIR)$(PREFIX)/bin
+	install -m 0444 docbook2mdoc.1 $(DESTDIR)$(PREFIX)/man/man1
+
 installwww: www
 	mkdir -p $(WWWPREFIX)/snapshots
-	install -m 0444 index.html docbook2mdoc.1.html $(BUILT) $(WWWPREFIX)
+	install -m 0444 index.html docbook2mdoc.1.html README.txt $(WWWPREFIX)
 	install -m 0444 docbook2mdoc-$(VERSION).tgz $(WWWPREFIX)/snapshots
 	install -m 0444 docbook2mdoc-$(VERSION).tgz $(WWWPREFIX)/snapshots/docbook2mdoc.tgz
 
@@ -18,11 +33,16 @@ 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) Makefile docbook2mdoc.1 \
+	    .dist/docbook2mdoc-$(VERSION)
 	(cd .dist && tar zcf ../$@ docbook2mdoc-$(VERSION))
 	rm -rf .dist
 
-docbook2mdoc.o rules.o: extern.h
+node.o: node.h
+parse.o: node.h parse.h
+macro.o: node.h macro.h
+docbook2mdoc.o: node.h macro.h format.h
+main.o: node.h parse.h format.h
 
 index.html: index.xml
 	sed "s!@VERSION@!$(VERSION)!g" index.xml >$@
@@ -30,21 +50,12 @@ index.html: index.xml
 docbook2mdoc.1.html: docbook2mdoc.1
 	mandoc -Thtml docbook2mdoc.1 >$@
 
-printf.html:
-	./docbook2mdoc printf.xml | mandoc -Thtml > $@
+README.txt: README
+	cp README $@
 
-iovec.html:
-	./docbook2mdoc iovec.xml | mandoc -Thtml > $@
-
-ls.html:
-	./docbook2mdoc ls.xml | mandoc -Thtml > $@
-
-as.html:
-	./docbook2mdoc as.xml | mandoc -Thtml > $@
-
-$(BUILT): docbook2mdoc
-
 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 $(BUILT) index.html docbook2mdoc.1.html docbook2mdoc-$(VERSION).tgz 
+	rm -f index.html docbook2mdoc.1.html README.txt
+	rm -f docbook2mdoc-$(VERSION).tgz