summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authortzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb>2008-02-06 22:42:23 +0000
committertzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb>2008-02-06 22:42:23 +0000
commitab27b5dbc6ad667c501fa3b389b13c8988a9bf60 (patch)
tree9ca5169c9d0660f676f59f1a0e167c8996b624ec /Makefile
parent62e765736b515529cfa887a9c52116c3b4b49700 (diff)
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 git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.2@3812 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile21
1 files changed, 11 insertions, 10 deletions
diff --git a/Makefile b/Makefile
index 2ef3c2c..ce91922 100644
--- a/Makefile
+++ b/Makefile
@@ -5,6 +5,16 @@
#
#
+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
ifeq ($(MAKELEVEL),0)
@@ -97,16 +107,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
INSTALL_PREFIX := /usr
@@ -571,5 +571,6 @@ clean:
FORCE:
+# end of: ifneq ($(KBUILD_EXTMOD),)
endif