From dc15d17073d095a33472b95365f2949687e52385 Mon Sep 17 00:00:00 2001 From: tzafrir Date: Thu, 8 Feb 2007 18:44:23 +0000 Subject: Build xpp/ for kernel >= 2.6.8, not >=2.6.9. git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.4@2130 5390a7c7-147a-4af0-8ec9-7488f05a26cb --- Makefile | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 024972f..a1942a3 100644 --- a/Makefile +++ b/Makefile @@ -165,18 +165,20 @@ ifeq ($(HOTPLUG_FIRMWARE),yes) 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 UTILS:=$(filter-out zttool fxstest ztcfg,$(BINS)) -- cgit v1.2.3