[zaptel-commits] kpfleming: trunk r1364 - in /trunk: ./ wct4xxp/Makefile

[zaptel-commits at lists.digium.com]

Author: kpfleming
Date: Sat Aug 26 21:29:21 2006
New Revision: 1364

URL: http://svn.digium.com/view/zaptel?rev=1364&view=rev
Log:
Merged revisions 1362-1363 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r1362 | kpfleming | 2006-08-26 21:20:56 -0500 (Sat, 26 Aug 2006) | 2 lines

it would probably help if we actually linked the Octasic API objects into the wct4xxp module :-)

........
r1363 | kpfleming | 2006-08-26 21:27:23 -0500 (Sat, 26 Aug 2006) | 2 lines

ok... finally, this actually does build correctly for 2.4 kernels

........

Modified:
    trunk/   (props changed)
    trunk/wct4xxp/Makefile

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.2-merged (original)
+++ branch-1.2-merged Sat Aug 26 21:29:21 2006
@@ -1,1 +1,1 @@
-/branches/1.2:1-916,918-936,938-949,958,962,970,990,1004,1011,1017,1031,1033,1060,1062,1064-1066,1069,1071,1076,1079,1081,1097,1101,1151,1185,1187,1205,1233,1235-1236,1243,1248,1259,1262,1298,1300,1304,1306,1311,1313,1315,1317,1327,1359
+/branches/1.2:1-916,918-936,938-949,958,962,970,990,1004,1011,1017,1031,1033,1060,1062,1064-1066,1069,1071,1076,1079,1081,1097,1101,1151,1185,1187,1205,1233,1235-1236,1243,1248,1259,1262,1298,1300,1304,1306,1311,1313,1315,1317,1327,1359,1362-1363

Modified: trunk/wct4xxp/Makefile
URL: http://svn.digium.com/view/zaptel/trunk/wct4xxp/Makefile?rev=1364&r1=1363&r2=1364&view=diff
==============================================================================
--- trunk/wct4xxp/Makefile (original)
+++ trunk/wct4xxp/Makefile Sat Aug 26 21:29:21 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
+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