diff options
| author | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2008-01-25 23:59:37 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2008-01-25 23:59:37 +0000 |
| commit | 860c46060672ec32918b3ea305c2d3a795bb6ae7 (patch) | |
| tree | 9aa987489d6775df2b010af0897110be89bd4d44 /wcte12xp | |
| parent | d8e4f2d9d55628bdc758ffcdcf4321883770a721 (diff) | |
get this branch to build against 2.6.24 kernel build system (similar to r3706 from tzafrir for branch-1.4)
git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.2@3741 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'wcte12xp')
| -rw-r--r-- | wcte12xp/Kbuild (renamed from wcte12xp/Makefile.kernel26) | 4 | ||||
| -rw-r--r-- | wcte12xp/Makefile | 26 |
2 files changed, 8 insertions, 22 deletions
diff --git a/wcte12xp/Makefile.kernel26 b/wcte12xp/Kbuild index c41e8f1..15530ce 100644 --- a/wcte12xp/Makefile.kernel26 +++ b/wcte12xp/Kbuild @@ -2,6 +2,10 @@ obj-m += wcte12xp.o EXTRA_CFLAGS := -I$(src)/.. -Wno-undef +ifeq ($(HOTPLUG_FIRMWARE),yes) + EXTRA_CFLAGS += -DHOTPLUG_FIRMWARE +endif + wcte12xp-objs := base.o vpmadt032.o GpakApi.o ifneq ($(HOTPLUG_FIRMWARE),yes) diff --git a/wcte12xp/Makefile b/wcte12xp/Makefile index 026252d..442555a 100644 --- a/wcte12xp/Makefile +++ b/wcte12xp/Makefile @@ -1,22 +1,4 @@ -ifneq ($(KBUILD_EXTMOD),) - -include $(obj)/Makefile.kernel26 - -else - -all: wcte12xp.o - -%.o: %.c - $(CC) $(KFLAGS) -o $@ -c $< - -base.o: ../zaptel.h ../wct4xxp/wct4xxp.h vpmadt032.h - -vpmadt032.o: vpmadt032.h - -wcte12xp.o: base.o vpmadt032.o GpakApi.o - $(LD) -r -o $@ $^ - -clean: - rm -rf *.o - -endif +# 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 |