[svn-commits] trunk r1118 - in /trunk: Makefile xpp/

[svn-commits at lists.digium.com]

Author: kpfleming
Date: Mon Jun 19 10:09:42 2006
New Revision: 1118

URL: http://svn.digium.com/view/zaptel?rev=1118&view=rev
Log:
various cleanups

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

Modified: trunk/Makefile
URL: http://svn.digium.com/view/zaptel/trunk/Makefile?rev=1118&r1=1117&r2=1118&view=diff
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Mon Jun 19 10:09:42 2006
@@ -138,7 +138,7 @@
 
 MOD_DESTDIR:=zaptel
 
-EXTRA_CFLAGS := -I$(PWD)/include  -I$(PWD)/include/oct6100api
+EXTRA_CFLAGS:=-I$(PWD)/include  -I$(PWD)/include/oct6100api
 obj-m:=$(MODULESO)
 wct4xxp-objs:=wct4xxp_base.o vpm450m.o
 
@@ -159,16 +159,15 @@
   usbfxstest fxstest fxotune fxsdump ztdiag
 UTILSO:=$(UTILS:%=%.o)
 
-all: vpm450m_fw.h modules $(LIBTONEZONE_SO)
+all: modules $(LIBTONEZONE_SO)
 
 programs: $(BINS)
 
 modules: $(BUILDVER)
 
-linux24: prereq $(MODULESO) $(BINS)
-
-linux26: prereq $(BINS)
-	@echo $(KSRC)
+linux24: prereq vpm450m_fw.h $(MODULESO) $(BINS)
+
+linux26: prereq vpm450m_fw.h $(BINS)
 	@if [ -z "$(KSRC)" -o ! -d "$(KSRC)" ]; then echo "You do not appear to have the sources for the $(KVERS) kernel installed."; exit 1 ; fi
 	$(KMAKE) modules
 
@@ -179,17 +178,17 @@
 #endif
 
 version.h: FORCE
-	ZAPTELVERSION="${ZAPTELVERSION}" build_tools/make_version_h > $@.tmp
-	if cmp -s $@.tmp $@ ; then echo; else \
+	@ZAPTELVERSION="${ZAPTELVERSION}" build_tools/make_version_h > $@.tmp
+	@if cmp -s $@.tmp $@ ; then :; else \
 		mv $@.tmp $@ ; \
 	fi
-	rm -f $@.tmp
+	@rm -f $@.tmp
 
 devel: tor2ee 
 
 tests: patgen pattest patlooptest hdlcstress hdlctest hdlcgen hdlcverify timertest
 
-wct4xxp.o: wct4xxp_base.o vpm450m.c vpm450m_fw.h
+wct4xxp.o: wct4xxp_base.c vpm450m.c
 
 tor2.o: tor2-hw.h tor2fw.h
 
@@ -228,16 +227,21 @@
 tones.h: gendigits
 	./gendigits > $@
 
-tor2fw.h: makefw tormenta2.rbt
-	./makefw tormenta2.rbt tor2fw > tor2fw.h
-
-vpm450m_fw.h: fw2h OCT6114-128D.ima
-	./fw2h OCT6114-128D.ima vpm450m_fw.h
-
-radfw.h: makefw pciradio.rbt
-	./makefw pciradio.rbt radfw > radfw.h
+tor2fw.h: tormenta2.rbt makefw 
+	./makefw $< tor2fw > $@
+
+radfw.h: pciradio.rbt makefw
+	./makefw $< radfw > $@
+
+makefw: CFLAGS=
 
 gendigits: LDFLAGS+=-lm
+gendigits: CFLAGS=
+
+fw2h: CFLAGS=
+
+vpm450m_fw.h: OCT6114-128D.ima fw2h
+	./fw2h $< $@
 
 zaptel.c: tones.h 
 
@@ -429,7 +433,7 @@
 	install -d $(MOD_DIR)
 	install -m 644 $(MODULES_BUILD) $(MOD_DIR)
 
-install-linux26: vpm450m_fw.h $(MODULESKO)
+install-linux26: $(MODULESKO)
 	$(KMAKE_INST)
 
 clean:
@@ -450,5 +454,6 @@
 	rm -f fxotune
 	rm -f core
 	rm -f ztcfg-shared fxstest
+	rm -f fw2h vpm450m_fw.h
 
 FORCE:

Propchange: trunk/xpp/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Jun 19 10:09:42 2006
@@ -3,3 +3,4 @@
 *.o.cmd
 *.ko.cmd
 *.mod.c
+init_data_*.inc