upgrade apex to 1.5.13, fixup EABI support

[openwrt.git] / tools / Makefile

diff --git a/tools/Makefile b/tools/Makefile
index ed2eae8..a73a79f 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -6,26 +6,32 @@
 #
 # Main makefile for the host tools
 #
-
 curdir:=tools
 
 # subdirectories to descend into
-tools/builddirs := sed sstrip ipkg-utils ext2fs squashfs mtd-utils lzma mkimage firmware-utils patch-cmdline $(if $(CONFIG_CCACHE),ccache)
+$(curdir)/builddirs := sed sstrip ipkg-utils genext2fs squashfs mtd-utils lzma mkimage firmware-utils patch-cmdline pkg-config automake $(if $(CONFIG_CCACHE),ccache) bison dtc
 
 # builddir dependencies
-tools/squashfs/compile := tools/lzma/install
+$(curdir)/squashfs/compile := $(curdir)/lzma/install
 
 # preparatory work
-$(STAGING_DIR)/include-host/.done:
-       @mkdir -p $$(dirname $@)
-       @cp tools/include/*.h $$(dirname $@)/
-       @touch $@
+$(STAGING_DIR)/.prepared: $(TMP_DIR)/.build
+       @for dir in $(STAGING_DIR) $(STAGING_DIR_HOST); do ( \
+               set -x; \
+               mkdir -p "$$dir"; \
+               cd "$$dir"; \
+               mkdir -p bin lib include stamp; \
+       ); done
+       mkdir -p $(BUILD_DIR_HOST)/stamp $(BUILD_DIR)/stamp
+       $(INSTALL_DATA) $(TOPDIR)/tools/include/*.h $(STAGING_DIR_HOST)/include/
+       touch $@
+
+$(curdir)//prepare = $(STAGING_DIR)/.prepared
+$(curdir)//compile = $(STAGING_DIR)/.prepared
 
 # prerequisites for the individual targets
-tools/ := .config
-tools//prepare = $(STAGING_DIR)/include-host/.done
-tools//compile = $(1)/prepare
-tools//install = $(1)/compile
+$(curdir)/ := .config prereq
+$(curdir)//install = $(1)/compile
 
-$(eval $(call stampfile,tools,tools))
-$(eval $(call subdir,tools))
+$(eval $(call stampfile,$(curdir),tools,install))
+$(eval $(call subdir,$(curdir)))