X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;ds=sidebyside;f=tools%2FMakefile;h=ecab9dae84fb467ac4a80db3d3ba4b7934f11f1c;hb=d5a53f3c5700fd4b32f444a6d008554cb573c50f;hp=ed2eae89d93006c59c49f395b875d689e7b0fa67;hpb=23660965c9671a573d958374ce1ef0b7c5b317b8;p=openwrt-10.03%2F.git

diff --git a/tools/Makefile b/tools/Makefile
index ed2eae89d..ecab9dae8 100644
--- 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 ext2fs squashfs mtd-utils lzma mkimage firmware-utils patch-cmdline pkg-config $(if $(CONFIG_CCACHE),ccache)
 
 # 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)))