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

[openwrt/staging/wigyori.git] / tools / mkimage / Makefile

diff --git a/tools/mkimage/Makefile b/tools/mkimage/Makefile
index 22e8b484d725566a19ef31d559e49d227b90c844..f2bb08dd390b0684753f9339c55f2fe865fd41a8 100644 (file)
--- a/tools/mkimage/Makefile
+++ b/tools/mkimage/Makefile
@@ -7,23 +7,21 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mkimage
-PKG_BUILD_DIR:=$(TOOL_BUILD_DIR)/mkimage
 
 include $(INCLUDE_DIR)/host-build.mk
 
 define Build/Compile
-       $(CC) -O -c src/crc32.c -o $(PKG_BUILD_DIR)/crc32.o
-       $(CC) -O -c src/mkimage.c -o $(PKG_BUILD_DIR)/mkimage.o
-       $(CC) -O -o $(PKG_BUILD_DIR)/mkimage $(PKG_BUILD_DIR)/mkimage.o $(PKG_BUILD_DIR)/crc32.o
+       $(HOSTCC) $(HOST_CFLAGS) -O -c src/crc32.c -o $(PKG_BUILD_DIR)/crc32.o
+       $(HOSTCC) $(HOST_CFLAGS) -O -c src/mkimage.c -o $(PKG_BUILD_DIR)/mkimage.o
+       $(HOSTCC) $(HOST_CFLAGS) -O -o $(PKG_BUILD_DIR)/mkimage $(PKG_BUILD_DIR)/mkimage.o $(PKG_BUILD_DIR)/crc32.o
 endef
 
 define Build/Install
-       mkdir -p $(STAGING_DIR)/bin
-       $(CP) $(PKG_BUILD_DIR)/mkimage $(STAGING_DIR)/bin/
+       $(CP) $(PKG_BUILD_DIR)/mkimage $(STAGING_DIR_HOST)/bin/
 endef
 
 define Build/Clean
-       rm -f $(STAGING_DIR)/bin/mkimage
+       rm -f $(STAGING_DIR_HOST)/bin/mkimage
 endef
 
 $(eval $(call HostBuild))