Build system: replace TOOLS -> embtk_tools

Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>

9 files changed, 33 insertions, 33 deletions

diff --git a/mk/binutils.mk b/mk/binutils.mk
index 842dce4..253b508 100644
--- a/mk/binutils.mk
+++ b/mk/binutils.mk
@@ -34,7 +34,7 @@ BINUTILS_BUILD_DIR	:= $(TOOLS_BUILD)/binutils-build
 BINUTILS_CONFIGURE_OPTS	:= --with-sysroot=$(SYSROOT) --disable-werror	\
 			--disable-nls --disable-multilib		\
 			--target=$(STRICT_GNU_TARGET)
-BINUTILS_PREFIX		:= $(TOOLS)
+BINUTILS_PREFIX		:= $(embtk_tools)
 
 binutils_install:
 	$(call embtk_install_hostpkg,binutils)
diff --git a/mk/buildsystem.mk b/mk/buildsystem.mk
index 3f19c79..550fb72 100644
--- a/mk/buildsystem.mk
+++ b/mk/buildsystem.mk
@@ -142,7 +142,7 @@ define __embtk_mk_initsysrootdirs
 endef
 
 define __embtk_mk_inittoolsdirs
-	mkdir -p $(TOOLS)
+	mkdir -p $(embtk_tools)
 	mkdir -p $(TOOLS_BUILD)
 endef
 
@@ -174,6 +174,6 @@ define __embtk_kconfig_clean
 endef
 
 rmallpath:
