[svn-commits] branch 1.2 r1017 - /branches/1.2/Makefile

[svn-commits at lists.digium.com]

Author: kpfleming
Date: Sun Apr 30 11:24:47 2006
New Revision: 1017

URL: http://svn.digium.com/view/zaptel?rev=1017&view=rev
Log:
build xpp by default, now that the Makefile can determine when an appropriate kernel version is being used for the build

Modified:
    branches/1.2/Makefile

Modified: branches/1.2/Makefile
URL: http://svn.digium.com/view/zaptel/branches/1.2/Makefile?rev=1017&r1=1016&r2=1017&view=diff
==============================================================================
--- branches/1.2/Makefile (original)
+++ branches/1.2/Makefile Sun Apr 30 11:24:47 2006
@@ -138,10 +138,15 @@
 
 MOD_DESTDIR:=zaptel
 
-obj-m:=$(MODULESO) ${XPPMOD}
-
-ifneq ($(filter xpp,${MAKECMDGOALS}),)
-XPPMOD=xpp/
+obj-m:=$(MODULESO)
+
+# Also build xpp in the subdirectory xpp/ . But only for >=2.6.10 and only 
+# for i386. On other archs the module will probably build but panic.
+# This line is only meaningful when this Makefile is used as kconfig for 
+# 2.6 build
+
+ifneq (,$(shell [ 0$(SUBLEVEL) -ge 10 ] && [ "$(ARCH)" = 'i386' ] && echo 1))
+obj-m+=xpp/
 endif
 
 ifneq (,$(wildcard /usr/include/newt.h))
@@ -161,7 +166,7 @@
 linux26: prereq $(BINS)
 	@echo $(KSRC)
 	@if [ -z "$(KSRC)" -o ! -d "$(KSRC)" ]; then echo "You do not appear to have the sources for the $(KVERS) kernel installed."; exit 1 ; fi
-	$(KMAKE) XPPMOD=$(XPPMOD) modules
+	$(KMAKE) modules
 
 obj-m += $(MODULESO)