[svn-commits] tzafrir: branch 1.4 r3706 - in /branches/1.4: ./ wctc4xxp/

[SVN commits to the Digium repositories]

Author: tzafrir
Date: Sat Jan 19 09:50:31 2008
New Revision: 3706

URL: http://svn.digium.com/view/zaptel?view=rev&rev=3706
Log:
Some more separation of kernel build Makefile from original one. This is
a small change functionality-wise but makes it much simpler to move
things around.

It also fixes the major issue of issue #11141, with only xpp issue left
for proper kernel 2.6.24 support.

Added:
    branches/1.4/Kbuild
      - copied, changed from r3705, branches/1.4/Makefile.kernel26
Removed:
    branches/1.4/Makefile.kernel26
Modified:
    branches/1.4/Makefile
    branches/1.4/wctc4xxp/Kbuild

Change Statistics:
 0 files changed

Copied: branches/1.4/Kbuild (from r3705, branches/1.4/Makefile.kernel26)
URL: http://svn.digium.com/view/zaptel/branches/1.4/Kbuild?view=diff&rev=3706&p1=branches/1.4/Makefile.kernel26&r1=3705&p2=branches/1.4/Kbuild&r2=3706
==============================================================================
--- branches/1.4/Makefile.kernel26 (original)
+++ branches/1.4/Kbuild Sat Jan 19 09:50:31 2008
@@ -2,7 +2,9 @@
 	ECHO_CAN_CFLAGS	:= -DECHO_CAN_FROMENV -DECHO_CAN_$(ECHO_CAN_NAME)
 endif
 
-EXTRA_CFLAGS := -I$(src)
+obj-m	:= $(KBUILD_OBJ_M)
+
+EXTRA_CFLAGS := -I$(src) -DSTANDALONE_ZAPATA
 EXTRA_CFLAGS += $(ECHO_CAN_CFLAGS)
 
 # fix typo present in CentOS and RHEL 2.6.9 kernels

Modified: branches/1.4/Makefile
URL: http://svn.digium.com/view/zaptel/branches/1.4/Makefile?view=diff&rev=3706&r1=3705&r2=3706
==============================================================================
--- branches/1.4/Makefile (original)
+++ branches/1.4/Makefile Sat Jan 19 09:50:31 2008
@@ -4,6 +4,13 @@
 # Copyright (C) 2001-2007 Digium, Inc.
 #
 #
+
+ifneq ($(KBUILD_EXTMOD),)
+# We only get in here if we're from kernel 2.6 <= 2.6.8 and going through 
+# Kbuild. Later versions will include Kbuild instead of Makefile.
+include Kbuild
+
+else
 
 CFLAGS+=-DSTANDALONE_ZAPATA -DBUILDING_TONEZONE
 
@@ -127,6 +134,7 @@
 include $(src)/Makefile.kernel26
 
 else
+KBUILD_OBJ_M=$(BUILD_TOPDIR_MODULES:%=%.o) $(BUILD_SUBDIR_MODULES:%=%/)
 
 ifeq ($(BUILDVER),linux24)
   INSTALL_MODULES:=$(BUILD_TOPDIR_MODULES:%=%.o)
@@ -178,7 +186,8 @@
 
 KFLAGS+=-DSTANDALONE_ZAPATA
 CFLAGS+=-DSTANDALONE_ZAPATA
-KMAKE  = $(MAKE) -C $(KSRC) SUBDIRS=$(PWD) HOTPLUG_FIRMWARE=$(HOTPLUG_FIRMWARE)
+KMAKE  = $(MAKE) -C $(KSRC) SUBDIRS=$(PWD) \
+  HOTPLUG_FIRMWARE=$(HOTPLUG_FIRMWARE) KBUILD_OBJ_M="$(KBUILD_OBJ_M)"
 KMAKE_INST = $(KMAKE) \
   INSTALL_MOD_PATH=$(DESTDIR) INSTALL_MOD_DIR=misc modules_install
 
@@ -674,3 +683,6 @@
 .PHONY: menuselect distclean dist-clean clean version.h all _all install b410p devices programs modules tests devel data stackcheck install-udev config update install-programs install-modules install-include install-libs install-utils-subdirs utils-subdirs uninstall-modules
 
 endif
+
+#end of: ifneq ($(KBUILD_EXTMOD),)
+endif

Modified: branches/1.4/wctc4xxp/Kbuild
URL: http://svn.digium.com/view/zaptel/branches/1.4/wctc4xxp/Kbuild?view=diff&rev=3706&r1=3705&r2=3706
==============================================================================
--- branches/1.4/wctc4xxp/Kbuild (original)
+++ branches/1.4/wctc4xxp/Kbuild Sat Jan 19 09:50:31 2008
@@ -1,6 +1,6 @@
 obj-m += wctc4xxp.o
 
-EXTRA_CFLAGS := -I$(src)/.. -Wno-undef
+EXTRA_CFLAGS := -I$(src)/.. -Wno-undef -DSTANDALONE_ZAPATA
 
 wctc4xxp-objs := base.o