[svn-commits] tzafrir: branch 1.4 r2130 - /branches/1.4/Makefile

[svn-commits at lists.digium.com]

Author: tzafrir
Date: Thu Feb  8 12:44:23 2007
New Revision: 2130

URL: http://svn.digium.com/view/zaptel?view=rev&rev=2130
Log:
Build xpp/ for kernel >= 2.6.8, not >=2.6.9.

Modified:
    branches/1.4/Makefile

Modified: branches/1.4/Makefile
URL: http://svn.digium.com/view/zaptel/branches/1.4/Makefile?view=diff&rev=2130&r1=2129&r2=2130
==============================================================================
--- branches/1.4/Makefile (original)
+++ branches/1.4/Makefile Thu Feb  8 12:44:23 2007
@@ -165,17 +165,19 @@
 CFLAGS+=-DHOTPLUG_FIRMWARE
 endif	
 
-# Also build xpp in the subdirectory xpp/ . But only for >=2.6.9 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 9 ] && [ "$(ARCH)" = 'i386' ] && [ "x$(BUILD_XPP)" = "xyes" ] && echo 1))
+# Also build xpp in the subdirectory xpp/ . But only for >=2.6.8 and only 
+# for i386 or x86_64. On other platforms it has still not been tested well 
+# enough.
+# This does not affect kernel 2.4, because obj-m is only used for kernel 
+# 2.6's build. Note that it is only actually tested by the kernel 2.6 build 
+# system and not by the main makefile.
+ifneq (,$(shell [ 0$(SUBLEVEL) -ge 8 ] && echo 1))
+ifeq ($(ARCH),i386)
 obj-m+=xpp/
 endif
-
-ifneq (,$(shell [ 0$(SUBLEVEL) -ge 9 ] && [ "$(ARCH)" = 'x86_64' ] && [ "x$(BUILD_XPP)" = "xyes" ] && echo 1))
+ifeq ($(ARCH),x86_64)
 obj-m+=xpp/
+endif
 endif
 
 BINS:=fxotune fxstest sethdlc-new ztcfg ztdiag ztmonitor ztspeed zttest zttool