swconfig: fix up kernel dependencies

[openwrt.git] / tools / Makefile

diff --git a/tools/Makefile b/tools/Makefile
index 88755ae..ef64dc0 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -9,7 +9,11 @@
 curdir:=tools
 
 # subdirectories to descend into
 curdir:=tools
 
 # subdirectories to descend into

-$(curdir)/builddirs := sed sstrip ipkg-utils genext2fs squashfs mtd-utils lzma mkimage firmware-utils patch-cmdline pkg-config m4 autoconf automake $(if $(CONFIG_CCACHE),ccache) bison $(if $(CONFIG_powerpc),dtc) quilt $(if $(CONFIG_GCC_VERSION_4_3),gmp mpfr) yaffs2
+tools-y := sed sstrip ipkg-utils genext2fs squashfs mtd-utils lzma mkimage firmware-utils patch-cmdline pkg-config m4 autoconf automake bison quilt yaffs2
+
+tools-$(CONFIG_CCACHE) += ccache
+tools-$(CONFIG_powerpc) += dtc
+tools-$(CONFIG_GCC_VERSION_4_3) += gmp mpfr

 
 # builddir dependencies
 $(curdir)/squashfs/compile := $(curdir)/lzma/install
 
 # builddir dependencies
 $(curdir)/squashfs/compile := $(curdir)/lzma/install


@@ -18,6 +22,9 @@ $(curdir)/dtc/compile := $(curdir)/bison/install
 $(curdir)/autoconf/compile := $(curdir)/m4/install
 $(curdir)/automake/compile := $(curdir)/m4/install
 
 $(curdir)/autoconf/compile := $(curdir)/m4/install
 $(curdir)/automake/compile := $(curdir)/m4/install
 

+$(curdir)/builddirs := $(tools-y) $(tools-dep) $(tools-)
+$(curdir)/builddirs-default := $(tools-y)
+

 # preparatory work
 $(STAGING_DIR)/.prepared: $(TMP_DIR)/.build
        @for dir in $(STAGING_DIR) $(STAGING_DIR_HOST); do ( \
 # preparatory work
 $(STAGING_DIR)/.prepared: $(TMP_DIR)/.build
        @for dir in $(STAGING_DIR) $(STAGING_DIR_HOST); do ( \


@@ -52,5 +59,5 @@ $(curdir)//compile = $(STAGING_DIR)/.prepared $($(curdir)/cmddeps)
 $(curdir)/ := .config prereq
 $(curdir)//install = $(1)/compile
 
 $(curdir)/ := .config prereq
 $(curdir)//install = $(1)/compile
 

-$(eval $(call stampfile,$(curdir),tools,install))
+$(eval $(call stampfile,$(curdir),tools,install,,CONFIG_CCACHE CONFIG_powerpc CONFIG_GCC_VERSION_4_3))

 $(eval $(call subdir,$(curdir)))
 $(eval $(call subdir,$(curdir)))