diff options
author | file <file@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-02-07 20:09:29 +0000 |
---|---|---|
committer | file <file@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-02-07 20:09:29 +0000 |
commit | 614a39ced8799b3ec63cc738ee7dda095a6ea74c (patch) | |
tree | 2b8494e2302a18f50f90fed6e68b9e8b4391c70a /wct4xxp/Makefile | |
parent | 20aa812f076a7c2810e7acb4499a6e8b2282073c (diff) |
Merged revisions 2107 via svnmerge from
https://origsvn.digium.com/svn/zaptel/branches/1.4
........
r2107 | file | 2007-02-07 15:01:41 -0500 (Wed, 07 Feb 2007) | 2 lines
Merge in zaptel-firmware branch. This basically downloads the firmware from the FTP site and builds the appropriate headers based on the current version. Drivers just know they need a certain firmware and get fed the current version. If this prevents your zaptel from building do a make distclean and start fresh or make sure the firmware is checked in make menuselect.
........
git-svn-id: http://svn.digium.com/svn/zaptel/trunk@2108 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'wct4xxp/Makefile')
-rw-r--r-- | wct4xxp/Makefile | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/wct4xxp/Makefile b/wct4xxp/Makefile index 7fe2869..2fd4ee3 100644 --- a/wct4xxp/Makefile +++ b/wct4xxp/Makefile @@ -16,15 +16,13 @@ base.o: ../zaptel.h vpm450m.h wct4xxp.h vpm450m.o: vpm450m.h ../oct612x/include/oct6100api/oct6100_api.h -firmware_oct6114-64d.o: OCT6114-64D.ima base.o - @echo Making firmware object file for $< - ../build_tools/make_firmware_object $< $@ base.o +../firmware/zaptel-fw-oct6114-064.o: base.o + $(MAKE) -C ../firmware zaptel-fw-oct6114-064.o -firmware_oct6114-128d.o: OCT6114-128D.ima base.o - @echo Making firmware object file for $< - ../build_tools/make_firmware_object $< $@ base.o +../firmware/zaptel-fw-oct6114-128.o: base.o + $(MAKE) -C ../firmware zaptel-fw-oct6114-128.o -wct4xxp.o: base.o vpm450m.o $(OCTASIC_OBJS) firmware_oct6114-64d.o firmware_oct6114-128d.o +wct4xxp.o: base.o vpm450m.o $(OCTASIC_OBJS) ../firmware/zaptel-fw-oct6114-064.o ../firmware/zaptel-fw-oct6114-128.o $(LD) -r -o $@ $^ clean: |