[zaptel-commits] tzafrir: branch 1.2 r3812 - /branches/1.2/Makefile

[SVN commits to the Zaptel project]

Author: tzafrir
Date: Wed Feb  6 16:42:23 2008
New Revision: 3812

URL: http://svn.digium.com/view/zaptel?view=rev&rev=3812
Log:
Change include of Makefile.kernel26  to Kbuild, and place it in the
right location. Fixes building for kernels 2.6.0 - 2.6.9 .

M    1.2/Makefile

Modified:
    branches/1.2/Makefile

Modified: branches/1.2/Makefile
URL: http://svn.digium.com/view/zaptel/branches/1.2/Makefile?view=diff&rev=3812&r1=3811&r2=3812
==============================================================================
--- branches/1.2/Makefile (original)
+++ branches/1.2/Makefile Wed Feb  6 16:42:23 2008
@@ -4,6 +4,16 @@
 # Copyright (C) 2001-2007 Digium, Inc.
 #
 #
+
+ifneq ($(KBUILD_EXTMOD),)
+
+# We only get here if this is kernel 2.6.0 - 2.6.9 and we're building
+# modules. In this case, just use Kbuild, like newer kernels do
+# automatically.
+include $(src)/Kbuild
+
+else
+# This is a build of either userspace stuff or kernel 2.4 stuff.
 
 CFLAGS+=-DSTANDALONE_ZAPATA -DBUILDING_TONEZONE
 
@@ -96,16 +106,6 @@
 endif
 
 MOD_DESTDIR:=zaptel
-
-#NOTE NOTE NOTE
-#
-# all variables set before the include of Makefile.kernel26 are needed by the 2.6 kernel module build process
-
-ifneq ($(KBUILD_EXTMOD),)
-
-include $(src)/Makefile.kernel26
-
-else
 
 HOSTCC=gcc
 
@@ -571,5 +571,6 @@
 
 FORCE:
 
-endif
-
+# end of: ifneq ($(KBUILD_EXTMOD),)
+endif
+