From a792668b58fd5f551f30d40c2352f16011f1f92f Mon Sep 17 00:00:00 2001 From: Thomas De Schampheleire Date: Wed, 8 Feb 2012 17:22:16 +0100 Subject: [PATCH] dependencies: move from toolchain/ to support/ As suggested by Arnout Vandecappelle, move toolchain/dependencies to support/dependencies, as it really is not toolchain-specific anymore. Signed-off-by: Thomas De Schampheleire Acked-by: Thomas Petazzoni Acked-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Peter Korsgaard --- Makefile | 2 ++ {toolchain => support}/dependencies/dependencies.mk | 2 +- {toolchain => support}/dependencies/dependencies.sh | 0 toolchain/toolchain-buildroot.mk | 1 - toolchain/toolchain-crosstool-ng.mk | 1 - toolchain/toolchain-external.mk | 1 - 6 files changed, 3 insertions(+), 4 deletions(-) rename {toolchain => support}/dependencies/dependencies.mk (94%) rename {toolchain => support}/dependencies/dependencies.sh (100%) diff --git a/Makefile b/Makefile index e1621f965e..90d1a9d502 100644 --- a/Makefile +++ b/Makefile @@ -297,6 +297,8 @@ include package/Makefile.in all: world +include support/dependencies/dependencies.mk + # We also need the various per-package makefiles, which also add # each selected package to TARGETS if that package was selected # in the .config file. diff --git a/toolchain/dependencies/dependencies.mk b/support/dependencies/dependencies.mk similarity index 94% rename from toolchain/dependencies/dependencies.mk rename to support/dependencies/dependencies.mk index ea8bf252bd..3e621e9dd2 100644 --- a/toolchain/dependencies/dependencies.mk +++ b/support/dependencies/dependencies.mk @@ -14,7 +14,7 @@ core-dependencies: @HOSTCC="$(firstword $(HOSTCC))" MAKE="$(MAKE)" \ CONFIG_FILE="$(CONFIG_DIR)/.config" \ DL_TOOLS="$(sort $(DL_TOOLS_DEPENDENCIES))" \ - $(TOPDIR)/toolchain/dependencies/dependencies.sh + $(TOPDIR)/support/dependencies/dependencies.sh dependencies: core-dependencies $(DEPENDENCIES_HOST_PREREQ) diff --git a/toolchain/dependencies/dependencies.sh b/support/dependencies/dependencies.sh similarity index 100% rename from toolchain/dependencies/dependencies.sh rename to support/dependencies/dependencies.sh diff --git a/toolchain/toolchain-buildroot.mk b/toolchain/toolchain-buildroot.mk index c611562765..f21cefdb19 100644 --- a/toolchain/toolchain-buildroot.mk +++ b/toolchain/toolchain-buildroot.mk @@ -1,6 +1,5 @@ # Include files required for the internal toolchain backend -include toolchain/dependencies/dependencies.mk include toolchain/elf2flt/elf2flt.mk include toolchain/gcc/gcc-uclibc-4.x.mk include toolchain/gdb/gdb.mk diff --git a/toolchain/toolchain-crosstool-ng.mk b/toolchain/toolchain-crosstool-ng.mk index e480da981c..f6cc2b917e 100644 --- a/toolchain/toolchain-crosstool-ng.mk +++ b/toolchain/toolchain-crosstool-ng.mk @@ -2,7 +2,6 @@ # Explicit ordering: include toolchain/helpers.mk -include toolchain/dependencies/dependencies.mk include toolchain/elf2flt/elf2flt.mk include toolchain/gcc/gcc-uclibc-4.x.mk include toolchain/gdb/gdb.mk diff --git a/toolchain/toolchain-external.mk b/toolchain/toolchain-external.mk index d67405b00b..d5b2aacbd0 100644 --- a/toolchain/toolchain-external.mk +++ b/toolchain/toolchain-external.mk @@ -1,7 +1,6 @@ # Required includes for the external toolchain backend include toolchain/helpers.mk -include toolchain/dependencies/dependencies.mk include toolchain/elf2flt/elf2flt.mk include toolchain/gcc/gcc-uclibc-4.x.mk include toolchain/gdb/gdb.mk -- 2.30.2