[zaptel-commits] tzafrir: branch tzafrir/move r3763 - in /team/tzafrir/move: ./ kernel/wct4xxp...

[SVN commits to the Zaptel project]

Author: tzafrir
Date: Tue Jan 29 14:56:28 2008
New Revision: 3763

URL: http://svn.digium.com/view/zaptel?view=rev&rev=3763
Log:
* Fix firmwares building.
* No need for prereq at the top level.

Modified:
    team/tzafrir/move/Makefile
    team/tzafrir/move/kernel/wct4xxp/Kbuild
    team/tzafrir/move/kernel/wctc4xxp/Kbuild
    team/tzafrir/move/kernel/wctdm24xxp/Kbuild
    team/tzafrir/move/kernel/wcte12xp/Kbuild

Modified: team/tzafrir/move/Makefile
URL: http://svn.digium.com/view/zaptel/team/tzafrir/move/Makefile?view=diff&rev=3763&r1=3762&r2=3763
==============================================================================
--- team/tzafrir/move/Makefile (original)
+++ team/tzafrir/move/Makefile Tue Jan 29 14:56:28 2008
@@ -293,7 +293,7 @@
 
 utils: $(BINS) utils-subdirs
 
-modules: prereq
+modules: 
 	@if [ -z "$(KSRC)" -o ! -d "$(KSRC)" ]; then echo "You do not appear to have the sources for the $(KVERS) kernel installed."; exit 1 ; fi
 ifeq ($(BUILDVER),linux26)
 	$(KMAKE) modules

Modified: team/tzafrir/move/kernel/wct4xxp/Kbuild
URL: http://svn.digium.com/view/zaptel/team/tzafrir/move/kernel/wct4xxp/Kbuild?view=diff&rev=3763&r1=3762&r2=3763
==============================================================================
--- team/tzafrir/move/kernel/wct4xxp/Kbuild (original)
+++ team/tzafrir/move/kernel/wct4xxp/Kbuild Tue Jan 29 14:56:28 2008
@@ -1,4 +1,6 @@
 obj-m += wct4xxp.o
+
+FIRM_DIR	:= ../../firmware
 
 EXTRA_CFLAGS := -I$(src)/.. $(shell $(src)/../oct612x/octasic-helper cflags $(src)/../oct612x) -Wno-undef
 
@@ -9,14 +11,14 @@
 wct4xxp-objs := base.o vpm450m.o $(shell $(src)/../oct612x/octasic-helper objects ../oct612x)
 
 ifneq ($(HOTPLUG_FIRMWARE),yes)
-wct4xxp-objs += ../firmware/zaptel-fw-oct6114-064.o ../firmware/zaptel-fw-oct6114-128.o
+wct4xxp-objs += $(FIRM_DIR)/zaptel-fw-oct6114-064.o $(FIRM_DIR)/zaptel-fw-oct6114-128.o
 endif
 
-$(obj)/../firmware/zaptel-fw-oct6114-064.o: $(obj)/base.o
-	$(MAKE) -C $(obj)/../firmware zaptel-fw-oct6114-064.o
+$(obj)/$(FIRM_DIR)/zaptel-fw-oct6114-064.o: $(obj)/base.o
+	$(MAKE) -C $(obj)/$(FIRM_DIR) zaptel-fw-oct6114-064.o
 
-$(obj)/../firmware/zaptel-fw-oct6114-128.o: $(obj)/base.o
-	$(MAKE) -C $(obj)/../firmware zaptel-fw-oct6114-128.o
+$(obj)/$(FIRM_DIR)/zaptel-fw-oct6114-128.o: $(obj)/base.o
+	$(MAKE) -C $(obj)/$(FIRM_DIR) zaptel-fw-oct6114-128.o
 
 $(obj)/base.o: $(src)/vpm450m.h $(src)/wct4xxp.h
 $(obj)/base.o: $(src)/../zaptel.h

Modified: team/tzafrir/move/kernel/wctc4xxp/Kbuild
URL: http://svn.digium.com/view/zaptel/team/tzafrir/move/kernel/wctc4xxp/Kbuild?view=diff&rev=3763&r1=3762&r2=3763
==============================================================================
--- team/tzafrir/move/kernel/wctc4xxp/Kbuild (original)
+++ team/tzafrir/move/kernel/wctc4xxp/Kbuild Tue Jan 29 14:56:28 2008
@@ -1,4 +1,6 @@
 obj-m += wctc4xxp.o
