[svn-commits] kpfleming: branch group/new_octasic_build r1356 - in /team/group/new_octasic_...

[svn-commits at lists.digium.com]

Author: kpfleming
Date: Sat Aug 26 20:30:28 2006
New Revision: 1356

URL: http://svn.digium.com/view/zaptel?rev=1356&view=rev
Log:
remove unused rules from top-level Makefile
support older 2.6 Kbuild systems
add some dependencies for wct4xxp modules

Added:
    team/group/new_octasic_build/wct4xxp/Makefile   (with props)
Modified:
    team/group/new_octasic_build/Makefile
    team/group/new_octasic_build/wct4xxp/Kbuild

Modified: team/group/new_octasic_build/Makefile
URL: http://svn.digium.com/view/zaptel/team/group/new_octasic_build/Makefile?rev=1356&r1=1355&r2=1356&view=diff
==============================================================================
--- team/group/new_octasic_build/Makefile (original)
+++ team/group/new_octasic_build/Makefile Sat Aug 26 20:30:28 2006
@@ -173,14 +173,8 @@
 
 ztdummy.o: ztdummy.h
 
-$(filter-out wct4xxp.o,$(MODULESO)) wct4xxp_base.o: %.o: %.c zaptel.h
+$(MODULESO): %.o: %.c zaptel.h
 	$(CC) $(KFLAGS) -o $@ -c $<
-
-vpm450m.o: vpm450m.c zaptel.h
-	$(CC) $(KFLAGS) -I$(PWD)/include -I$(PWD)/include/oct6100api -I$(SUBDIRS)/include -I$(SUBDIRS)/include/oct6100api -o $@ -c $<
-
-wct4xxp.o: wct4xxp_base.o vpm450m.o
-	$(LD) -r -o $@ wct4xxp_base.o vpm450m.o
 
 tor2ee.o: tor2-hw.h
 
@@ -207,11 +201,6 @@
 
 gendigits: gendigits.o
 	$(CC) -o $@ $^ -lm
-
-fw2h: CFLAGS=
-
-#vpm450m_fw.h: OCT6114-128D.ima fw2h
-#	./fw2h $< $@
 
 zaptel.c: tones.h 
 
@@ -426,6 +415,5 @@
 	rm -f fxotune
 	rm -f core
 	rm -f ztcfg-shared fxstest
-	rm -f fw2h vpm450m_fw.h
 
 FORCE:

Modified: team/group/new_octasic_build/wct4xxp/Kbuild
URL: http://svn.digium.com/view/zaptel/team/group/new_octasic_build/wct4xxp/Kbuild?rev=1356&r1=1355&r2=1356&view=diff
==============================================================================
--- team/group/new_octasic_build/wct4xxp/Kbuild (original)
+++ team/group/new_octasic_build/wct4xxp/Kbuild Sat Aug 26 20:30:28 2006
@@ -1,3 +1,6 @@
+# yes, this is redundant... the Kbuild system is changing to hostprogs-y,
+# but we need to be able to support older verions as well
+host-progs := fw2h
 hostprogs-y := fw2h
 
 obj-m += wct4xxp.o
@@ -6,7 +9,11 @@
 
 wct4xxp-objs := base.o vpm450m.o $(shell $(src)/../oct612x/octasic-helper objects ../oct612x)
 
-$(obj)/vpm450m.o: $(obj)/vpm450m_fw.h
+$(obj)/base.o: $(src)/vpm450m.h $(src)/wct4xxp.h
+$(obj)/base.o: $(src)/../zaptel.h
+
+$(obj)/vpm450m.o: $(obj)/vpm450m_fw.h $(src)/vpm450m.h
+$(obj)/vpm450m.o: $(src)/../oct612x/include/oct6100api/oct6100_api.h
 
 $(obj)/vpm450m_fw.h: $(src)/OCT6114-128D.ima $(obj)/fw2h
 	$(obj)/fw2h $< $@

Added: team/group/new_octasic_build/wct4xxp/Makefile
URL: http://svn.digium.com/view/zaptel/team/group/new_octasic_build/wct4xxp/Makefile?rev=1356&view=auto
==============================================================================
--- team/group/new_octasic_build/wct4xxp/Makefile (added)
+++ team/group/new_octasic_build/wct4xxp/Makefile Sat Aug 26 20:30:28 2006
@@ -1,0 +1,5 @@
+ifneq ($(KBUILD_EXTMOD),)
+include $(obj)/Kbuild
+else
+# kernel 2.4 rules go here
+endif

Propchange: team/group/new_octasic_build/wct4xxp/Makefile
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: team/group/new_octasic_build/wct4xxp/Makefile
------------------------------------------------------------------------------
    svn:keywords = Author Id Date Revision

Propchange: team/group/new_octasic_build/wct4xxp/Makefile
------------------------------------------------------------------------------
    svn:mime-type = text/plain