X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=tools%2FMakefile;h=768f8786c6007910afa9750238d358a1ead97414;hp=0d6b51597732d3a81d9688c2c702fb614a85a67c;hb=f7570416115a7b12178543fcf1f4550f2ccabd06;hpb=f15f98bf48a787ef8f1dd415338f46826eef11ab

diff --git a/tools/Makefile b/tools/Makefile
index 0d6b515977..768f8786c6 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -6,23 +6,54 @@
 #
 # 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 genext2fs squashfs mtd-utils lzma mkimage firmware-utils patch-cmdline pkg-config automake $(if $(CONFIG_CCACHE),ccache) bison $(if $(CONFIG_powerpc),dtc) lua quilt autoconf
+
+ifeq ($(CONFIG_GCC_VERSION_4_3_1)$(CONFIG_GCC_VERSION_4_3_2),y)
+$(curdir)/builddirs += gmp mpfr
+endif
 
 # builddir dependencies
 $(curdir)/squashfs/compile := $(curdir)/lzma/install
+$(curdir)/quilt/compile := $(curdir)/sed/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 $@
+
+$(STAGING_DIR_HOST)/bin/md5sum: $(STAGING_DIR)/.prepared
+	@MD5SUM=`which md5sum 2>/dev/null`; \
+	if [ "$@" != "$$MD5SUM" ]; then \
+		if [ -x "$$MD5SUM" ]; then \
+			ln -sf "$$MD5SUM" "$@"; \
+		else \
+			cp $(SCRIPT_DIR)/md5sum $(STAGING_DIR_HOST)/bin/; \
+		fi; \
+	fi
+
+$(STAGING_DIR_HOST)/bin/find: $(STAGING_DIR)/.prepared
+	if [ -x "$(FIND)" -a "$(FIND)" != "$@" ]; then \
+		ln -sf "$(FIND)" $@; \
+	fi
+
+
+$(curdir)/cmddeps = $(patsubst %,$(STAGING_DIR_HOST)/bin/%,find md5sum)
+$(curdir)//prepare = $(STAGING_DIR)/.prepared $($(curdir)/cmddeps)
+$(curdir)//compile = $(STAGING_DIR)/.prepared $($(curdir)/cmddeps)
 
 # prerequisites for the individual targets
-$(curdir)/ := .config
-$(curdir)//prepare := $(STAGING_DIR)/include-host/.done
-$(eval $(call stampfile,$(curdir),tools))
+$(curdir)/ := .config prereq
+$(curdir)//install = $(1)/compile
+
+$(eval $(call stampfile,$(curdir),tools,install))
 $(eval $(call subdir,$(curdir)))