X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/2f23c770ba8cc33ecef97b4894e65a202704be2c..4355c3d9a308c1b9d10e7da73ccc0f5996fb310a:/tools/Makefile diff --git a/tools/Makefile b/tools/Makefile index e24044d17..8ff50cc43 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -9,7 +9,7 @@ curdir:=tools # subdirectories to descend into -$(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 $(if $(CONFIG_GCC_VERSION_4_3),gmp mpfr) +$(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) quilt autoconf $(if $(CONFIG_GCC_VERSION_4_3),gmp mpfr) yaffs2 # builddir dependencies $(curdir)/squashfs/compile := $(curdir)/lzma/install @@ -27,23 +27,21 @@ $(STAGING_DIR)/.prepared: $(TMP_DIR)/.build $(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 +define PrepareCommand +$(STAGING_DIR_HOST)/bin/$(1): $(STAGING_DIR)/.prepared + @mkdir -p "$$(dir $$@)"; rm -f "$$@" + @export FILE="$$$$(which $(2) 2>/dev/null | grep -v 'not found' | head -n1)"; [ -n "$$$$FILE" ] || { \ + echo "Command $(1) not found."; false; \ + }; ln -s "$$$$FILE" "$$@" -$(STAGING_DIR_HOST)/bin/find: $(STAGING_DIR)/.prepared - if [ -x "$(FIND)" -a "$(FIND)" != "$@" ]; then \ - ln -sf "$(FIND)" $@; \ - fi +endef +$(eval $(call PrepareCommand,find,gfind find)) +$(eval $(call PrepareCommand,md5sum,md5sum $(SCRIPT_DIR)/md5sum)) +$(eval $(call PrepareCommand,cp,gcp cp)) +$(eval $(call PrepareCommand,stat,gstat stat)) -$(curdir)/cmddeps = $(patsubst %,$(STAGING_DIR_HOST)/bin/%,find md5sum) +$(curdir)/cmddeps = $(patsubst %,$(STAGING_DIR_HOST)/bin/%,find md5sum cp stat) $(curdir)//prepare = $(STAGING_DIR)/.prepared $($(curdir)/cmddeps) $(curdir)//compile = $(STAGING_DIR)/.prepared $($(curdir)/cmddeps)