[svn-commits] kpfleming: branch 1.2 r1363 - /branches/1.2/wct4xxp/Makefile

[svn-commits at lists.digium.com]

Author: kpfleming
Date: Sat Aug 26 21:27:23 2006
New Revision: 1363

URL: http://svn.digium.com/view/zaptel?rev=1363&view=rev
Log:
ok... finally, this actually does build correctly for 2.4 kernels

Modified:
    branches/1.2/wct4xxp/Makefile

Modified: branches/1.2/wct4xxp/Makefile
URL: http://svn.digium.com/view/zaptel/branches/1.2/wct4xxp/Makefile?rev=1363&r1=1362&r2=1363&view=diff
==============================================================================
--- branches/1.2/wct4xxp/Makefile (original)
+++ branches/1.2/wct4xxp/Makefile Sat Aug 26 21:27:23 2006
@@ -4,15 +4,19 @@
 
 else
 
+OCTASIC_OBJS:=$(shell ../oct612x/octasic-helper objects ../oct612x)
+OCTASIC_CFLAGS:=$(shell ../oct612x/octasic-helper cflags ../oct612x) -Wno-undef
+
 all: wct4xxp.o
 
-base.o: base.c ../zaptel.h vpm450m.h wct4xxp.h
-	$(CC) $(KFLAGS) -o $@ -c $<
+%.o: %.c
+	$(CC) $(KFLAGS) $(OCTASIC_CFLAGS) -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 $<
+base.o: ../zaptel.h vpm450m.h wct4xxp.h
 
-wct4xxp.o: base.o vpm450m.o $(shell ../oct612x/octasic-helper objects ../oct612x)
+vpm450m.o: vpm450m.h vpm450m_fw.h ../oct612x/include/oct6100api/oct6100_api.h
+
+wct4xxp.o: base.o vpm450m.o $(OCTASIC_OBJS)
 	$(LD) -r -o $@ $^
 
 fw2h: CFLAGS=
@@ -23,5 +27,6 @@
 clean:
 	rm -f *.o fw2h
 	rm -f vpm450m_fw.h
+	rm -f $(OCTASIC_OBJS)
 
 endif