[zaptel-commits] tzafrir: branch 1.4 r3417 - in /branches/1.4: wct4xxp/ wctc4xxp/ wctdm24xxp/ ...

[SVN commits to the Zaptel project]

Author: tzafrir
Date: Tue Dec 11 02:43:22 2007
New Revision: 3417

URL: http://svn.digium.com/view/zaptel?view=rev&rev=3417
Log:
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.

Added:
    branches/1.4/wct4xxp/Kbuild
      - copied unchanged from r3415, branches/1.4/wct4xxp/Makefile.kernel26
    branches/1.4/wctc4xxp/Kbuild
      - copied unchanged from r3415, branches/1.4/wctc4xxp/Makefile.kernel26
    branches/1.4/wctdm24xxp/Kbuild
      - copied unchanged from r3415, branches/1.4/wctdm24xxp/Makefile.kernel26
    branches/1.4/wcte12xp/Kbuild
      - copied unchanged from r3415, branches/1.4/wcte12xp/Makefile.kernel26
Removed:
    branches/1.4/wct4xxp/Makefile.kernel26
    branches/1.4/wctc4xxp/Makefile.kernel26
    branches/1.4/wctdm24xxp/Makefile.kernel26
    branches/1.4/wcte12xp/Makefile.kernel26
Modified:
    branches/1.4/wct4xxp/Makefile
    branches/1.4/wctc4xxp/Makefile
    branches/1.4/wctdm24xxp/Makefile
    branches/1.4/wcte12xp/Makefile

Modified: branches/1.4/wct4xxp/Makefile
URL: http://svn.digium.com/view/zaptel/branches/1.4/wct4xxp/Makefile?view=diff&rev=3417&r1=3416&r2=3417
==============================================================================
--- branches/1.4/wct4xxp/Makefile (original)
+++ branches/1.4/wct4xxp/Makefile Tue Dec 11 02:43:22 2007
@@ -1,6 +1,8 @@
 ifneq ($(KBUILD_EXTMOD),)
-
-include $(obj)/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 $(obj)/Kbuild
 
 else
 

Modified: branches/1.4/wctc4xxp/Makefile
URL: http://svn.digium.com/view/zaptel/branches/1.4/wctc4xxp/Makefile?view=diff&rev=3417&r1=3416&r2=3417
==============================================================================
--- branches/1.4/wctc4xxp/Makefile (original)
+++ branches/1.4/wctc4xxp/Makefile Tue Dec 11 02:43:22 2007
@@ -1,8 +1,10 @@
 ifneq ($(KBUILD_EXTMOD),)
+# 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 $(obj)/Kbuild
 
-include $(obj)/Makefile.kernel26
-
-endif
+else
 
 tests: codec_test
 
@@ -11,3 +13,4 @@
 
 clean:
 	rm -rf codec_test
+endif

Modified: branches/1.4/wctdm24xxp/Makefile
URL: http://svn.digium.com/view/zaptel/branches/1.4/wctdm24xxp/Makefile?view=diff&rev=3417&r1=3416&r2=3417
==============================================================================
--- branches/1.4/wctdm24xxp/Makefile (original)
+++ branches/1.4/wctdm24xxp/Makefile Tue Dec 11 02:43:22 2007
@@ -1,6 +1,8 @@
 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
 

Modified: branches/1.4/wcte12xp/Makefile
URL: http://svn.digium.com/view/zaptel/branches/1.4/wcte12xp/Makefile?view=diff&rev=3417&r1=3416&r2=3417
==============================================================================
--- branches/1.4/wcte12xp/Makefile (original)
+++ branches/1.4/wcte12xp/Makefile Tue Dec 11 02:43:22 2007
@@ -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 $<