summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorkpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb>2006-06-19 15:09:42 +0000
committerkpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb>2006-06-19 15:09:42 +0000
commit25c6da6f707e5b3dc435215b36aef187601c0043 (patch)
treedd599d3a0aa94d9961a99ea3fbdd643a3a07bf0d /Makefile
parent6446efb93dc10bb2d42fd664480fc1c8b8b0e456 (diff)
various cleanups
git-svn-id: http://svn.digium.com/svn/zaptel/trunk@1118 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile37
1 files changed, 21 insertions, 16 deletions
diff --git a/Makefile b/Makefile
index 6dd8397..7f0023e 100644
--- a/Makefile
+++ b/Makefile
@@ -138,7 +138,7 @@ MOD_DIR:=$(INSTALL_PREFIX)/lib/modules/$(KVERS)/misc
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 @@ UTILS:=tor2ee ztspeed zttool ztmonitor sethdlc-new \
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)
+linux24: prereq vpm450m_fw.h $(MODULESO) $(BINS)
-linux26: prereq $(BINS)
- @echo $(KSRC)
+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 @@ xpp: linux26
#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 @@ torisatool: torisatool.o
tones.h: gendigits
./gendigits > $@
-tor2fw.h: makefw tormenta2.rbt
- ./makefw tormenta2.rbt tor2fw > tor2fw.h
+tor2fw.h: tormenta2.rbt makefw
+ ./makefw $< tor2fw > $@
-vpm450m_fw.h: fw2h OCT6114-128D.ima
- ./fw2h OCT6114-128D.ima vpm450m_fw.h
+radfw.h: pciradio.rbt makefw
+ ./makefw $< radfw > $@
-radfw.h: makefw pciradio.rbt
- ./makefw pciradio.rbt radfw > radfw.h
+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-linux24: vpm450m_fw.h.o$(MODULES_BUILD)
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 @@ endif
rm -f fxotune
rm -f core
rm -f ztcfg-shared fxstest
+ rm -f fw2h vpm450m_fw.h
FORCE: