[svn-commits] trunk r1018 - in /trunk: ./ Makefile

[svn-commits at lists.digium.com]

Author: kpfleming
Date: Sun Apr 30 11:25:38 2006
New Revision: 1018

URL: http://svn.digium.com/view/zaptel?rev=1018&view=rev
Log:
Merged revisions 1017 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r1017 | kpfleming | 2006-04-30 11:24:47 -0500 (Sun, 30 Apr 2006) | 2 lines

build xpp by default, now that the Makefile can determine when an appropriate kernel version is being used for the build

........

Modified:
    trunk/   (props changed)
    trunk/Makefile

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.2-merged (original)
+++ branch-1.2-merged Sun Apr 30 11:25:38 2006
@@ -1,1 +1,1 @@
-/branches/1.2:1-916,918-936,938-949,958,962,970,990,1004,1011
+/branches/1.2:1-916,918-936,938-949,958,962,970,990,1004,1011,1017

Modified: trunk/Makefile
URL: http://svn.digium.com/view/zaptel/trunk/Makefile?rev=1018&r1=1017&r2=1018&view=diff
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Sun Apr 30 11:25:38 2006
@@ -165,10 +165,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))
@@ -195,7 +200,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
 
 xpp: linux26