From 33fafe4b3fb93254ad164e877e94c0f0b19bee4c Mon Sep 17 00:00:00 2001
From: tzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb>
Date: Sat, 18 Aug 2007 20:21:10 +0000
Subject: * Fix makefile targets to match documentation. * Fix dependencies of
 install-utils. * Rename the generated xpp/README.html to
 xpp/README.Astribank.html to   provide a unique basename among docs (helps
 debian packaging).

git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.2@2903 5390a7c7-147a-4af0-8ec9-7488f05a26cb
---
 Makefile | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 41791f9..2ba9193 100644
--- a/Makefile
+++ b/Makefile
@@ -205,17 +205,17 @@ SBINDIR			:= /sbin
 # where the man page sit. So they need to be manually overriden anyway.
 MANDIR			= /usr/share/man/man8
 MODS_DIR		:= /lib/modules/$(KVERS)/misc
-MAN_PAGES_BASE		= ztcfg 
 BINS=ztcfg torisatool ztmonitor ztspeed zttest fxotune
 ifneq (,$(wildcard $(INCLUDE_DIR)/newt.h))
 BINS+=zttool
-MAN_PAGES_BASE		+= zttool
 endif
-MAN_PAGES		= $(MAN_PAGES_BASE:%=doc/%.8)
+MAN_PAGES		= $(wildcard $(BINS:%=doc/%.8))
 
-all: programs modules libs
+all: programs modules
 
-programs: $(BINS)
+programs: utils libs
+
+utils: $(BINS)
 
 libs: $(LIBTONEZONE_SO)
 
@@ -361,8 +361,8 @@ stackcheck: checkstack all
 README.html: README
 	asciidoc -n -a toc $<
 
-xpp/README.html: xpp/README.Astribank
-	cd $(@D); asciidoc -n -a toc $(<F)
+xpp/README.Astribank.html: xpp/README.Astribank
+	cd $(@D); asciidoc -o $(@F) -n -a toc $(<F)
 
 devices:
 ifndef DYNFS
@@ -403,7 +403,7 @@ b410p:
 	tar -zxf mISDNuser.tar.gz
 	$(MAKE) -C mISDNuser install
 
-install: all devices install-modules install-libs firmware
+install: all devices install-modules install-programs firmware
 	@echo "###################################################"
 	@echo "###"
 	@echo "### Zaptel installed successfully."
@@ -415,7 +415,7 @@ install: all devices install-modules install-libs firmware
 
 install-programs: install-utils install-libs install-include
 
-install-utils:
+install-utils: utils
 	install -d $(DESTDIR)$(SBINDIR)
 	install -m 755 $(BINS) $(DESTDIR)$(SBINDIR)
 ifneq (,$(wildcard sethdlc-new))
@@ -472,7 +472,7 @@ ifneq (,$(SELINUX_ENABLED))
 	/sbin/restorecon -v $(DESTDIR)$(LIBDIR)/$(LIBTONEZONE_SO)
 endif
 
-install-include:
+install-include: zaptel.h torisa.h
 	install -d $(DESTDIR)$(INCLUDE_DIR)/linux
 	install -m 644 zaptel.h torisa.h $(DESTDIR)$(INCLUDE_DIR)/linux/
 
@@ -552,7 +552,7 @@ clean:
 	rm -f ztcfg-shared fxstest
 	rm -rf misdn*
 	rm -rf mISDNuser*
-	rm -rf README.html xpp/README.html
+	rm -rf README.html xpp/README.Astribank.html
 
 .EXPORT_ALL_VARIABLES:
 
-- 
cgit v1.2.3