[zaptel-commits] tzafrir: branch tzafrir/kernelmove_14 r3246 - /team/tzafrir/kernelmove_14/

[SVN commits to the Zaptel project]

Author: tzafrir
Date: Sat Nov 24 16:49:41 2007
New Revision: 3246

URL: http://svn.digium.com/view/zaptel?view=rev&rev=3246
Log:
* Fix USB modules filtering.
* Do install xpp. 
* Test not exporting variables.

Modified:
    team/tzafrir/kernelmove_14/Makefile

Modified: team/tzafrir/kernelmove_14/Makefile
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove_14/Makefile?view=diff&rev=3246&r1=3245&r2=3246
==============================================================================
--- team/tzafrir/kernelmove_14/Makefile (original)
+++ team/tzafrir/kernelmove_14/Makefile Sat Nov 24 16:49:41 2007
@@ -88,7 +88,7 @@
 
 # remove modules that require features we don't support.
 # FIXME: even more hard0wiring in the makefile.
-ifneq (,$(filter m y,$(CONFIG_USB)))
+ifeq (,$(filter m y,$(CONFIG_USB)))
   # We have no USB support: 
   NOSUPPORTED_MODULES	+= wcusb
   NOSUPPORTED_DIRS	+= xpp
@@ -130,7 +130,8 @@
 #
 
 KMAKE		:= $(MAKE) -C $(KSRC) SUBDIRS=$(PWD)/kernel \
-		   MODULES="$(MODULES)" ZAP_SUBDIRS="$(ZAP_SUBDIRS)"
+		   MODULES="$(MODULES)" ZAP_SUBDIRS="$(ZAP_SUBDIRS)" \
+		   HOTPLUG_FIRMWARE=$(HOTPLUG_FIRMWARE)
 KMAKE_INST = $(KMAKE) \
   INSTALL_MOD_PATH=$(INSTALL_PREFIX) INSTALL_MOD_DIR=misc modules_install
 
@@ -322,7 +323,7 @@
 install: all install-programs install-modules devices
 
 # FIXME: install kernel/xpp/utils. Or generally utils subdirectories?
-install-programs: $(BINS_INSTALL) $(LTZ_A) $(LTZ_SO) firmware
+install-programs: $(BINS_INSTALL) $(LTZ_A) $(LTZ_SO) firmware install-xpp
 ifeq ($(HOTPLUG_FIRMWARE),yes)
 	$(MAKE) -C firmware hotplug-install
 endif
@@ -429,7 +430,7 @@
 	@echo "optimal value for the variable MODULES ."
 	@echo ""
 	@echo "I think that the zaptel hardware you have on your system is:"
-	@xpp/utils/zaptel_hardware || true
+	@kernel/xpp/utils/zaptel_hardware || true
 
 
 update:
@@ -500,7 +501,7 @@
 	@echo "Generating input for menuselect ..."
 	@build_tools/make_tree > $@
 
-.EXPORT_ALL_VARIABLES:
+#.EXPORT_ALL_VARIABLES:
 
 .PHONY: menuselect distclean dist-clean clean all install devices programs modules tests devel data stackcheck install-udev config update install-programs install-modules install-include install-libs install-xpp xpp-utils uninstall-modules