+
+FIRM_DIR	:= ../../firmware
 
 EXTRA_CFLAGS := -I$(src)/.. -Wno-undef -DSTANDALONE_ZAPATA
 
@@ -9,10 +11,10 @@
 wctc4xxp-objs := base.o 
 
 ifneq ($(HOTPLUG_FIRMWARE),yes)
-wctc4xxp-objs += ../firmware/zaptel-fw-tc400m.o
+wctc4xxp-objs += $(FIRM_DIR)/zaptel-fw-tc400m.o
 endif
 
 $(obj)/base.o: $(src)/../zaptel.h
 
-$(obj)/../firmware/zaptel-fw-tc400m.o: $(obj)/base.o
-	$(MAKE) -C $(obj)/../firmware zaptel-fw-tc400m.o
+$(obj)/$(FIRM_DIR)/zaptel-fw-tc400m.o: $(obj)/base.o
+	$(MAKE) -C $(obj)/$(FIRM_DIR) zaptel-fw-tc400m.o

Modified: team/tzafrir/move/kernel/wctdm24xxp/Kbuild
URL: http://svn.digium.com/view/zaptel/team/tzafrir/move/kernel/wctdm24xxp/Kbuild?view=diff&rev=3763&r1=3762&r2=3763
==============================================================================
--- team/tzafrir/move/kernel/wctdm24xxp/Kbuild (original)
+++ team/tzafrir/move/kernel/wctdm24xxp/Kbuild Tue Jan 29 14:56:28 2008
@@ -1,4 +1,6 @@
 obj-m += wctdm24xxp.o
+
+FIRM_DIR	:= ../../firmware
 
 EXTRA_CFLAGS := -I$(src)/.. -Wno-undef
 
@@ -9,11 +11,11 @@
 wctdm24xxp-objs := base.o GpakCust.o GpakApi.o
 
 ifneq ($(HOTPLUG_FIRMWARE),yes)
-wctdm24xxp-objs += ../firmware/zaptel-fw-vpmadt032.o
+wctdm24xxp-objs += $(FIRM_DIR)/zaptel-fw-vpmadt032.o
 endif
 
-$(obj)/../firmware/zaptel-fw-vpmadt032.o: $(obj)/base.o
-	$(MAKE) -C $(obj)/../firmware zaptel-fw-vpmadt032.o
+$(obj)/$(FIRM_DIR)/zaptel-fw-vpmadt032.o: $(obj)/base.o
+	$(MAKE) -C $(obj)/$(FIRM_DIR) zaptel-fw-vpmadt032.o
 
 $(obj)/base.o: $(src)/GpakCust.h $(src)/wctdm24xxp.h
 $(obj)/base.o: $(src)/../zaptel.h

Modified: team/tzafrir/move/kernel/wcte12xp/Kbuild
URL: http://svn.digium.com/view/zaptel/team/tzafrir/move/kernel/wcte12xp/Kbuild?view=diff&rev=3763&r1=3762&r2=3763
==============================================================================
--- team/tzafrir/move/kernel/wcte12xp/Kbuild (original)
+++ team/tzafrir/move/kernel/wcte12xp/Kbuild Tue Jan 29 14:56:28 2008
@@ -1,4 +1,6 @@
 obj-m += wcte12xp.o
+
+FIRM_DIR	:= ../../firmware
 
 EXTRA_CFLAGS := -I$(src)/.. -Wno-undef
 
@@ -9,11 +11,11 @@
 wcte12xp-objs := base.o vpmadt032.o GpakApi.o
 
 ifneq ($(HOTPLUG_FIRMWARE),yes)
-wcte12xp-objs += ../firmware/zaptel-fw-vpmadt032.o
+wcte12xp-objs += $(FIRM_DIR)/zaptel-fw-vpmadt032.o
 endif
 
-$(obj)/../firmware/zaptel-fw-vpmadt032.o: $(obj)/base.o
-	$(MAKE) -C $(obj)/../firmware zaptel-fw-vpmadt032.o
+$(obj)/$(FIRM_DIR)/zaptel-fw-vpmadt032.o: $(obj)/base.o
+	$(MAKE) -C $(obj)/$(FIRM_DIR) zaptel-fw-vpmadt032.o
 
 $(obj)/base.o: $(src)/vpmadt032.h $(src)/wcte12xp.h
 $(obj)/base.o: $(src)/../zaptel.h