-	$(Q)rm -rf $(PACKAGES_BUILD)* $(ROOTFS)* $(TOOLS)* $(TOOLS_BUILD)*
+	$(Q)rm -rf $(PACKAGES_BUILD)* $(ROOTFS)* $(embtk_tools)* $(TOOLS_BUILD)*
 	$(Q)rm -rf $(SYSROOT)* $(HOSTTOOLS)* $(EMBTK_GENERATED)/rootfs-*
 	$(Q)$(if $(CONFIG_EMBTK_CACHE_PATCHES),,rm -rf $(embtk_dldir)/*.patch)
diff --git a/mk/eglibc.mk b/mk/eglibc.mk
index 1530043..4b67878 100644
--- a/mk/eglibc.mk
+++ b/mk/eglibc.mk
@@ -134,8 +134,8 @@ define embtk_configure_eglibc_headers
 endef
 
 define embtk_install_eglibc
-	PATH=$(PATH):$(TOOLS)/bin/ $(MAKE) -C $(EGLIBC_BUILD_DIR) $(J)
-	PATH=$(PATH):$(TOOLS)/bin/ $(MAKE) -C $(EGLIBC_BUILD_DIR) install	\
+	PATH=$(PATH):$(embtk_tools)/bin/ $(MAKE) -C $(EGLIBC_BUILD_DIR) $(J)
+	PATH=$(PATH):$(embtk_tools)/bin/ $(MAKE) -C $(EGLIBC_BUILD_DIR) install	\
 							install_root=$(SYSROOT)
 	touch $(EGLIBC_BUILD_DIR)/.installed
 endef
diff --git a/mk/gcc.mk b/mk/gcc.mk
index 728a922..e6a871b 100644
--- a/mk/gcc.mk
+++ b/mk/gcc.mk
@@ -73,8 +73,8 @@ GCC1_SRC_DIR		:= $(GCC_SRC_DIR)
 GCC1_BUILD_DIR		:= $(TOOLS_BUILD)/gcc1-build
 GCC1_KCONFIGS_NAME	:= GCC
 
-GCC1_MAKE_ENV		:= PATH=$(PATH):$(TOOLS)/bin
-GCC1_PREFIX		:= $(TOOLS)
+GCC1_MAKE_ENV		:= PATH=$(PATH):$(embtk_tools)/bin
+GCC1_PREFIX		:= $(embtk_tools)
 GCC1_CONFIGURE_OPTS	:= --with-sysroot=$(SYSROOT)				\
 	--target=$(STRICT_GNU_TARGET) $(GCC_WITH_ABI) $(GCC_WITH_ARCH)		\
 	$(GCC_WITH_CPU) $(GCC_WITH_FLOAT) $(GCC_WITH_FPU) $(GCC_WITH_TUNE)	\
@@ -101,8 +101,8 @@ GCC2_SRC_DIR		:= $(GCC_SRC_DIR)
 GCC2_BUILD_DIR		:= $(TOOLS_BUILD)/gcc2-build
 GCC2_KCONFIGS_NAME	:= GCC
 
-GCC2_MAKE_ENV		:= PATH=$(PATH):$(TOOLS)/bin
-GCC2_PREFIX		:= $(TOOLS)
+GCC2_MAKE_ENV		:= PATH=$(PATH):$(embtk_tools)/bin
+GCC2_PREFIX		:= $(embtk_tools)
 GCC2_CONFIGURE_OPTS	:= --with-sysroot=$(SYSROOT)				\
 	--target=$(STRICT_GNU_TARGET) $(GCC_WITH_ABI) $(GCC_WITH_ARCH)		\
 	$(GCC_WITH_CPU) $(GCC_WITH_FLOAT) $(GCC_WITH_FPU) $(GCC_WITH_TUNE)	\
@@ -128,8 +128,8 @@ GCC3_SRC_DIR		:= $(GCC_SRC_DIR)
 GCC3_BUILD_DIR		:= $(TOOLS_BUILD)/gcc3-build
 GCC3_KCONFIGS_NAME	:= GCC
 
-GCC3_MAKE_ENV		:= PATH=$(PATH):$(TOOLS)/bin
-GCC3_PREFIX		:= $(TOOLS)
+GCC3_MAKE_ENV		:= PATH=$(PATH):$(embtk_tools)/bin
+GCC3_PREFIX		:= $(embtk_tools)
 GCC3_CONFIGURE_OPTS	:= --with-sysroot=$(SYSROOT)				\
 	--target=$(STRICT_GNU_TARGET) $(GCC_WITH_ABI) $(GCC_WITH_ARCH)		\
 	$(GCC_WITH_CPU) $(GCC_WITH_FLOAT) $(GCC_WITH_FPU) $(GCC_WITH_TUNE)	\
@@ -152,11 +152,11 @@ endef
 
 $(GCC3_BUILD_DIR)/.gcc3_post_install:
 ifeq ($(CONFIG_EMBTK_32BITS_FS),y)
-	$(Q)-cp -d $(TOOLS)/$(STRICT_GNU_TARGET)/lib/*.so* $(SYSROOT)/lib/
+	$(Q)-cp -d $(embtk_tools)/$(STRICT_GNU_TARGET)/lib/*.so* $(SYSROOT)/lib/
 else ifeq ($(CONFIG_EMBTK_64BITS_FS),y)
-	$(Q)cp -d $(TOOLS)/$(STRICT_GNU_TARGET)/lib64/*.so* $(SYSROOT)/lib/
+	$(Q)cp -d $(embtk_tools)/$(STRICT_GNU_TARGET)/lib64/*.so* $(SYSROOT)/lib/
 else ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y)
-	$(Q)cp -d $(TOOLS)/$(STRICT_GNU_TARGET)/lib32/*.so* $(SYSROOT)/lib32/
+	$(Q)cp -d $(embtk_tools)/$(STRICT_GNU_TARGET)/lib32/*.so* $(SYSROOT)/lib32/
 endif
 ifeq ($(CONFIG_EMBTK_64BITS_FS)$(CONFIG_EMBTK_CLIB_UCLIBC),yy)
 	$(Q)cd $(SYSROOT)/lib/; ln -sf ld-uClibc.so.0 ld64-uClibc.so.0
diff --git a/mk/help.mk b/mk/help.mk
index 91e9dbe..2d0deb1 100644
--- a/mk/help.mk
+++ b/mk/help.mk
@@ -73,7 +73,7 @@ successful_build:
 	$(call embtk_echo_blue," ~~~~~~~~~~~~~~~~~~~~~ ")
 	$(call embtk_echo_blue,"You successfully build your toolchain for $(GNU_TARGET)")
 	$(call embtk_echo_blue,"Tools built (GCC compiler, Binutils, etc.) are located in:")
-	$(call embtk_echo_blue,"    $(TOOLS)/bin")
+	$(call embtk_echo_blue,"    $(embtk_tools)/bin")
 	@echo
 	$(call embtk_echo_blue," ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ")
 	$(call embtk_echo_blue,"| Root file system build log |")
diff --git a/mk/linux.mk b/mk/linux.mk
index 6ac9641..59208f2 100644
--- a/mk/linux.mk
+++ b/mk/linux.mk
@@ -48,7 +48,7 @@ $(LINUX_BUILD_DIR)/.headers_installed:
 	$(call embtk_pinfo,"Installing linux-$(LINUX_VERSION) headers...")
 	$(call embtk_download_pkg,linux)
 	$(call embtk_decompress_pkg,linux)
-	$(Q)PATH=$(PATH):$(TOOLS)/bin/ $(MAKE) -C $(LINUX_BUILD_DIR) 		\
+	$(Q)PATH=$(PATH):$(embtk_tools)/bin/ $(MAKE) -C $(LINUX_BUILD_DIR) 		\
 		headers_install ARCH=$(LINUX_ARCH)				\
 		CROSS_COMPILE=$(STRICT_GNU_TARGET)-				\
 		INSTALL_HDR_PATH=$(SYSROOT)/usr
diff --git a/mk/mtd-utils.mk b/mk/mtd-utils.mk
index dabe04d..11ea4e6 100644
--- a/mk/mtd-utils.mk
+++ b/mk/mtd-utils.mk
@@ -51,7 +51,7 @@ MTDUTILS_MAKE_ENV	+= CPPFLAGS="-I. -I./include -I$(SYSROOT)/usr/include"
 MTDUTILS_MAKE_ENV	+= CFLAGS="$(TARGET_CFLAGS)"
 MTDUTILS_MAKE_ENV	+= BUILDDIR=$(MTDUTILS_BUILD_DIR)
 MTDUTILS_MAKE_ENV	+= DESTDIR=$(SYSROOT)
-MTDUTILS_MAKE_ENV	+= PATH=$(PATH):$(TOOLS)/bin CROSS=$(CROSS_COMPILE)
+MTDUTILS_MAKE_ENV	+= PATH=$(PATH):$(embtk_tools)/bin CROSS=$(CROSS_COMPILE)
 
 mtdutils_install:
 	$(call embtk_makeinstall_pkg,mtdutils)
diff --git a/mk/toolchain.mk b/mk/toolchain.mk
index e7107ca..de59c42 100644
--- a/mk/toolchain.mk
+++ b/mk/toolchain.mk
@@ -23,21 +23,21 @@
 # \date         May 2009
 ################################################################################
 
-TARGETCC		:= $(TOOLS)/bin/$(STRICT_GNU_TARGET)-gcc
-TARGETCXX		:= $(TOOLS)/bin/$(STRICT_GNU_TARGET)-g++
-TARGETAR		:= $(TOOLS)/bin/$(STRICT_GNU_TARGET)-ar
-TARGETRANLIB		:= $(TOOLS)/bin/$(STRICT_GNU_TARGET)-ranlib
-TARGETLD		:= $(TOOLS)/bin/$(STRICT_GNU_TARGET)-ld
-TARGETNM		:= $(TOOLS)/bin/$(STRICT_GNU_TARGET)-nm
-TARGETSTRIP		:= $(TOOLS)/bin/$(STRICT_GNU_TARGET)-strip
-TARGETOBJDUMP		:= $(TOOLS)/bin/$(STRICT_GNU_TARGET)-objdump
-TARGETOBJCOPY		:= $(TOOLS)/bin/$(STRICT_GNU_TARGET)-objcopy
+TARGETCC		:= $(embtk_tools)/bin/$(STRICT_GNU_TARGET)-gcc
+TARGETCXX		:= $(embtk_tools)/bin/$(STRICT_GNU_TARGET)-g++
+TARGETAR		:= $(embtk_tools)/bin/$(STRICT_GNU_TARGET)-ar
+TARGETRANLIB		:= $(embtk_tools)/bin/$(STRICT_GNU_TARGET)-ranlib
+TARGETLD		:= $(embtk_tools)/bin/$(STRICT_GNU_TARGET)-ld
+TARGETNM		:= $(embtk_tools)/bin/$(STRICT_GNU_TARGET)-nm
+TARGETSTRIP		:= $(embtk_tools)/bin/$(STRICT_GNU_TARGET)-strip
+TARGETOBJDUMP		:= $(embtk_tools)/bin/$(STRICT_GNU_TARGET)-objdump
+TARGETOBJCOPY		:= $(embtk_tools)/bin/$(STRICT_GNU_TARGET)-objcopy
 __TARGET_CFLAGS		:= $(subst ",,$(strip $(CONFIG_EMBTK_TARGET_COMPILER_CFLAGS)))
 __TARGET_CFLAGS		+= $(if $(CONFIG_EMBTK_TARGET_SIZE_OPTIMIZED),-Os)
 __TARGET_CFLAGS		+= $(if $(CONFIG_EMBTK_TARGET_SPEED_OPTIMIZED),-O3)
 __TARGET_CFLAGS		+= $(if $(CONFIG_EMBTK_TARGET_WITH_DEBUG_DATA),-g)
 TARGET_CFLAGS		:= $(strip $(__TARGET_CFLAGS))
-CROSS_COMPILE		:= $(TOOLS)/bin/$(STRICT_GNU_TARGET)-
+CROSS_COMPILE		:= $(embtk_tools)/bin/$(STRICT_GNU_TARGET)-
 
 export TARGETCC TARGETCXX TARGETAR TARGETRANLIB TARGETLD TARGETNM
 export TARGETSTRIP TARGETOBJDUMP TARGETOBJCOPY TARGET_CFLAGS CROSS_COMPILE
@@ -120,7 +120,7 @@ define __embtk_toolchain_mkinitdirs
 endef
 
 define __embtk_toolchain_symlinktools
-	cd $(TOOLS)/bin;							\
+	cd $(embtk_tools)/bin;							\
 	tools=$$(ls $(STRICT_GNU_TARGET)-*);					\
 	toolsnames=$$(echo $$tools | sed 's/$(STRICT_GNU_TARGET)-*//g');	\
 	for tool in $$toolsnames; do						\
@@ -130,7 +130,7 @@ endef
 
 define __embtk_toolchain_compress
 	tar -cjf $(TOOLCHAIN_PACKAGE)						\
-		$(notdir $(SYSROOT)) $(notdir $(TOOLS)) &&			\
+		$(notdir $(SYSROOT)) $(notdir $(embtk_tools)) &&			\
 	mv $(TOOLCHAIN_PACKAGE) $(TOOLCHAIN_DIR)/$(TOOLCHAIN_PACKAGE)
 endef
 
@@ -162,7 +162,7 @@ define __embtk_toolchain_build
 		$(foreach dep,$(patsubst %_install,%,$(TOOLCHAIN_DEPS)),
 			$(MAKE) $(dep)_clean;)
 		$(foreach pkg,$(__embtk_rootfs_pkgs-y),$(MAKE) $(pkg)_clean;)
-		rm -rf $(SYSROOT) $(TOOLS)
+		rm -rf $(SYSROOT) $(embtk_tools)
 		$(__embtk_toolchain_mkinitdirs)
 		$(MAKE) $(TOOLCHAIN_PRE_DEPS-y) $(TOOLCHAIN_DEPS)
 		touch $(TOOLCHAIN_DIR)/.installed)
