X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/af927159a9e65228875999840012a1cde1c36b6a..3d14a11eddc3ed3059d0fd921c4ae9bcaa6b75f3:/tools/Makefile?ds=inline

diff --git a/tools/Makefile b/tools/Makefile
index 5ad4bfd72..e15f061a4 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -9,24 +9,44 @@
 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
 
 # builddir dependencies
 $(curdir)/squashfs/compile := $(curdir)/lzma/install
+$(curdir)/quilt/compile := $(curdir)/sed/install
 
 # preparatory work
-define copy_include
-$(STAGING_DIR)/include-host/.done:
-	@mkdir -p $$$$(dirname $$@)
-	@cp $(1)/include/*.h $$$$(dirname $$@)/
-	@touch $$@
-$(curdir)//prepare = $(STAGING_DIR)/include-host/.done
-endef
-$(eval $(call copy_include,$(curdir)))
+$(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
+	[ -x "$(FIND)" -a "$(FIND)" != "$@" ] && ln -sf "$(FIND)" $@
+
+
+$(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 prereq
-$(curdir)//compile = $(1)/prepare
 $(curdir)//install = $(1)/compile
 
 $(eval $(call stampfile,$(curdir),tools,install))