build system cleanup/restructuring as described in http://lists.openwrt.org/pipermail...

[openwrt/staging/chunkeey.git] / tools / firmware-utils / Makefile

diff --git a/tools/firmware-utils/Makefile b/tools/firmware-utils/Makefile
index e600e90592f90a1f4247c0ebcf30af790403c3fe..f458693564915248e2001ceb1b1893f234347359 100644 (file)
--- a/tools/firmware-utils/Makefile
+++ b/tools/firmware-utils/Makefile
@@ -5,15 +5,13 @@
 # See /LICENSE for more information.
 #
 include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/host-build.mk
 
 PKG_NAME := firmware-utils
-PKG_BUILD_DIR:=$(TOOL_BUILD_DIR)/firmware-utils
 
-CFLAGS := -O2 -I $(STAGING_DIR)/include-host -include endian.h
+include $(INCLUDE_DIR)/host-build.mk
 
 define cc
-       $(CC) $(CFLAGS) -o $(PKG_BUILD_DIR)/bin/$(1) src/$(1).c
+       $(CC) $(HOST_CFLAGS) -include endian.h -o $(PKG_BUILD_DIR)/bin/$(1) src/$(1).c
 endef
 
 define Build/Compile
@@ -24,10 +22,15 @@ define Build/Compile
        $(call cc,dgfirmware)
        $(call cc,trx2usr)
        $(call cc,ptgen)
+       $(call cc,airlink)
+       $(call cc,srec2bin)
+       $(call cc,mkmylofw)
+       $(call cc,mkcsysimg)
+       $(call cc,mkzynfw)
 endef
 
 define Build/Install
-       $(CP) $(PKG_BUILD_DIR)/bin/* $(STAGING_DIR)/bin
+       $(CP) $(PKG_BUILD_DIR)/bin/* $(STAGING_DIR_HOST)/bin/
 endef
 
 $(eval $(call HostBuild))