[svn-commits] tzafrir: branch 1.2 r2903 - /branches/1.2/Makefile

[SVN commits to the Digium repositories]

Author: tzafrir
Date: Sat Aug 18 15:21:10 2007
New Revision: 2903

URL: http://svn.digium.com/view/zaptel?view=rev&rev=2903
Log:
* 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).

Modified:
    branches/1.2/Makefile

Modified: branches/1.2/Makefile
URL: http://svn.digium.com/view/zaptel/branches/1.2/Makefile?view=diff&rev=2903&r1=2902&r2=2903
==============================================================================
--- branches/1.2/Makefile (original)
+++ branches/1.2/Makefile Sat Aug 18 15:21:10 2007
@@ -205,17 +205,17 @@
 # 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)
-
-all: programs modules libs
-
-programs: $(BINS)
+endif
+MAN_PAGES		= $(wildcard $(BINS:%=doc/%.8))
+
+all: programs modules
+
+programs: utils libs
+
+utils: $(BINS)
 
 libs: $(LIBTONEZONE_SO)
 
@@ -361,8 +361,8 @@
 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 @@
 	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-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 @@
 	/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 @@
 	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: