[zaptel-commits] russell: trunk r2181 - in /trunk: ./ Makefile

[zaptel-commits at lists.digium.com]

Author: russell
Date: Tue Feb 20 14:19:15 2007
New Revision: 2181

URL: http://svn.digium.com/view/zaptel?view=rev&rev=2181
Log:
Merged revisions 2180 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.4

........
r2180 | russell | 2007-02-20 14:17:46 -0600 (Tue, 20 Feb 2007) | 3 lines

Fix the check that ran the install for xpp/utils.  Also, add a target to build
them, and clean the directory in the clean target. (issue #8894, tzafrir)

........

Modified:
    trunk/   (props changed)
    trunk/Makefile

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/Makefile
URL: http://svn.digium.com/view/zaptel/trunk/Makefile?view=diff&rev=2181&r1=2180&r2=2181
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Tue Feb 20 14:19:15 2007
@@ -7,7 +7,7 @@
 
 .EXPORT_ALL_VARIABLES:
 
-.PHONY: menuselect distclean dist-clean clean version.h all _all install b410p devices programs modules linux24 linux26 xpp tests devel data stackcheck install-udev config update install-programs install-modules install-linux24 install-linux26 firmware install-include install-libs xpp-install
+.PHONY: menuselect distclean dist-clean clean version.h all _all install b410p devices programs modules linux24 linux26 xpp tests devel data stackcheck install-udev config update install-programs install-modules install-linux24 install-linux26 firmware install-include install-libs xpp-install xpp-utils
 
 PWD=$(shell pwd)
 
@@ -179,7 +179,12 @@
 
 _all: $(if $(MODULES),modules) programs $(LTZ_SO) $(LTZ_A)
 
-programs: $(BINS)
+xpp-utils:
+ifeq (yes,$(BUILD_XPP))
+	@$(MAKE) -C xpp/utils
+endif
+
+programs: $(BINS) xpp-utils
 
 modules: $(BUILDVER)
 
@@ -368,7 +373,7 @@
 	$(MAKE) -C firmware hotplug-uninstall
 
 xpp-install:
-ifneq (,$(findstring xpp,$(obj-m)))
+ifeq (yes,$(BUILD_XPP))
 	@$(MAKE) -C xpp/utils install
 endif
 
@@ -502,6 +507,7 @@
 	$(MAKE) -C datamods clean
 endif
 	$(MAKE) -C firmware clean
+	-@$(MAKE) -C xpp/utils clean
 	rm -f xpp/*.ko xpp/*.mod.c xpp/.*o.cmd
 	rm -f xpp/*.o xpp/*.mod.o
 	rm -rf .tmp_versions