[zaptel-commits] tzafrir: branch tzafrir/makefile r1434 - /team/tzafrir/makefile/Makefile

[zaptel-commits at lists.digium.com]

Author: tzafrir
Date: Fri Sep  8 07:05:28 2006
New Revision: 1434

URL: http://svn.digium.com/view/zaptel?rev=1434&view=rev
Log:
One simple source for the list of modules to build: MOD_LIST
* A simple name: a module in the current directory
* A name that ends with '/': a subdirectory. So far only 
  works for kernel 2.6

Modified:
    team/tzafrir/makefile/Makefile

Modified: team/tzafrir/makefile/Makefile
URL: http://svn.digium.com/view/zaptel/team/tzafrir/makefile/Makefile?rev=1434&r1=1433&r2=1434&view=diff
==============================================================================
--- team/tzafrir/makefile/Makefile (original)
+++ team/tzafrir/makefile/Makefile Fri Sep  8 07:05:28 2006
@@ -132,11 +132,15 @@
 LTZ_SO_MAJOR_VER:=1
 LTZ_SO_MINOR_VER:=0
 
-ifeq ($(findstring xpp_usb,$(MENUSELECT_MODULES)),)
-  BUILD_XPP:=yes
-endif
-MODULES:=pciradio tor2 torisa wcfxo wct1xxp wctdm wctdm24xxp wcte11xp wcusb zaptel ztd-eth ztd-loc ztdummy ztdynamic zttranscode
-MODULES:=$(filter-out $(MENUSELECT_MODULES),$(MODULES))
+ifdef MENUSELECT_MODULES
+MOD_LIST:=$(MENUSELECT_MODULES)
+else
+MOD_LIST:=pciradio tor2 torisa wcfxo wct1xxp wctdm wctdm24xxp wcte11xp wcusb zaptel ztd-eth ztd-loc ztdummy ztdynamic zttranscode
+endif
+
+# to build a subdirectory, prepend a '/' to its name:
+MODULES:=$(filter-out %/,$(MOD_LIST))
+MOD_DIRS:=$(filter     %/,$(MOD_LIST))
 
 MODULESO:=$(MODULES:%=%.o)
 MODULESKO:=$(MODULES:%=%.ko)
@@ -154,10 +158,7 @@
 
 MOD_DESTDIR:=zaptel
 
-obj-m:=$(MODULESO)
-ifeq ($(findstring wct4xxp,$(MENUSELECT_MODULES)),)
-obj-m+=wct4xxp/
-endif
+obj-m+=$(MODULESO) $(MOD_DIRS)
 
 # Set this to override hotplug firmware loading and revert to classic header
 #HOTPLUG_FIRMWARE=no
@@ -170,14 +171,6 @@
 # These lines are only meaningful when this Makefile is used as kconfig for 
 # 2.6 build
 
-ifneq (,$(shell [ 0$(SUBLEVEL) -ge 10 ] && [ "$(ARCH)" = 'i386' ] && [ "x$(BUILD_XPP)" = "xyes" ] && echo 1))
-obj-m+=xpp/
-endif
-
-ifneq (,$(shell [ 0$(SUBLEVEL) -ge 10 ] && [ "$(ARCH)" = 'x86_64' ] && [ "x$(BUILD_XPP)" = "xyes" ] && echo 1))
-obj-m+=xpp/
-endif
-
 BINS:=fxotune fxstest sethdlc-new ztcfg ztdiag ztmonitor ztspeed zttest zttool
 UTILS:=$(filter-out zttool fxstest ztcfg,$(BINS))
 UTILSO:=$(UTILS:%=%.o)
@@ -192,13 +185,11 @@
 
 modules: $(BUILDVER)
 
-linux24: prereq $(MODULESO) wct4xxp/wct4xxp.o
+linux24: prereq $(MODULESO)
 
 linux26: prereq
 	@if [ -z "$(KSRC)" -o ! -d "$(KSRC)" ]; then echo "You do not appear to have the sources for the $(KVERS) kernel installed."; exit 1 ; fi
 	$(MAKE) -C $(KSRC) SUBDIRS=$(PWD) modules
-
-xpp: linux26
 
 version.h:
 	@ZAPTELVERSION="${ZAPTELVERSION}" build_tools/make_version_h > $@.tmp