diff --git a/mk/uclibc.mk b/mk/uclibc.mk
index 2432604..be18326 100755
--- a/mk/uclibc.mk
+++ b/mk/uclibc.mk
@@ -48,7 +48,7 @@ uclibc_headers_install:
 $(UCLIBC_BUILD_DIR)/.installed:
 	$(call embtk_pinfo,"Build and install uClibc-$(UCLIBC_VERSION) ...")
 	$(Q)$(MAKE) -C $(UCLIBC_BUILD_DIR) PREFIX=$(SYSROOT)/			\
-		CROSS_COMPILER_PREFIX="$(TOOLS)/bin/$(STRICT_GNU_TARGET)-"	\
+		CROSS_COMPILER_PREFIX="$(embtk_tools)/bin/$(STRICT_GNU_TARGET)-"	\
 		SHARED_LIB_LOADER_PREFIX="/$(LIBDIR)/"				\
 		MULTILIB_DIR="/$(LIBDIR)/"					\
 		RUNTIME_PREFIX="/" DEVEL_PREFIX="/usr/"				\
@@ -64,14 +64,14 @@ $(UCLIBC_BUILD_DIR)/.headers_installed:
 	$(Q)$(embtk_configure_uclibc)
 	$(Q)$(MAKE) -C $(UCLIBC_BUILD_DIR) silentoldconfig
 	$(Q)$(MAKE) -C $(UCLIBC_BUILD_DIR) PREFIX=$(SYSROOT)/			\
