[zaptel-commits] kpfleming: branch group/new_octasic_build r1357 - in /team/group/new_octasic_...

[zaptel-commits at lists.digium.com]

Author: kpfleming
Date: Sat Aug 26 20:54:38 2006
New Revision: 1357

URL: http://svn.digium.com/view/zaptel?rev=1357&view=rev
Log:
support wct4xxp builds against 2.4 kernels again

Modified:
    team/group/new_octasic_build/Makefile
    team/group/new_octasic_build/wct4xxp/Makefile

Modified: team/group/new_octasic_build/Makefile
URL: http://svn.digium.com/view/zaptel/team/group/new_octasic_build/Makefile?rev=1357&r1=1356&r2=1357&view=diff
==============================================================================
--- team/group/new_octasic_build/Makefile (original)
+++ team/group/new_octasic_build/Makefile Sat Aug 26 20:54:38 2006
@@ -137,7 +137,7 @@
 
 all: $(BUILDVER) $(LIBTONEZONE_SO)
 
-linux24: prereq vpm450m_fw.h $(MODULESO) $(BINS)
+linux24: prereq $(MODULESO) wct4xxp/wct4xxp.o $(BINS)
 
 linux26: prereq $(BINS)
 	@echo $(KSRC)
@@ -150,6 +150,9 @@
 		mv $@.tmp $@ ; \
 	fi
 	rm -f $@.tmp
+
+wct4xxp/wct4xxp.o:
+	$(MAKE) -C wct4xxp KFLAGS="$(KFLAGS) -I.." CFLAGS="$(CFLAGS) -I.."
 
 devel: tor2ee 
 
@@ -407,6 +410,8 @@
 	rm -f $(TZOBJS) $(LIBTONEZONE_SO) *.lo
 ifeq ($(BUILDVER),linux26)
 	$(MAKE) -C $(KSRC) SUBDIRS=$(PWD) clean
+else
+	$(MAKE) -C wct4xxp clean
 endif
 	rm -rf .tmp_versions
 	rm -f gendigits tones.h

Modified: team/group/new_octasic_build/wct4xxp/Makefile
URL: http://svn.digium.com/view/zaptel/team/group/new_octasic_build/wct4xxp/Makefile?rev=1357&r1=1356&r2=1357&view=diff
==============================================================================
--- team/group/new_octasic_build/wct4xxp/Makefile (original)
+++ team/group/new_octasic_build/wct4xxp/Makefile Sat Aug 26 20:54:38 2006
@@ -1,5 +1,27 @@
 ifneq ($(KBUILD_EXTMOD),)
+
 include $(obj)/Kbuild
+
 else
-# kernel 2.4 rules go here
+
+all: wct4xxp.o
+
+base.o: base.c ../zaptel.h vpm450m.h wct4xxp.h
+	$(CC) $(KFLAGS) -o $@ -c $<
+
+vpm450m.o: vpm450m.c vpm450m.h vpm450m_fw.h ../oct612x/include/oct6100api/oct6100_api.h
+	$(CC) $(KFLAGS) $(shell ../oct612x/octasic-helper cflags ../oct612x) -Wno-undef -o $@ -c $<
+
+wct4xxp.o: base.o vpm450m.o
+	$(LD) -r -o $@ $^
+
+fw2h: CFLAGS=
+
+vpm450m_fw.h: OCT6114-128D.ima fw2h
+	./fw2h $< $@
+
+clean:
+	rm -f *.o fw2h
+	rm -f vpm450m_fw.h
+
 endif