From c474e0590633eca1d8b3355106be7cfc2e1d92ef Mon Sep 17 00:00:00 2001
From: tzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb>
Date: Tue, 11 Dec 2007 08:43:22 +0000
Subject: Rename Makefile.kernel26 to Kbuild (in subdirectories alone): *
 kernel 2.6 build system >= 2.6.9 will use this directly. * Kernels
 2.6.0-2.6.8 will still use the legacy name 'Makefile'. * Also fix a typo in
 1.4/wcte12xp/Makefile (already fixed in 1.2). * 1.4/wctc4xxp/Makefile should
 not include userspace targets in the   Kbuild file - those have a different
 syntax.

git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.4@3417 5390a7c7-147a-4af0-8ec9-7488f05a26cb
---
 wcte12xp/Kbuild            | 19 +++++++++++++++++++
 wcte12xp/Makefile          |  8 +++++---
 wcte12xp/Makefile.kernel26 | 19 -------------------
 3 files changed, 24 insertions(+), 22 deletions(-)
 create mode 100644 wcte12xp/Kbuild
 delete mode 100644 wcte12xp/Makefile.kernel26

(limited to 'wcte12xp')

diff --git a/wcte12xp/Kbuild b/wcte12xp/Kbuild
new file mode 100644
index 0000000..d930149
--- /dev/null
+++ b/wcte12xp/Kbuild
@@ -0,0 +1,19 @@
+obj-m += wcte12xp.o
+
+EXTRA_CFLAGS := -I$(src)/.. -Wno-undef
+
+wcte12xp-objs := base.o vpmadt032.o GpakApi.o
+
+ifneq ($(HOTPLUG_FIRMWARE),yes)
+wcte12xp-objs += ../firmware/zaptel-fw-vpmadt032.o
+endif
+
+$(obj)/../firmware/zaptel-fw-vpmadt032.o: $(obj)/base.o
+	$(MAKE) -C $(obj)/../firmware zaptel-fw-vpmadt032.o
+
+$(obj)/base.o: $(src)/vpmadt032.h $(src)/wcte12xp.h
+$(obj)/base.o: $(src)/../zaptel.h
+
+$(obj)/vpmadt032.o: $(src)/vpmadt032.h
+
+$(obj)/GpakApi.o: $(src)/GpakApi.h
diff --git a/wcte12xp/Makefile b/wcte12xp/Makefile
index 0992833..1df324e 100644
--- a/wcte12xp/Makefile
+++ b/wcte12xp/Makefile
@@ -1,10 +1,12 @@
 ifneq ($(KBUILD_EXTMOD),)
-
-include $(src)/Makefile.kernel26
+# We only get here on kernels 2.6.0-2.6.8 .
+# For newer kernels, Kbuild will be included directly by the kernel
+# build system.
+include $(src)/Kbuild
 
 else
 
-all: wct12xp.o
+all: wcte12xp.o
 
 %.o: %.c
 	$(CC) $(KFLAGS) -o $@ -c $<
diff --git a/wcte12xp/Makefile.kernel26 b/wcte12xp/Makefile.kernel26
deleted file mode 100644
index d930149..0000000
--- a/wcte12xp/Makefile.kernel26
+++ /dev/null
@@ -1,19 +0,0 @@
-obj-m += wcte12xp.o
-
-EXTRA_CFLAGS := -I$(src)/.. -Wno-undef
-
-wcte12xp-objs := base.o vpmadt032.o GpakApi.o
-
-ifneq ($(HOTPLUG_FIRMWARE),yes)
-wcte12xp-objs += ../firmware/zaptel-fw-vpmadt032.o
-endif
-
-$(obj)/../firmware/zaptel-fw-vpmadt032.o: $(obj)/base.o
-	$(MAKE) -C $(obj)/../firmware zaptel-fw-vpmadt032.o
-
-$(obj)/base.o: $(src)/vpmadt032.h $(src)/wcte12xp.h
-$(obj)/base.o: $(src)/../zaptel.h
-
-$(obj)/vpmadt032.o: $(src)/vpmadt032.h
-
-$(obj)/GpakApi.o: $(src)/GpakApi.h
-- 
cgit v1.2.3