Merged revisions 2111 via svnmerge from

https://origsvn.digium.com/svn/zaptel/branches/1.4

................
r2111 | kpfleming | 2007-02-07 14:36:52 -0600 (Wed, 07 Feb 2007) | 11 lines

Merged revisions 2110 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r2110 | kpfleming | 2007-02-07 14:29:22 -0600 (Wed, 07 Feb 2007) | 3 lines

build XPP on the kernels that Xorcom says are OK to build on
update workqueue usage to conform to kernel 2.6.20 API

........

................


git-svn-id: http://svn.digium.com/svn/zaptel/trunk@2112 5390a7c7-147a-4af0-8ec9-7488f05a26cb

1 files changed, 8 insertions, 21 deletions

diff --git a/Makefile b/Makefile
index 535419d..b9c4585 100644
--- a/Makefile
+++ b/Makefile
@@ -130,9 +130,6 @@ LTZ_SO_OBJS:=zonedata.lo tonezone.lo
 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))
 MODULE_ALIASES=wcfxs wctdm8xxp wct2xxp
@@ -140,10 +137,7 @@ MODULE_ALIASES=wcfxs wctdm8xxp wct2xxp
 MODULESO:=$(MODULES:%=%.o)
 MODULESKO:=$(MODULES:%=%.ko)
 ifeq ($(BUILDVER),linux26)
-MODULES_BUILD:=$(MODULESKO)
 HOTPLUG_FIRMWARE:=$(shell if grep CONFIG_FW_LOADER $(KINCLUDES)/linux/autoconf.h | grep -q undef; then echo "no"; else echo "yes"; fi)
-else
-MODULES_BUILD:=$(MODULESO)
 endif
 
 BIN_DIR:=$(INSTALL_PREFIX)/sbin
@@ -158,30 +152,23 @@ ifeq ($(findstring wct4xxp,$(MENUSELECT_MODULES)),)
 obj-m+=wct4xxp/
 MODULES+=wct4xxp
 endif
+
 ifeq ($(findstring ztcodec_dte,$(MENUSELECT_MODULES)),)
 obj-m+=ztcodec_dte/
 MODULES+=ztcodec_dte
 endif
 
+ifeq ($(findstring xpp_usb,$(MENUSELECT_MODULES)),)
+obj-m+=xpp/
+MODULES+=xpp
+endif
+
 # Set this to override hotplug firmware loading and revert to classic header
 #HOTPLUG_FIRMWARE=no
 ifeq ($(HOTPLUG_FIRMWARE),yes)
 CFLAGS+=-DHOTPLUG_FIRMWARE
 endif	
 
-# Also build xpp in the subdirectory xpp/ . But only for >=2.6.10 and only 
-# for i386 or x86_64. On other archs the module will probably build but panic.
-# 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)
@@ -494,9 +481,9 @@ install-programs: $(BINS) install-libs install-include
 	$(INSTALL) $(BINS) $(BIN_DIR)
 
 install-modules: install-$(BUILDVER)
-install-linux24: $(MODULES_BUILD)
+install-linux24: $(MODULESO)
 	$(INSTALL) -d $(MOD_DIR)
-	$(INSTALL) -m 644 $(MODULES_BUILD) $(MOD_DIR)
+	$(INSTALL) -m 644 $(MODULESO) $(MOD_DIR)
 
 install-linux26: $(MODULESKO)
 	$(KMAKE_INST)