===================================================================
RCS file: /cvs/docbook2mdoc/Makefile,v
retrieving revision 1.16
retrieving revision 1.22
diff -u -p -r1.16 -r1.22
--- docbook2mdoc/Makefile	2015/03/19 10:04:32	1.16
+++ docbook2mdoc/Makefile	2019/03/29 15:55:28	1.22
@@ -3,11 +3,18 @@ CFLAGS += -g -W -Wall -Wstrict-prototypes -Wno-unused-
 WWWPREFIX = /usr/vhosts/mdocml.bsd.lv/www/htdocs/docbook2mdoc
 PREFIX = /usr/local
 
+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
+
 all: docbook2mdoc
 
-docbook2mdoc: docbook2mdoc.o rules.o
-	$(CC) -o $@ docbook2mdoc.o rules.o -lexpat
+docbook2mdoc: $(OBJS)
+	$(CC) -o $@ $(OBJS)
 
+statistics: statistics.o
+	$(CC) -o $@ statistics.c
+
 www: index.html docbook2mdoc.1.html docbook2mdoc-$(VERSION).tgz README.txt
 
 install: all
@@ -26,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 >$@
@@ -42,6 +54,8 @@ README.txt: README
 	cp README $@
 
 clean:
-	rm -f docbook2mdoc docbook2mdoc.o rules.o
+	rm -f docbook2mdoc $(OBJS) docbook2mdoc.core
+	rm -f statistics statistics.o
 	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