-		CROSS_COMPILER_PREFIX="$(TOOLS)/bin/$(STRICT_GNU_TARGET)-"	\
+		CROSS_COMPILER_PREFIX="$(embtk_tools)/bin/$(STRICT_GNU_TARGET)-"	\
 		SHARED_LIB_LOADER_PREFIX="/$(LIBDIR)/"				\
 		MULTILIB_DIR="/$(LIBDIR)/"					\
 		RUNTIME_PREFIX="/" DEVEL_PREFIX="/usr/"				\
 		KERNEL_HEADERS="$(SYSROOT)/usr/include/"			\
 		UCLIBC_EXTRA_CFLAGS="$(EMBTK_UCLIBC_CFLAGS)" install_headers
 	$(Q)$(MAKE) -C $(UCLIBC_BUILD_DIR) PREFIX=$(SYSROOT)/			\
-		CROSS_COMPILER_PREFIX="$(TOOLS)/bin/$(STRICT_GNU_TARGET)-"	\
+		CROSS_COMPILER_PREFIX="$(embtk_tools)/bin/$(STRICT_GNU_TARGET)-"	\
 		SHARED_LIB_LOADER_PREFIX="/$(LIBDIR)/"				\
 		MULTILIB_DIR="/$(LIBDIR)/"					\
 		RUNTIME_PREFIX="/" DEVEL_PREFIX="/usr/"				\