[zaptel-commits] tzafrir: branch tzafrir/makefile r1482 - in /team/tzafrir/makefile: ./ wct4xx...

[zaptel-commits at lists.digium.com]

Author: tzafrir
Date: Thu Sep 28 20:02:00 2006
New Revision: 1482

URL: http://svn.digium.com/view/zaptel?rev=1482&view=rev
Log:
* Duh, it's HOSTCC, not userspace-CC
* Do use HOSTCC to build firmwaree builders.

Modified:
    team/tzafrir/makefile/Makefile
    team/tzafrir/makefile/wct4xxp/Makefile
    team/tzafrir/makefile/xpp/utils/Makefile

Modified: team/tzafrir/makefile/Makefile
URL: http://svn.digium.com/view/zaptel/team/tzafrir/makefile/Makefile?rev=1482&r1=1481&r2=1482&view=diff
==============================================================================
--- team/tzafrir/makefile/Makefile (original)
+++ team/tzafrir/makefile/Makefile Thu Sep 28 20:02:00 2006
@@ -228,13 +228,13 @@
 tor2ee: LDLIBS+=-lpci
 
 zonedata.lo: zonedata.c
-	$(HOSTCC) -c $(LCFLAGS) -o $@ $^
+	$(CC) -c $(LCFLAGS) -o $@ $^
 
 tonezone.lo: tonezone.c
-	$(HOSTCC) -c $(LCFLAGS) -o $@ $^
+	$(CC) -c $(LCFLAGS) -o $@ $^
 
 torisatool: torisatool.o
-	$(HOSTCC) -o $@ $^
+	$(CC) -o $@ $^
 
 tones.h: gendigits
 	./gendigits > $@
@@ -245,7 +245,8 @@
 radfw.h: pciradio.rbt makefw
 	./makefw $< radfw > $@
 
-makefw: CFLAGS=
+makefw: makefw.c
+	$(HOSTCC) $(CFLAGS) -o $@ $^
 
 gendigits: LDLIBS+=-lm
 gendigits: CFLAGS=
@@ -255,7 +256,7 @@
 prereq: config.status tones.h tor2fw.h radfw.h version.h
 
 zttool.o: zttool.c zaptel.h
-	$(HOSTCC) -g -c $(NEWT_INCLUDE) $(CFLAGS) -o $@ $<
+	$(CC) -g -c $(NEWT_INCLUDE) $(CFLAGS) -o $@ $<
 
 ztprovision.o: ztprovision.c zaptel.h
 
@@ -271,27 +272,27 @@
 	ranlib $@
 
 $(LTZ_SO): $(LTZ_SO_OBJS)
-	$(HOSTCC) -shared -o $@ $^ -lm
+	$(CC) -shared -o $@ $^ -lm
 
 ztcfg.c: ztcfg.h
 
 ztcfg-shared: ztcfg.o $(LTZ_SO)
-	$(HOSTCC) -o $@ $^ -lm
+	$(CC) -o $@ $^ -lm
 
 data:
 	$(MAKE) -C datamods datamods
 
 ztcfg: ztcfg.o $(LTZ_A)
-	$(HOSTCC) -o $@ $^ -lm
+	$(CC) -o $@ $^ -lm
 
 ztcfg-dude: ztcfg-dude.o mknotch.o complex.o $(LTZ_SO)
-	$(HOSTCC) -o $@ $^ -lm
+	$(CC) -o $@ $^ -lm
 
 mknotch.o: mknotch.cc
-	$(HOSTCC) -o $@ -c $^
+	$(CC) -o $@ -c $^
 
 complex.o: complex.cc
-	$(HOSTCC) -o $@ -c $^
+	$(CC) -o $@ -c $^
 
 usbfxstest: LDLIBS+=-lzap
 fxstest: $(LTZ_SO)
@@ -312,10 +313,10 @@
 	$(MAKE) -C mISDNuser install
 
 $(UTILS): %: %.o
-	$(HOSTCC) $(CFLAGS) -o $@ $< $(LDFLAGS) $(LDLIBS)
+	$(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) $(LDLIBS)
 
 $(UTILSO): %.o: %.c
-	$(HOSTCC) $(CFLAGS) -o $@ -c $<
+	$(CC) $(CFLAGS) -o $@ -c $<
 
 devices:
 ifndef DYNFS

Modified: team/tzafrir/makefile/wct4xxp/Makefile
URL: http://svn.digium.com/view/zaptel/team/tzafrir/makefile/wct4xxp/Makefile?rev=1482&r1=1481&r2=1482&view=diff
==============================================================================
--- team/tzafrir/makefile/wct4xxp/Makefile (original)
+++ team/tzafrir/makefile/wct4xxp/Makefile Thu Sep 28 20:02:00 2006
@@ -19,7 +19,8 @@
 wct4xxp.o: base.o vpm450m.o $(OCTASIC_OBJS)
 	$(LD) -r -o $@ $^
 
-fw2h: CFLAGS=
+fw2h: fw2h.c
+	$(HOSTCC) $(CFLAGS) -o $@ $^
 
 vpm450m_fw.h: OCT6114-128D.ima fw2h
 	./fw2h $< $@

Modified: team/tzafrir/makefile/xpp/utils/Makefile
URL: http://svn.digium.com/view/zaptel/team/tzafrir/makefile/xpp/utils/Makefile?rev=1482&r1=1481&r2=1482&view=diff
==============================================================================
--- team/tzafrir/makefile/xpp/utils/Makefile (original)
+++ team/tzafrir/makefile/xpp/utils/Makefile Thu Sep 28 20:02:00 2006
@@ -51,7 +51,8 @@
 test_parse: test_parse.o libhexfile.a
 	$(CC) -L. -o $@ $@.o $(EXTRA_LIBS) -lhexfile -lusb
 
-print_modes.o: wctdm_fxomodes.h
+print_modes.o: print_modes.c wctdm_fxomodes.h
+	$(HOSTCC) $(CFLAGS) -c $^
 
 wctdm_fxomodes.h: $(WCTDM)
 	perl -n -e 'print if (/^static struct fxo_mode {$$/ .. /};$$/)' $(WCTDM) >$@