Drop the need for header files by using non-versioned binary files.

git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.4@2136 5390a7c7-147a-4af0-8ec9-7488f05a26cb

1 files changed, 4 insertions, 32 deletions

diff --git a/firmware/Makefile b/firmware/Makefile
index c89892d..60fb2de 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -39,11 +39,6 @@ OBJECT_FILES:=$(MENUSELECT_FIRMWARE:FIRMWARE-OCT6114-064=zaptel-fw-oct6114-064.o
 OBJECT_FILES:=$(OBJECT_FILES:FIRMWARE-OCT6114-128=zaptel-fw-oct6114-128.o)
 OBJECT_FILES:=$(OBJECT_FILES:FIRMWARE-TC400M=zaptel-fw-tc400m.o)
 
-# Build a list of firmware header files to include that give the current version of firmware
-HEADER_FILES:=$(MENUSELECT_FIRMWARE:FIRMWARE-OCT6114-064=zaptel-fw-oct6114-064.h)
-HEADER_FILES:=$(HEADER_FILES:FIRMWARE-OCT6114-128=zaptel-fw-oct6114-128.h)
-HEADER_FILES:=$(HEADER_FILES:FIRMWARE-TC400M=zaptel-fw-tc400m.h)
-
 # If "fetch" is used, --continue is not a valid option.
 ifeq ($(WGET),wget)
 WGET_ARGS:=--continue
@@ -77,14 +72,10 @@ dist-clean: clean
 # Clean up anything we built
 clean:
 	rm -f zaptel-fw-*.o
-	rm -f zaptel-fw-*.h
 
 # Create object files suitable for linking against
 object-build: $(FIRMWARE) $(OBJECT_FILES)
 
-# Create header files suitable for including
-header-build: $(FIRMWARE) $(HEADER_FILES)
-
 # Install all downloaded firmware images for hotplug usage and build headers for inclusion
 hotplug-install: $(FIRMWARE)
 	if [ -d $(INSTALL_PREFIX)/usr/lib/hotplug/firmware ]; then \
@@ -104,33 +95,14 @@ hotplug-uninstall:
 	fi
 
 # Build object file of an oct6114 064 firmware image for linking
-zaptel-fw-oct6114-064.o: ../wct4xxp/base.o zaptel-fw-oct6114-064-$(OCT6114_064_VERSION).bin
-	@echo Making firmware object file for zaptel-fw-oct6114-064-$(OCT6114_064_VERSION).bin
-	@echo Temporarily copying to zaptel-fw-oct6114-064.bin
-	@cp zaptel-fw-oct6114-064-$(OCT6114_064_VERSION).bin zaptel-fw-oct6114-064.bin
+zaptel-fw-oct6114-064.o: ../wct4xxp/base.o zaptel-fw-oct6114-064.bin
+	@echo Making firmware object file for zaptel-fw-oct6114-064.bin
 	../build_tools/make_firmware_object zaptel-fw-oct6114-064.bin $@ ../wct4xxp/base.o
-	@rm -f zaptel-fw-oct6114-064.bin
-
-# Build header file of an oct6114 064 firmware image for inclusion
-zaptel-fw-oct6114-064.h: zaptel-fw-oct6114-064-$(OCT6114_064_VERSION).bin
-	@echo Making firmware header file for zaptel-fw-oct6114-064-$(OCT6114_064_VERSION).bin
-	@echo "static const char *zaptel_fw_oct6114_064 = \"zaptel-fw-oct6114-064-$(OCT6114_064_VERSION).bin\";" > $@
 
 # Build object file of an oct6114 128 firmware image for linking
-zaptel-fw-oct6114-128.o: ../wct4xxp/base.o zaptel-fw-oct6114-128-$(OCT6114_128_VERSION).bin
-	@echo Making firmware object file for zaptel-fw-oct6114-128-$(OCT6114_128_VERSION).bin
-	@echo Temporarily copying to zaptel-fw-oct6114-128.bin
-	@cp zaptel-fw-oct6114-128-$(OCT6114_128_VERSION).bin zaptel-fw-oct6114-128.bin
+zaptel-fw-oct6114-128.o: ../wct4xxp/base.o zaptel-fw-oct6114-128.bin
+	@echo Making firmware object file for zaptel-fw-oct6114-128.bin
 	../build_tools/make_firmware_object zaptel-fw-oct6114-128.bin $@ ../wct4xxp/base.o
-	@rm -f zaptel-fw-oct6114-128.bin
-
-# Build header file of an oct6114 128 firmware image for inclusion
-zaptel-fw-oct6114-128.h: zaptel-fw-oct6114-128-$(OCT6114_128_VERSION).bin
-	@echo Making firmware header file for zaptel-fw-oct6114-128-$(OCT6114_128_VERSION).bin
-	@echo "static const char *zaptel_fw_oct6114_128 = \"zaptel-fw-oct6114-128-$(OCT6114_128_VERSION).bin\";" > $@
 
 # Build object file of a TC400M firmware image for linking
 zaptel-fw-tc400m.o:
-
-# Build header file of a TC400M firmware image for inclusion
-zaptel-fw-tc400m.h: