X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=tools%2FMakefile;h=ecab9dae84fb467ac4a80db3d3ba4b7934f11f1c;hp=49b30be44b01c0e8c5c7d1050ef52b613132ea09;hb=3a2b17d33b41f95042bd7d9d38e81501a03997ca;hpb=5fc2bd5412df35bbc66e5afbbdedc07f4ec1a314

diff --git a/tools/Makefile b/tools/Makefile
index 49b30be44b..ecab9dae84 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -6,26 +6,32 @@
 #
 # Main makefile for the host tools
 #
-
-curdir:=$(patsubst %/Makefile,%,$(lastword $(MAKEFILE_LIST)))
+curdir:=tools
 
 # subdirectories to descend into
-$(curdir)/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 ext2fs squashfs mtd-utils lzma mkimage firmware-utils patch-cmdline pkg-config $(if $(CONFIG_CCACHE),ccache)
 
 # builddir dependencies
 $(curdir)/squashfs/compile := $(curdir)/lzma/install
 
 # preparatory work
-$(STAGING_DIR)/include-host/.done:
-	@mkdir -p $$(dirname $@)
-	@cp $(curdir)/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
-$(curdir)/ := .config
-$(curdir)//prepare = $(STAGING_DIR)/include-host/.done
-$(curdir)//compile = $(1)/prepare
+$(curdir)/ := .config prereq
 $(curdir)//install = $(1)/compile
 
-$(eval $(call stampfile,$(curdir),tools))
+$(eval $(call stampfile,$(curdir),tools,install))
 $(eval $(call subdir,$(curdir)))