diff options
| author | tzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-12-11 08:43:22 +0000 |
|---|---|---|
| committer | tzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-12-11 08:43:22 +0000 |
| commit | c474e0590633eca1d8b3355106be7cfc2e1d92ef (patch) | |
| tree | 81e11b8a9fa2edce5f33320c44e2fb3f15d86b89 | |
| parent | c7936ab96a11a43bc47ce3de8ebe092419b61cd4 (diff) | |
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
| -rw-r--r-- | wct4xxp/Kbuild (renamed from wct4xxp/Makefile.kernel26) | 0 | ||||
| -rw-r--r-- | wct4xxp/Makefile | 6 | ||||
| -rw-r--r-- | wctc4xxp/Kbuild (renamed from wctc4xxp/Makefile.kernel26) | 0 | ||||
| -rw-r--r-- | wctc4xxp/Makefile | 9 | ||||
| -rw-r--r-- | wctdm24xxp/Kbuild (renamed from wctdm24xxp/Makefile.kernel26) | 0 | ||||
| -rw-r--r-- | wctdm24xxp/Makefile | 6 | ||||
| -rw-r--r-- | wcte12xp/Kbuild (renamed from wcte12xp/Makefile.kernel26) | 0 | ||||
| -rw-r--r-- | wcte12xp/Makefile | 8 |
8 files changed, 19 insertions, 10 deletions
diff --git a/wct4xxp/Makefile.kernel26 b/wct4xxp/Kbuild index 105ca73..105ca73 100644 --- a/wct4xxp/Makefile.kernel26 +++ b/wct4xxp/Kbuild diff --git a/wct4xxp/Makefile b/wct4xxp/Makefile index 37f69c4..d79e5bd 100644 --- a/wct4xxp/Makefile +++ b/wct4xxp/Makefile @@ -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 diff --git a/wctc4xxp/Makefile.kernel26 b/wctc4xxp/Kbuild index 598c025..598c025 100644 --- a/wctc4xxp/Makefile.kernel26 +++ b/wctc4xxp/Kbuild diff --git a/wctc4xxp/Makefile b/wctc4xxp/Makefile index cad6216..6840157 100644 --- a/wctc4xxp/Makefile +++ b/wctc4xxp/Makefile @@ -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 @@ codec_test: codec_test.c ../zaptel.h clean: rm -rf codec_test +endif diff --git a/wctdm24xxp/Makefile.kernel26 b/wctdm24xxp/Kbuild index eff3490..eff3490 100644 --- a/wctdm24xxp/Makefile.kernel26 +++ b/wctdm24xxp/Kbuild diff --git a/wctdm24xxp/Makefile b/wctdm24xxp/Makefile index 79a7d3c..24b1359 100644 --- a/wctdm24xxp/Makefile +++ b/wctdm24xxp/Makefile @@ -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 diff --git a/wcte12xp/Makefile.kernel26 b/wcte12xp/Kbuild index d930149..d930149 100644 --- a/wcte12xp/Makefile.kernel26 +++ b/wcte12xp/Kbuild 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 $< |