summaryrefslogtreecommitdiff
path: root/wct4xxp/Makefile
diff options
context:
space:
mode:
authorkpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb>2007-01-16 01:43:50 +0000
committerkpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb>2007-01-16 01:43:50 +0000
commitde9128a1e6b5ef6d91146b5b7d984efb1778fc34 (patch)
treebcfcc94bf639aa3b7ad09efb74aefbd71a79e23c /wct4xxp/Makefile
parent905c0014c3982c5a88a2b9d0a0f740d39b979be4 (diff)
Merged revisions 1820 via svnmerge from
https://origsvn.digium.com/svn/zaptel/branches/1.4 ................ r1820 | kpfleming | 2007-01-15 19:37:26 -0600 (Mon, 15 Jan 2007) | 11 lines Merged revisions 1818 via svnmerge from https://origsvn.digium.com/svn/zaptel/branches/1.2 ........ r1818 | kpfleming | 2007-01-15 19:28:54 -0600 (Mon, 15 Jan 2007) | 3 lines eliminate the fw2h tool, and instead use objcopy to directly make object files from the firmware binary files pass HOTPLUG_FIRMWARE down to the module build so that we can avoid various compiler warnings ........ ................ git-svn-id: http://svn.digium.com/svn/zaptel/trunk@1822 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'wct4xxp/Makefile')
-rw-r--r--wct4xxp/Makefile23
1 files changed, 10 insertions, 13 deletions
diff --git a/wct4xxp/Makefile b/wct4xxp/Makefile
index 503b396..7fe2869 100644
--- a/wct4xxp/Makefile
+++ b/wct4xxp/Makefile
@@ -14,24 +14,21 @@ all: wct4xxp.o
base.o: ../zaptel.h vpm450m.h wct4xxp.h
-vpm450m.o: vpm450m.h vpmoct128_fw.h vpmoct064_fw.h ../oct612x/include/oct6100api/oct6100_api.h
+vpm450m.o: vpm450m.h ../oct612x/include/oct6100api/oct6100_api.h
-wct4xxp.o: base.o vpm450m.o $(OCTASIC_OBJS)
- $(LD) -r -o $@ $^
-
-fw2h: fw2h.c
- $(HOSTCC) -o $@ $^
+firmware_oct6114-64d.o: OCT6114-64D.ima base.o
+ @echo Making firmware object file for $<
+ ../build_tools/make_firmware_object $< $@ base.o
-vpmoct128_fw.h: OCT6114-128D.ima fw2h
- ./fw2h $< $@
+firmware_oct6114-128d.o: OCT6114-128D.ima base.o
+ @echo Making firmware object file for $<
+ ../build_tools/make_firmware_object $< $@ base.o
-vpmoct064_fw.h: OCT6114-64D.ima fw2h
- ./fw2h $< $@
+wct4xxp.o: base.o vpm450m.o $(OCTASIC_OBJS) firmware_oct6114-64d.o firmware_oct6114-128d.o
+ $(LD) -r -o $@ $^
clean:
- rm -f *.o fw2h
- rm -f vpmoct128_fw.h
- rm -f vpmoct064_fw.h
+ rm -f *.o
rm -f $(OCTASIC_OBJS)
endif