Embtk generic macros: lower macros

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

24 files changed, 206 insertions, 206 deletions

diff --git a/mk/autoconf.mk b/mk/autoconf.mk
index 3f296bd..9a7eedd 100644
--- a/mk/autoconf.mk
+++ b/mk/autoconf.mk
@@ -24,7 +24,7 @@
 ################################################################################
 
 AUTOCONF_NAME		:= autoconf
-AUTOCONF_VERSION	:= $(call EMBTK_GET_PKG_VERSION,AUTOCONF)
+AUTOCONF_VERSION	:= $(call embtk_get_pkgversion,AUTOCONF)
 AUTOCONF_SITE		:= http://ftp.gnu.org/gnu/autoconf
 AUTOCONF_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
 AUTOCONF_PATCH_SITE	:= ftp://ftp.embtoolkit.org/embtoolkit.org/autoconf/$(AUTOCONF_VERSION)
@@ -44,7 +44,7 @@ IFNAMES		:= $(AUTOCONF_DIR)/bin/ifnames
 export AUTOCONF AUTOHEADER AUTOM4TE AUTORECONF AUTOSCAN AUTOUPDATE IFNAMES
 
 autoconf_install:
-	$(call EMBTK_INSTALL_HOSTPKG,AUTOCONF)
+	$(call embtk_install_hostpkg,AUTOCONF)
 
 download_autoconf:
-	$(call EMBTK_DOWNLOAD_PKG,AUTOCONF)
+	$(call embtk_download_pkg,AUTOCONF)
diff --git a/mk/automake.mk b/mk/automake.mk
index a1a9cf9..e7ff310 100644
--- a/mk/automake.mk
+++ b/mk/automake.mk
@@ -24,7 +24,7 @@
 ################################################################################
 
 AUTOMAKE_NAME		:= automake
-AUTOMAKE_VERSION	:= $(call EMBTK_GET_PKG_VERSION,AUTOMAKE)
+AUTOMAKE_VERSION	:= $(call embtk_get_pkgversion,AUTOMAKE)
 AUTOMAKE_SITE		:= http://ftp.gnu.org/gnu/automake
 AUTOMAKE_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
 AUTOMAKE_PATCH_SITE	:= ftp://ftp.embtoolkit.org/embtoolkit.org/automake/$(AUTOMAKE_VERSION)
@@ -38,7 +38,7 @@ AUTOMAKE	:= $(AUTOMAKE_DIR)/bin/automake
 export ACLOCAL AUTOMAKE
 
 automake_install:
-	$(call EMBTK_INSTALL_HOSTPKG,AUTOMAKE)
+	$(call embtk_install_hostpkg,AUTOMAKE)
 
 download_automake:
-	$(call EMBTK_DOWNLOAD_PKG,AUTOMAKE)
+	$(call embtk_download_pkg,AUTOMAKE)
diff --git a/mk/binutils.mk b/mk/binutils.mk
index 08562c6..f6bf309 100644
--- a/mk/binutils.mk
+++ b/mk/binutils.mk
@@ -24,7 +24,7 @@
 ################################################################################
 
 BINUTILS_NAME := binutils
-BINUTILS_VERSION := $(call EMBTK_GET_PKG_VERSION,BINUTILS)
+BINUTILS_VERSION := $(call embtk_get_pkgversion,BINUTILS)
 BINUTILS_SITE := http://ftp.gnu.org/gnu/binutils
 BINUTILS_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
 BINUTILS_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/binutils/$(BINUTILS_VERSION)
@@ -43,13 +43,13 @@ $(BINUTILS_BUILD_DIR)/.installed: download_binutils \
 	@touch $@
 
 download_binutils:
-	$(call EMBTK_DOWNLOAD_PKG,BINUTILS)
+	$(call embtk_download_pkg,BINUTILS)
 
 $(BINUTILS_BUILD_DIR)/.decompressed:
-	$(call EMBTK_DECOMPRESS_HOSTPKG,BINUTILS)
+	$(call embtk_decompress_hostpkg,BINUTILS)
 
 $(BINUTILS_BUILD_DIR)/.configured:
-	$(call EMBTK_GENERIC_MESSAGE,"binutils: Configuring \
+	$(call embtk_generic_message,"binutils: Configuring \
 	binutils-$(BINUTILS_VERSION) ...")
 	cd $(BINUTILS_BUILD_DIR); CC=$(HOSTCC_CACHED) CXX=$(HOSTCXX_CACHED) \
 	$(TOOLS_BUILD)/binutils-$(BINUTILS_VERSION)/configure \
diff --git a/mk/ccache.mk b/mk/ccache.mk
index bfde74f..dfe9534 100644
--- a/mk/ccache.mk
+++ b/mk/ccache.mk
@@ -55,13 +55,13 @@ ccache_download:
 	$(CCACHE_SITE)/$(CCACHE_PACKAGE)
 
 $(CCACHE_HOST_BUILD_DIR)/.decompressed:
-	$(call EMBTK_GENERIC_MESSAGE,"Decompressing $(CCACHE_PACKAGE) ...")
+	$(call embtk_generic_message,"Decompressing $(CCACHE_PACKAGE) ...")
 	@tar -C $(TOOLS_BUILD) -xjf $(DOWNLOAD_DIR)/$(CCACHE_PACKAGE)
 	@mkdir -p $(CCACHE_HOST_BUILD_DIR)
 	@touch $@
 
 $(CCACHE_HOST_BUILD_DIR)/.configured:
-	$(call EMBTK_GENERIC_MESSAGE,"Configure ccache-$(CCACHE_VERSION) ...")
+	$(call embtk_generic_message,"Configure ccache-$(CCACHE_VERSION) ...")
 	cd $(CCACHE_HOST_BUILD_DIR) ; \
 	$(TOOLS_BUILD)/ccache-$(CCACHE_VERSION)/configure \
 	--prefix=$(CCACHE_HOST_DIR) \
diff --git a/mk/cmake.mk b/mk/cmake.mk
index 838c108..86903b1 100644
--- a/mk/cmake.mk
+++ b/mk/cmake.mk
@@ -43,21 +43,21 @@ $(CMAKE_BUILD_DIR)/.installed: download_cmake \
 	@touch $@
 
 download_cmake:
-	$(call EMBTK_GENERIC_MESSAGE,"Downloading $(CMAKE_PACKAGE) if \
+	$(call embtk_generic_message,"Downloading $(CMAKE_PACKAGE) if \
 	necessary...")
 	@test -e $(DOWNLOAD_DIR)/$(CMAKE_PACKAGE) || \
 	wget -O $(DOWNLOAD_DIR)/$(CMAKE_PACKAGE) \
 	$(CMAKE_SITE)/$(CMAKE_PACKAGE)
 
 $(CMAKE_BUILD_DIR)/.decompressed:
-	$(call EMBTK_GENERIC_MESSAGE,"Decompressing $(CMAKE_PACKAGE)...")
+	$(call embtk_generic_message,"Decompressing $(CMAKE_PACKAGE)...")
 	@tar -C $(TOOLS_BUILD) -xzf $(DOWNLOAD_DIR)/$(CMAKE_PACKAGE)
 	@mkdir -p $(CMAKE_BUILD_DIR)
 	@mkdir -p $(CMAKE_DIR)
 	@touch $@
 
 $(CMAKE_BUILD_DIR)/.configured:
-	$(call EMBTK_GENERIC_MESSAGE,"Configuring \
+	$(call embtk_generic_message,"Configuring \
 	cmake_$(CMAKE_VERSION)...")
 	@cd $(CMAKE_BUILD_DIR); \
 	$(TOOLS_BUILD)/cmake-$(CMAKE_VERSION)/configure \
diff --git a/mk/eglibc.mk b/mk/eglibc.mk
index 0b22737..90eb350 100644
--- a/mk/eglibc.mk
+++ b/mk/eglibc.mk
@@ -68,7 +68,7 @@ $(EGLIBC_HEADERS_BUILD_DIR)/.installed: eglibc_download \
 	@touch $@
 
 eglibc_download:
-	$(call EMBTK_GENERIC_MESSAGE,"downloading eglibc-$(EGLIBC_VERSION) \
+	$(call embtk_generic_message,"downloading eglibc-$(EGLIBC_VERSION) \
 	if necessary ...")
 ifeq ($(CONFIG_EMBTK_EGLIBC_VERSION_STRING),"trunk")
 	@cd $(EMBTK_ROOT)/src; \
@@ -145,7 +145,7 @@ $(EGLIBC_BUILD_DIR)/.configured:
 	@touch $@
 
 EGLIBC_OPTIONS_PARSE:
-	$(call EMBTK_GENERIC_MESSAGE,"Parsing \
+	$(call embtk_generic_message,"Parsing \
 	eglibc-$(EGLIBC_VERSION) option groups...")
 	@cat $(OPTION_GROUPS_FILE) > $(EGLIBC_HEADERS_BUILD_DIR)/option-groups.config
 	@echo "#######################################################" >> $(EGLIBC_HEADERS_BUILD_DIR)/option-groups.config
diff --git a/mk/fakeroot.mk b/mk/fakeroot.mk
index d912daa..185bc93 100644
--- a/mk/fakeroot.mk
+++ b/mk/fakeroot.mk
@@ -25,7 +25,7 @@
 ################################################################################
 
 FAKEROOT_NAME		:= fakeroot
-FAKEROOT_VERSION	:= $(call EMBTK_GET_PKG_VERSION,FAKEROOT)
+FAKEROOT_VERSION	:= $(call embtk_get_pkgversion,FAKEROOT)
 FAKEROOT_SITE		:= http://ftp.debian.org/debian/pool/main/f/fakeroot
 FAKEROOT_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
 FAKEROOT_PATCH_SITE	:= ftp://ftp.embtoolkit.org/embtoolkit.org/fakeroot/$(FAKEROOT_VERSION)
@@ -39,7 +39,7 @@ FAKEROOT_ENV_FILE	:= $(EMBTK_ROOT)/.fakeroot.001
 export FAKEROOT_BIN FAKEROOT_ENV_FILE
 
 fakeroot_install:
-	$(call EMBTK_INSTALL_HOSTPKG,FAKEROOT)
+	$(call embtk_install_hostpkg,FAKEROOT)
 
 download_fakeroot:
-	$(call EMBTK_DOWNLOAD_PKG,FAKEROOT)
+	$(call embtk_download_pkg,FAKEROOT)
diff --git a/mk/fs.mk b/mk/fs.mk
index 38867de..5330ec9 100644
--- a/mk/fs.mk
+++ b/mk/fs.mk
@@ -29,18 +29,18 @@ SQUASHFS_ROOTFS		:= $(EMBTK_GENERATED)/rootfs-$(GNU_TARGET)-$(EMBTK_MCU_FLAG).sq
 INITRAMFS_ROOTFS	:= $(EMBTK_GENERATED)/initramfs-$(GNU_TARGET)-$(EMBTK_MCU_FLAG)
 
 build_rootfs_devnodes:
-	$(call EMBTK_GENERIC_MSG,"Populating device nodes of the rootfs...")
+	$(call embtk_generic_msg,"Populating device nodes of the rootfs...")
 	@$(FAKEROOT_BIN) -s $(FAKEROOT_ENV_FILE) -- $(MAKEDEVS_DIR)/makedevs \
 	-d $(EMBTK_ROOT)/src/devices_table.txt $(ROOTFS)
 
 build_tarbz2_rootfs:
-	$(call EMBTK_GENERIC_MSG,"Generating TAR.BZ2 file of the rootfs...")
+	$(call embtk_generic_msg,"Generating TAR.BZ2 file of the rootfs...")
 	@cd $(ROOTFS) ; $(FAKEROOT_BIN) -i $(FAKEROOT_ENV_FILE) -- \
 	tar cjf rootfs-$(GNU_TARGET)-$(EMBTK_MCU_FLAG).tar.bz2 * ; \
 	mv $(BZIP2_ROOTFS) $(EMBTK_GENERATED)/
 
 build_jffs2_rootfs:
-	$(call EMBTK_GENERIC_MSG,"Generating JFFS2 rootfs..")
+	$(call embtk_generic_msg,"Generating JFFS2 rootfs..")
 	@$(FAKEROOT_BIN) -i $(FAKEROOT_ENV_FILE) -- \
 	$(HOSTTOOLS)/usr/sbin/mkfs.jffs2 \
 	--eraseblock=$(CONFIG_EMBTK_ROOTFS_HAVE_JFFS2_ERASEBLOCKSIZE) \
@@ -60,12 +60,12 @@ build_jffs2_rootfs:
 	@rm -rf $(JFFS2_ROOTFS).temp
 
 build_squashfs_rootfs:
-	$(call EMBTK_GENERIC_MSG,"Generating SQUASHFS rootfs...")
+	$(call embtk_generic_msg,"Generating SQUASHFS rootfs...")
 	$(FAKEROOT_BIN) -i $(FAKEROOT_ENV_FILE) -- \
 	$(MKSQUASHFS_BIN) $(ROOTFS) $(SQUASHFS_ROOTFS)
 
 build_initramfs_archive:
-	$(call EMBTK_GENERIC_MSG,"Generating cpio archive for INITRAMFS...")
+	$(call embtk_generic_msg,"Generating cpio archive for INITRAMFS...")
 	@$(FAKEROOT_BIN) -i $(FAKEROOT_ENV_FILE) -- \
 	$(EMBTK_ROOT)/scripts/mkinitramfs $(ROOTFS) \
 	$(if $(EMBTK_ROOTFS_HAVE_INITRAMFS_CPIO_GZIPED),gzip,bzip2) \
diff --git a/mk/gmphost.mk b/mk/gmphost.mk
index 4fb6ec5..89bfe61 100644
--- a/mk/gmphost.mk
+++ b/mk/gmphost.mk
@@ -48,7 +48,7 @@ $(GMP_HOST_BUILD_DIR)/.decompressed:
 	@touch $@
 
 $(GMP_HOST_BUILD_DIR)/.configured:
-	$(call EMBTK_GENERIC_MESSAGE,"gmphost: Configuring \
+	$(call embtk_generic_message,"gmphost: Configuring \
 	gmp-$(GMP_HOST_VERSION) ...")
 	@mkdir -p $(GMP_HOST_DIR)
 	cd $(GMP_HOST_BUILD_DIR); CC=$(HOSTCC_CACHED) CXX=$(HOSTCXX_CACHED) \
diff --git a/mk/kernel-headers.mk b/mk/kernel-headers.mk
index 79ef380..81cc942 100644
--- a/mk/kernel-headers.mk
+++ b/mk/kernel-headers.mk
@@ -31,9 +31,9 @@ __LINUX_SITE		= $(strip $(if $(CONFIG_EMBTK_LINUX_HAVE_MIRROR),	\
 	$(__LINUX_SITE_BASE)/$(LINUX_MAJORV)$(__LINUX_SITE_LONGTERM)))
 
 LINUX_NAME		:= linux
-LINUX_MAJORV		:= $(call EMBTK_GET_PKG_VERSION,LINUX_MAJOR)
-LINUX_LONGTERMV		:= $(call EMBTK_GET_PKG_VERSION,LINUX_LONGTERM)
-LINUX_VERSION		:= $(call EMBTK_GET_PKG_VERSION,LINUX)
+LINUX_MAJORV		:= $(call embtk_get_pkgversion,LINUX_MAJOR)
+LINUX_LONGTERMV		:= $(call embtk_get_pkgversion,LINUX_LONGTERM)
+LINUX_VERSION		:= $(call embtk_get_pkgversion,LINUX)
 LINUX_SITE		:= $(call __LINUX_SITE)
 LINUX_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
 LINUX_PACKAGE		:= linux-$(LINUX_VERSION).tar.bz2
@@ -49,8 +49,8 @@ kernel-headers_install:  download_linux $(LINUX_BUILD_DIR)/.decompressed
 	$(MAKE) -C $(LINUX_BUILD_DIR) headers_install INSTALL_HDR_PATH=$(HOSTTOOLS)/usr
 
 download_linux: 
-	$(call EMBTK_DOWNLOAD_PKG,LINUX)
+	$(call embtk_download_pkg,LINUX)
 
 $(LINUX_BUILD_DIR)/.decompressed:
-	$(call EMBTK_DECOMPRESS_HOSTPKG,LINUX)
+	$(call embtk_decompress_hostpkg,LINUX)
 
diff --git a/mk/libtool.mk b/mk/libtool.mk
index 0e2c56f..0aa7943 100644
--- a/mk/libtool.mk
+++ b/mk/libtool.mk
@@ -24,7 +24,7 @@
 ################################################################################
 
 LIBTOOL_NAME		:= libtool
-LIBTOOL_VERSION		:= $(call EMBTK_GET_PKG_VERSION,LIBTOOL)
+LIBTOOL_VERSION		:= $(call embtk_get_pkgversion,LIBTOOL)
 LIBTOOL_SITE		:= http://ftp.gnu.org/gnu/libtool
 LIBTOOL_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
 LIBTOOL_PATCH_SITE	:= ftp://ftp.embtoolkit.org/embtoolkit.org/libtool/$(LIBTOOL_VERSION)
@@ -39,4 +39,4 @@ export LIBTOOL LIBTOOLIZE
 LIBTOOL_CONFIGURE_OPTS := --disable-ltdl-install
 
 libtool_install:
-	$(call EMBTK_INSTALL_HOSTPKG,LIBTOOL)
+	$(call embtk_install_hostpkg,LIBTOOL)
diff --git a/mk/m4.mk b/mk/m4.mk
index b9919f5..c4dd1ab 100644
--- a/mk/m4.mk
+++ b/mk/m4.mk
@@ -24,7 +24,7 @@
 ################################################################################
 
 M4_NAME		:= m4
-M4_VERSION	:= $(call EMBTK_GET_PKG_VERSION,M4)
+M4_VERSION	:= $(call embtk_get_pkgversion,M4)
 M4_SITE		:= http://ftp.gnu.org/gnu/m4
 M4_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
 M4_PATCH_SITE	:= ftp://ftp.embtoolkit.org/embtoolkit.org/m4/$(M4_VERSION)
@@ -39,7 +39,7 @@ M4	:= $(M4_BIN)
 export M4
 
 m4_install:
-	$(call EMBTK_INSTALL_HOSTPKG,M4)
+	$(call embtk_install_hostpkg,M4)
 
 download_m4:
-	$(call EMBTK_DOWNLOAD_PKG,M4)
+	$(call embtk_download_pkg,M4)
diff --git a/mk/macros.mk b/mk/macros.mk
index 0edccdf..66fbbfc 100644
--- a/mk/macros.mk
+++ b/mk/macros.mk
@@ -24,37 +24,37 @@
 ################################################################################
 
 # Embtoolkit colors
-EMBTK_COLOR_RED = "\E[1;31m"
-EMBTK_COLOR_GREEN = "\E[1;32m"
-EMBTK_COLOR_YELLOW = "\E[1;33m"
-EMBTK_COLOR_BLUE = "\E[1;34m"
-EMBTK_NO_COLOR = "\E[0m"
+__embtk_color_red = "\E[1;31m"
+__embtk_color_green = "\E[1;32m"
+__embtk_color_yellow = "\E[1;33m"
+__embtk_color_blue = "\E[1;34m"
+__embtk_no_color = "\E[0m"
 
 # echo colored text
-#usage $(call ECHO_RED,$(TEXT))
-define ECHO_RED
-	@echo -e $(EMBTK_COLOR_RED)$(1)$(EMBTK_NO_COLOR)
+#usage $(call embtk_echo_red,$(TEXT))
+define embtk_echo_red
+	@echo -e $(__embtk_color_red)$(1)$(__embtk_no_color)
 endef
-#usage $(call ECHO_GREEN,$(TEXT))
-define ECHO_GREEN
-	@echo -e $(EMBTK_COLOR_GREEN)$(1)$(EMBTK_NO_COLOR)
+#usage $(call embtk_echo_green,$(TEXT))
+define embtk_echo_green
+	@echo -e $(__embtk_color_green)$(1)$(__embtk_no_color)
 endef
-#usage $(call ECHO_YELLOW,$(TEXT))
-define ECHO_YELLOW
-	@echo -e $(EMBTK_COLOR_YELLOW)$(1)$(EMBTK_NO_COLOR)
+#usage $(call echo_yellow,$(TEXT))
+define echo_yellow
+	@echo -e $(__embtk_color_yellow)$(1)$(__embtk_no_color)
 endef
-#usage $(call ECHO_BLUE,$(TEXT))
-define ECHO_BLUE
-	@echo -e $(EMBTK_COLOR_BLUE)$(1)$(EMBTK_NO_COLOR)
+#usage $(call embtk_echo_blue,$(TEXT))
+define embtk_echo_blue
+	@echo -e $(__embtk_color_blue)$(1)$(__embtk_no_color)
 endef
 
 #
 # wget wrapper
-# usage: $(call EMBTK_WGET,$(OUTPUT_FILE),$(SITE),$(FOREIGN_FILE))
+# usage: $(call embtk_wget,$(OUTPUT_FILE),$(SITE),$(FOREIGN_FILE))
 #
-__WGET_OPTS = --tries=5 --timeout=10 --waitretry=5
-define EMBTK_WGET
-	wget $(__WGET_OPTS) -O $(DOWNLOAD_DIR)/$(strip $(1))		\
+__wget_opts = --tries=5 --timeout=10 --waitretry=5
+define embtk_wget
+	wget $(__wget_opts) -O $(DOWNLOAD_DIR)/$(strip $(1))		\
 	$(strip $(2))/$(strip $(3)) ||					\
 	wget $(__WGET_OPTS) --no-passive-ftp -O 			\
 	$(DOWNLOAD_DIR)/$(strip $(1))	$(strip $(2))/$(strip $(3))
@@ -63,86 +63,86 @@ endef
 #Decompress message
 #usage $(call EMBTK_DECOMPRESS_MSG,$(NAME_PACKAGE))
 define EMBTK_DECOMPRESS_MSG
-	$(call ECHO_BLUE,"################################################################################")
-	$(call ECHO_BLUE,"# EmbToolkit # Decompressing $(1)")
-	$(call ECHO_BLUE,"################################################################################")
+	$(call embtk_echo_blue,"################################################################################")
+	$(call embtk_echo_blue,"# EmbToolkit # Decompressing $(1)")
+	$(call embtk_echo_blue,"################################################################################")
 endef
 
 #Configure message
 #usage $(call EMBTK_CONFIGURE_MSG,$(NAME_PACKAGE))
 define EMBTK_CONFIGURE_MSG
-	$(call ECHO_BLUE,"################################################################################")
-	$(call ECHO_BLUE,"# EmbToolkit # Configuring $(1)")
-	$(call ECHO_BLUE,"################################################################################")
+	$(call embtk_echo_blue,"################################################################################")
+	$(call embtk_echo_blue,"# EmbToolkit # Configuring $(1)")
+	$(call embtk_echo_blue,"################################################################################")
 endef
 
 #Build message
 #usage $(call EMBTK_BUILD_MSG,$(NAME_PACKAGE))
 define EMBTK_BUILD_MSG
-	$(call ECHO_BLUE,"################################################################################")
-	$(call ECHO_BLUE,"# EmbToolkit # Building $(1)")
-	$(call ECHO_BLUE,"################################################################################")
+	$(call embtk_echo_blue,"################################################################################")
+	$(call embtk_echo_blue,"# EmbToolkit # Building $(1)")
+	$(call embtk_echo_blue,"################################################################################")
 endef
 
 #Install message
 #usage $(call EMBTK_INSTALL_MSG,$(NAME_PACKAGE))
 define EMBTK_INSTALL_MSG
-	$(call ECHO_BLUE,"################################################################################")
-	$(call ECHO_BLUE,"# EmbToolkit # Installing $(1)")
-	$(call ECHO_BLUE,"################################################################################")
+	$(call embtk_echo_blue,"################################################################################")
+	$(call embtk_echo_blue,"# EmbToolkit # Installing $(1)")
+	$(call embtk_echo_blue,"################################################################################")
 endef
 
 #Install message
-#usage $(call EMBTK_ERROR_MSG,$(MESSAGE))
-define EMBTK_ERROR_MSG
-	$(call ECHO_RED,"################################################################################")
-	$(call ECHO_RED,"# EmbToolkit # ERROR: $(1)")
-	$(call ECHO_RED,"################################################################################")
+#usage $(call embtk_error_msg,$(MESSAGE))
+define embtk_error_msg
+	$(call embtk_echo_red,"################################################################################")
+	$(call embtk_echo_red,"# EmbToolkit # ERROR: $(1)")
+	$(call embtk_echo_red,"################################################################################")
 endef
 
 #Generic message
-#usage $(call EMBTK_GENERIC_MESSAGE,$(GENERIC_MESSAGE))
-define EMBTK_GENERIC_MESSAGE
-	$(call ECHO_BLUE,"################################################################################")
-	$(call ECHO_BLUE,"# EmbToolkit # $(1)")
-	$(call ECHO_BLUE,"################################################################################")
+#usage $(call embtk_generic_message,$(GENERIC_MESSAGE))
+define embtk_generic_message
+	$(call embtk_echo_blue,"################################################################################")
+	$(call embtk_echo_blue,"# EmbToolkit # $(1)")
+	$(call embtk_echo_blue,"################################################################################")
 endef
-define EMBTK_GENERIC_MSG
-	$(call EMBTK_GENERIC_MESSAGE,$(1))
+define embtk_generic_msg
+	$(call embtk_generic_message,$(1))
 endef
 
 #Successful build of EmbToolkit message
 successful_build:
-	$(call ECHO_BLUE," --------------------- ")
-	$(call ECHO_BLUE,"| Toolchain build log |")
-	$(call ECHO_BLUE," --------------------- ")
-	$(call ECHO_BLUE,"You successfully build your toolchain for $(GNU_TARGET)")
-	$(call ECHO_BLUE,"Tools built (GCC compiler, Binutils, etc.) are located in:")
-	$(call ECHO_BLUE,"    $(TOOLS)/bin")
+	$(call embtk_echo_blue," --------------------- ")
+	$(call embtk_echo_blue,"| Toolchain build log |")
+	$(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")
 	@echo
-	$(call ECHO_BLUE," ---------------------------- ")
-	$(call ECHO_BLUE,"| Root file system build log |")
-	$(call ECHO_BLUE," ---------------------------- ")
+	$(call embtk_echo_blue," ---------------------------- ")
+	$(call embtk_echo_blue,"| Root file system build log |")
+	$(call embtk_echo_blue," ---------------------------- ")
 ifeq ($(CONFIG_EMBTK_HAVE_ROOTFS),y)
-	$(call ECHO_BLUE,"You also successfully build root filesystem(s) located in the")
-	$(call ECHO_BLUE,"'generated' sub-directory of EmbToolkit.")
+	$(call embtk_echo_blue,"You also successfully build root filesystem(s) located in the")
+	$(call embtk_echo_blue,"'generated' sub-directory of EmbToolkit.")
 else
-	$(call ECHO_GREEN,"Build of root filesystem not selected.")
+	$(call embtk_echo_green,"Build of root filesystem not selected.")
 endif
 	@echo
-	$(call ECHO_BLUE," ---------------------------- ")
-	$(call ECHO_BLUE,"| Embedded systems Toolkit   |")
-	$(call ECHO_BLUE," ---------------------------- ")
-	$(call ECHO_BLUE,"Hope that EmbToolkit will be useful for your project !!!")
-	$(call ECHO_BLUE,"Please report any bugs/suggestion at:")
-	$(call ECHO_BLUE,"   http://www.embtoolkit.org/issues/projects/show/embtoolkit")
-	$(call ECHO_BLUE,"You can also visit the wiki at:")
-	$(call ECHO_BLUE,"   http://www.embtoolkit.org")
+	$(call embtk_echo_blue," ---------------------------- ")
+	$(call embtk_echo_blue,"| Embedded systems Toolkit   |")
+	$(call embtk_echo_blue," ---------------------------- ")
+	$(call embtk_echo_blue,"Hope that EmbToolkit will be useful for your project !!!")
+	$(call embtk_echo_blue,"Please report any bugs/suggestion at:")
+	$(call embtk_echo_blue,"   http://www.embtoolkit.org/issues/projects/show/embtoolkit")
+	$(call embtk_echo_blue,"You can also visit the wiki at:")
+	$(call embtk_echo_blue,"   http://www.embtoolkit.org")
 	@echo
-	$(call ECHO_BLUE,"################################################################################")
+	$(call embtk_echo_blue,"################################################################################")
 
 #Macro to adapt libtool files (*.la) for cross compiling
-define __EMBTK_FIX_LIBTOOL_FILES
+define __embtk_fix_libtool_files
 	@LIBTOOLS_LA_FILES=`find $(SYSROOT)/usr/$(LIBDIR) -name *.la`;			\
 	for i in $$LIBTOOLS_LA_FILES; do						\
 	sed -e "s;libdir='\/usr\/$(LIBDIR)';libdir='$(SYSROOT)\/usr\/$(LIBDIR)';" $$i	\
@@ -151,7 +151,7 @@ define __EMBTK_FIX_LIBTOOL_FILES
 	done
 endef
 libtool_files_adapt:
-	$(Q)$(call __EMBTK_FIX_LIBTOOL_FILES)
+	$(Q)$(call __embtk_fix_libtool_files)
 
 #Macro to restore libtool files (*.la)
 libtool_files_restore:
@@ -174,7 +174,7 @@ else
 endif
 
 #Macro to adapt pkg-config files for cross compiling
-define __EMBTK_FIX_PKGCONFIG_FILES
+define __embtk_fix_pkgconfig_files
 	@PKGCONFIG_FILES=`find $(SYSROOT)/usr/$(LIBDIR)/pkgconfig -name *.pc`;	\
 	for i in $$PKGCONFIG_FILES; do						\
 	sed -e 's;prefix=.*;prefix=$(SYSROOT)/usr;'				\
@@ -184,10 +184,10 @@ define __EMBTK_FIX_PKGCONFIG_FILES
 	done
 endef
 pkgconfig_files_adapt:
-	$(Q)$(call __EMBTK_FIX_PKGCONFIG_FILES)
+	$(Q)$(call __embtk_fix_pkgconfig_files)
 
 #A macro to remove rpath in packages that use libtool -rpath
-define EMBTK_KILL_LT_RPATH
+define __embtk_kill_lt_rpath
 	@cd $(strip $(1)); \
 	LOCAL_LT_FILES=`find -type f -name libtool`; \
 	for i in $$LOCAL_LT_FILES; \
@@ -199,17 +199,17 @@ endef
 
 #
 # A macro to get packages version from .config file.
-# usage: $(call EMBTK_GET_PKG_VERSION,PACKAGE)
+# usage: $(call embtk_get_pkgversion,PACKAGE)
 #
-EMBTK_GET_PKG_VERSION = $(subst ",,$(strip $(CONFIG_EMBTK_$(1)_VERSION_STRING)))
+embtk_get_pkgversion = $(subst ",,$(strip $(CONFIG_EMBTK_$(1)_VERSION_STRING)))
 
 #
 # A macro which runs configure script (conpatible with autotools configure)
 # for a package and sets environment variables correctly.
 # Usage:
-# $(call EMBTK_CONFIGURE_PKG,PACKAGE)
+# $(call embtk_configure_pkg,PACKAGE)
 #
-define EMBTK_CONFIGURE_AUTORECONF_PKG
+define __embtk_configure_autoreconfpkg
 @if [ "x$(CONFIG_EMBTK_$(1)_NEED_AUTORECONF)" == "xy" ]; then		\
 	test -e $($(1)_SRC_DIR)/configure.ac ||				\
 	test -e $($(1)_SRC_DIR)/configure.in || exit 1;			\
@@ -217,16 +217,16 @@ define EMBTK_CONFIGURE_AUTORECONF_PKG
 	$(AUTORECONF) --install -f;					\
 fi
 endef
-define EMBTK_PRINT_CONFIGURE_OPTS
-	$(call ECHO_BLUE,"Configure options:")
+define __embtk_print_configure_opts
+	$(call embtk_echo_blue,"Configure options:")
 	@for i in `echo $(1) | tr " " "\n"`; \
-	do echo -e $(EMBTK_COLOR_BLUE)$$i$(EMBTK_NO_COLOR); done
+	do echo -e $(__embtk_color_blue)$$i$(__embtk_no_color); done
 endef
-define EMBTK_CONFIGURE_PKG
-	$(call EMBTK_GENERIC_MSG,"Configure $($(1)_PACKAGE)...")
-	$(call EMBTK_CONFIGURE_AUTORECONF_PKG,$(1))
+define embtk_configure_pkg
+	$(call embtk_generic_msg,"Configure $($(1)_PACKAGE)...")
+	$(call __embtk_configure_autoreconfpkg,$(1))
 	@test -e $($(1)_SRC_DIR)/configure || exit 1
-	$(call EMBTK_PRINT_CONFIGURE_OPTS,"$($(1)_CONFIGURE_OPTS)")
+	$(call __embtk_print_configure_opts,"$($(1)_CONFIGURE_OPTS)")
 	@cd $($(1)_BUILD_DIR);						\
 	CC=$(TARGETCC_CACHED)						\
 	CXX=$(TARGETCXX_CACHED)						\
@@ -253,7 +253,7 @@ define EMBTK_CONFIGURE_PKG
 	--prefix=/usr --sysconfdir=/etc --disable-rpath			\
 	$($(1)_CONFIGURE_OPTS)
 	@touch $($(1)_BUILD_DIR)/.configured
-	$(call EMBTK_KILL_LT_RPATH,$($(1)_BUILD_DIR))
+	$(call __embtk_kill_lt_rpath,$($(1)_BUILD_DIR))
 endef
 
 #
@@ -261,13 +261,13 @@ endef
 # for a package for host development machine and sets environment variables
 # correctly.
 # Usage:
-# $(call EMBTK_CONFIGURE_HOSTPKG,PACKAGE)
+# $(call embtk_configure_hostpkg,PACKAGE)
 #
-define EMBTK_CONFIGURE_HOSTPKG
-	$(call EMBTK_GENERIC_MSG,"Configure $($(1)_PACKAGE) for host...")
-	$(call EMBTK_CONFIGURE_AUTORECONF_PKG,$(1))
+define embtk_configure_hostpkg
+	$(call embtk_generic_msg,"Configure $($(1)_PACKAGE) for host...")
+	$(call __embtk_configure_autoreconfpkg,$(1))
 	@test -e $($(1)_SRC_DIR)/configure || exit 1
-	$(call EMBTK_PRINT_CONFIGURE_OPTS,"$($(1)_CONFIGURE_OPTS)")
+	$(call __embtk_print_configure_opts,"$($(1)_CONFIGURE_OPTS)")
 	@cd $($(1)_BUILD_DIR);						\
 	CPPFLAGS="-I$(HOSTTOOLS)/usr/include"				\
 	LDFLAGS="-L$(HOSTTOOLS)/$(LIBDIR) -L$(HOSTTOOLS)/usr/$(LIBDIR)"	\
@@ -282,119 +282,119 @@ endef
 #
 # A macro to install automatically a package intended to run on the target.
 # Usage:
-# $(call EMBTK_INSTALL_PKG,PACKAGE)
+# $(call embtk_install_pkg,PACKAGE)
 #
-__EMBTK_MULTI_MAKE = $(foreach builddir,$($(1)_MAKE_DIRS),			\
+__embtk_multi_make = $(foreach builddir,$($(1)_MAKE_DIRS),			\
 				$(MAKE) -C $($(1)_BUILD_DIR)/$(builddir)	\
 				$($(1)_MAKE_OPTS) $(J);)
 
-__EMBTK_SINGLE_MAKE = $(MAKE) -C $($(1)_BUILD_DIR) $($(1)_MAKE_OPTS) $(J)
+__embtk_single_make = $(MAKE) -C $($(1)_BUILD_DIR) $($(1)_MAKE_OPTS) $(J)
 
-__EMBTK_MULTI_MAKE_INSTALL = $(foreach builddir,$($(1)_MAKE_DIRS),		\
+__embtk_multi_make_install = $(foreach builddir,$($(1)_MAKE_DIRS),		\
 	$(MAKE) -C $($(1)_BUILD_DIR)/$(builddir)				\
 	DESTDIR=$(SYSROOT)/$($(1)_SYSROOT_SUFFIX) $($(1)_MAKE_OPTS) install;)
 
-__EMBTK_SINGLE_MAKE_INSTALL = $(MAKE) -C $($(1)_BUILD_DIR)			\
+__embtk_single_make_install = $(MAKE) -C $($(1)_BUILD_DIR)			\
 	DESTDIR=$(SYSROOT)/$($(1)_SYSROOT_SUFFIX) $($(1)_MAKE_OPTS) install
 
-__EMBTK_MULTI_MAKE_HOSTINSTALL = $(foreach builddir,$($(1)_MAKE_DIRS),		\
+__embtk_multi_make_hostinstall = $(foreach builddir,$($(1)_MAKE_DIRS),		\
 	$(MAKE) -C $($(1)_BUILD_DIR)/$(builddir)				\
 	$(if $($(1)_DESTDIR),DESTDIR=$($(1)_DESTDIR))				\
 	$($(1)_MAKE_OPTS) install;)
 
-__EMBTK_SINGLE_MAKE_HOSTINSTALL = $(MAKE) -C $($(1)_BUILD_DIR)			\
+__embtk_single_make_hostinstall = $(MAKE) -C $($(1)_BUILD_DIR)			\
 	$(if $($(1)_DESTDIR),DESTDIR=$($(1)_DESTDIR)) $($(1)_MAKE_OPTS) install
 
-define __EMBTK_INSTALL_PKG_MAKE
-	$(call EMBTK_GENERIC_MSG,"Compiling and installing $($(1)_NAME)-$($(1)_VERSION) in your root filesystem...")
+define __embtk_install_pkg_make
+	$(call embtk_generic_msg,"Compiling and installing $($(1)_NAME)-$($(1)_VERSION) in your root filesystem...")
 	$(Q)$(if $(strip $($(1)_DEPS)),$(MAKE) $($(1)_DEPS))
-	$(Q)$(call EMBTK_DOWNLOAD_PKG,$(1))
-	$(Q)$(call EMBTK_DECOMPRESS_PKG,$(1))
-	$(Q)$(call EMBTK_CONFIGURE_PKG,$(1))
+	$(Q)$(call embtk_download_pkg,$(1))
+	$(Q)$(call embtk_decompress_pkg,$(1))
+	$(Q)$(call embtk_configure_pkg,$(1))
 	$(Q)$(if $($(1)_MAKE_DIRS),						\
-		$(__EMBTK_MULTI_MAKE),						\
-		$(__EMBTK_SINGLE_MAKE))
+		$(__embtk_multi_make),						\
+		$(__embtk_single_make))
 	$(Q)$(if $($(1)_MAKE_DIRS),						\
-		$(__EMBTK_MULTI_MAKE_INSTALL),					\
-		$(__EMBTK_SINGLE_MAKE_INSTALL))
-	$(Q)$(call __EMBTK_FIX_LIBTOOL_FILES)
-	$(Q)$(call __EMBTK_FIX_PKGCONFIG_FILES)
+		$(__embtk_multi_make_install),					\
+		$(__embtk_single_make_install))
+	$(Q)$(call __embtk_fix_libtool_files)
+	$(Q)$(call __embtk_fix_pkgconfig_files)
 	@touch $($(1)_BUILD_DIR)/.installed
 endef
-define EMBTK_INSTALL_PKG
+define embtk_install_pkg
 	@$(if $(shell test -e $($(1)_BUILD_DIR)/.installed && echo y),true,	\
-		$(call __EMBTK_INSTALL_PKG_MAKE,$(1)))
+		$(call __embtk_install_pkg_make,$(1)))
 endef
 
 #
 # A macro to install automatically a package intended to run on the host
 # development machine.
 # Usage:
-# $(call EMBTK_INSTALL_HOSTPKG,PACKAGE)
+# $(call embtk_install_hostpkg,PACKAGE)
 #
-define __EMBTK_INSTALL_HOSTPKG_MAKE
-	$(call EMBTK_GENERIC_MSG,"Compiling and installing $($(1)_NAME)-$($(1)_VERSION) for host...")
+define __embtk_install_hostpkg_make
+	$(call embtk_generic_msg,"Compiling and installing $($(1)_NAME)-$($(1)_VERSION) for host...")
 	$(Q)$(if $(strip $($(1)_DEPS)),$(MAKE) $($(1)_DEPS))
-	$(Q)$(call EMBTK_DOWNLOAD_PKG,$(1))
-	$(Q)$(call EMBTK_DECOMPRESS_HOSTPKG,$(1))
-	$(Q)$(call EMBTK_CONFIGURE_HOSTPKG,$(1))
+	$(Q)$(call embtk_download_pkg,$(1))
+	$(Q)$(call embtk_decompress_hostpkg,$(1))
+	$(Q)$(call embtk_configure_hostpkg,$(1))
 	$(Q)$(if $($(1)_MAKE_DIRS),						\
-		$(__EMBTK_MULTI_MAKE),						\
-		$(__EMBTK_SINGLE_MAKE))
+		$(__embtk_multi_make),						\
+		$(__embtk_single_make))
 	$(Q)$(if $($(1)_MAKE_DIRS),						\
-		$(__EMBTK_MULTI_MAKE_HOSTINSTALL),				\
-		$(__EMBTK_SINGLE_MAKE_HOSTINSTALL))
+		$(__embtk_multi_make_hostinstall),				\
+		$(__embtk_single_make_hostinstall))
 	@touch $($(1)_BUILD_DIR)/.installed
 endef
-define EMBTK_INSTALL_HOSTPKG
+define embtk_install_hostpkg
 	@$(if $(shell test -e $($(1)_BUILD_DIR)/.installed && echo y),true,	\
-		$(call __EMBTK_INSTALL_HOSTPKG_MAKE,$(1)))
+		$(call __embtk_install_hostpkg_make,$(1)))
 endef
 
 #
 # A macro which downloads a package.
 # Usage:
-# $(call EMBTK_DOWNLOAD_PKG,PACKAGE)
+# $(call embtk_download_pkg,PACKAGE)
 #
-define EMBTK_DOWNLOAD_PKG_PATCHES
+define __embtk_download_pkg_patches
 @if [ "x$(CONFIG_EMBTK_$(1)_NEED_PATCH)" == "xy" ]; then		\
 	test -e $(DOWNLOAD_DIR)/$($(1)_NAME)-$($(1)_VERSION).patch ||	\
-	$(call EMBTK_WGET,						\
+	$(call embtk_wget,						\
 		$($(1)_NAME)-$($(1)_VERSION).patch,			\
 		$($(1)_PATCH_SITE),					\
 		$($(1)_NAME)-$($(1)_VERSION)-*.patch);			\
 fi
 endef
-define EMBTK_DOWNLOAD_PKG_FROM_MIRROR
+define __embtk_download_pkg_from_mirror
 if [ "x$($(1)_SITE_MIRROR$(2))" == "x" ]; then 				\
 	false;								\
 else									\
-	$(call EMBTK_WGET,						\
+	$(call embtk_wget,						\
 		$($(1)_PACKAGE),					\
 		$($(1)_SITE_MIRROR$(2)),				\
 		$($(1)_PACKAGE)); 					\
 fi
 endef
-define EMBTK_DOWNLOAD_PKG
-	$(call EMBTK_GENERIC_MSG,"Download $($(1)_PACKAGE) if necessary...")
+define embtk_download_pkg
+	$(call embtk_generic_msg,"Download $($(1)_PACKAGE) if necessary...")
 	@test -e $(DOWNLOAD_DIR)/$($(1)_PACKAGE) ||			\
-	$(call EMBTK_WGET,						\
+	$(call embtk_wget,						\
 		$($(1)_PACKAGE),					\
 		$($(1)_SITE),						\
 		$($(1)_PACKAGE))||					\
-	$(call EMBTK_DOWNLOAD_PKG_FROM_MIRROR,$(1),1) ||		\
-	$(call EMBTK_DOWNLOAD_PKG_FROM_MIRROR,$(1),2) ||		\
-	$(call EMBTK_DOWNLOAD_PKG_FROM_MIRROR,$(1),3) || exit 1
-	$(call EMBTK_DOWNLOAD_PKG_PATCHES,$(1))
+	$(call __embtk_download_pkg_from_mirror,$(1),1) ||		\
+	$(call __embtk_download_pkg_from_mirror,$(1),2) ||		\
+	$(call __embtk_download_pkg_from_mirror,$(1),3) || exit 1
+	$(call __embtk_download_pkg_patches,$(1))
 endef
 
 #
 # A macro to decompress packages tarball intended to run on target.
 # Usage:
-# $(call EMBTK_DECOMPRESS_PKG,PACKAGE)
+# $(call embtk_decompress_pkg,PACKAGE)
 #
-define EMBTK_DECOMPRESS_PKG
-	$(call EMBTK_GENERIC_MSG,"Decrompressing $($(1)_PACKAGE) ...")
+define embtk_decompress_pkg
+	$(call embtk_generic_msg,"Decrompressing $($(1)_PACKAGE) ...")
 	@if [ "x$(CONFIG_EMBTK_$(1)_PKG_IS_TARGZ)" == "xy" ] &&			\
 	[ ! -e $($(1)_SRC_DIR)/.decompressed ]; then				\
 		tar -C $(PACKAGES_BUILD) -xzf					\
@@ -427,10 +427,10 @@ endef
 # A macro to decompress packages tarball intended to run on host development
 # machine.
 # Usage:
-# $(call EMBTK_DECOMPRESS_HOSTPKG,PACKAGE)
+# $(call embtk_decompress_hostpkg,PACKAGE)
 #
-define EMBTK_DECOMPRESS_HOSTPKG
-	$(call EMBTK_GENERIC_MSG,"Decrompressing $($(1)_PACKAGE) ...")
+define embtk_decompress_hostpkg
+	$(call embtk_generic_msg,"Decrompressing $($(1)_PACKAGE) ...")
 	@if [ "x$(CONFIG_EMBTK_$(1)_PKG_IS_TARGZ)" == "xy" ] &&			\
 	[ ! -e $($(1)_SRC_DIR)/.decompressed ]; then				\
 		tar -C $(TOOLS_BUILD) -xzf					\
@@ -462,10 +462,10 @@ endef
 #
 # A macro to clean installed packages from sysroot.
 # Usage:
-# $(call EMBTK_CLEANUP_PKG,PACKAGE)
+# $(call embtk_cleanup_pkg,PACKAGE)
 #
-define EMBTK_CLEANUP_PKG
-	$(call EMBTK_GENERIC_MESSAGE,"Cleanup $($(1)_NAME)...")
+define embtk_cleanup_pkg
+	$(call embtk_generic_message,"Cleanup $($(1)_NAME)...")
 	@-if [ "x$($(1)_ETC)" != "x" ] && [ -e $(SYSROOT)/etc ];		\
 		then								\
 		cd $(SYSROOT)/etc; rm -rf $($(1)_ETC);				\
diff --git a/mk/makedevs.mk b/mk/makedevs.mk
index 9c95d81..6ee73b7 100644
--- a/mk/makedevs.mk
+++ b/mk/makedevs.mk
@@ -27,7 +27,7 @@ MAKEDEVS_DIR := $(HOSTTOOLS)/usr/local/makedevs
 makedevs_install: $(MAKEDEVS_DIR)/.installed
 
 $(MAKEDEVS_DIR)/.installed:
-	$(call EMBTK_GENERIC_MESSAGE,"Installing makedevs...")
+	$(call embtk_generic_message,"Installing makedevs...")
 	@mkdir -p $(MAKEDEVS_DIR)
 	$(subst ",,$(strip $(HOSTCC_CACHED))) -o $(MAKEDEVS_DIR)/makedevs $(EMBTK_ROOT)/src/makedevs/makedevs.c
 	@touch $@
diff --git a/mk/mpchost.mk b/mk/mpchost.mk
index fd20394..d2f4cc8 100644
--- a/mk/mpchost.mk
+++ b/mk/mpchost.mk
@@ -59,7 +59,7 @@ ifeq ($(CONFIG_EMBTK_MPC_HOST_VERSION_PATCH),y)
 endif
 
 $(MPC_HOST_BUILD_DIR)/.configured:
-	$(call EMBTK_GENERIC_MESSAGE,"Configuring mpc-$(MPC_HOST_VERSION) ...")
+	$(call embtk_generic_message,"Configuring mpc-$(MPC_HOST_VERSION) ...")
 	cd $(MPC_HOST_BUILD_DIR); \
 	CC=$(HOSTCC_CACHED) \
 	CXX=$(HOSTCXX_CACHED) \
diff --git a/mk/mpfrhost.mk b/mk/mpfrhost.mk
index 7995ee5..ce2225e 100644
--- a/mk/mpfrhost.mk
+++ b/mk/mpfrhost.mk
@@ -59,7 +59,7 @@ ifeq ($(CONFIG_EMBTK_MPFR_HOST_VERSION_PATCH),y)
 endif
 
 $(MPFR_HOST_BUILD_DIR)/.configured:
-	$(call EMBTK_GENERIC_MESSAGE,"mpfrhost: Configuring \
+	$(call embtk_generic_message,"mpfrhost: Configuring \
 	mpfr-$(MPFR_HOST_VERSION) ...")
 	@mkdir -p $(MPFR_HOST_DIR)
 	cd $(MPFR_HOST_BUILD_DIR); CC=$(HOSTCC_CACHED) CXX=$(HOSTCXX_CACHED) \
diff --git a/mk/mtd-utils.mk b/mk/mtd-utils.mk
index d63c550..cad8251 100644
--- a/mk/mtd-utils.mk
+++ b/mk/mtd-utils.mk
@@ -61,7 +61,7 @@ $(MTDUTILS_HOST_BUILD_DIR)/.installed:  $(MTDUTILS_HOST_DEPS) \
 	@touch $@
 
 $(MTDUTILS_HOST_BUILD_DIR)/.decompressed:
-	$(call EMBTK_GENERIC_MESSAGE,"Decompressing $(MTDUTILS_PACKAGE)...")
+	$(call embtk_generic_message,"Decompressing $(MTDUTILS_PACKAGE)...")
 	@tar -C $(TOOLS_BUILD) -xvf $(DOWNLOAD_DIR)/$(MTDUTILS_PACKAGE)
 ifeq ($(CONFIG_EMBTK_MTDUTILS_NEED_PATCH),y)
 	cd $(MTDUTILS_HOST_BUILD_DIR); \
@@ -70,7 +70,7 @@ endif
 	@touch $@
 
 mtdutils_host_clean:
-	$(call EMBTK_GENERIC_MESSAGE,"Cleaning mtd-utils in host ...")
+	$(call embtk_generic_message,"Cleaning mtd-utils in host ...")
 
 ########################
 # mtd-utils for target #
@@ -93,7 +93,7 @@ $(MTDUTILS_TARGET_BUILD_DIR)/.installed: $(MTDUTILS_DEPS) download_mtdutils \
 	@touch $@
 
 $(MTDUTILS_TARGET_BUILD_DIR)/.decompressed:
-	$(call EMBTK_GENERIC_MESSAGE,"Decompressing $(MTDUTILS_PACKAGE)...")
+	$(call embtk_generic_message,"Decompressing $(MTDUTILS_PACKAGE)...")
 	@tar -C $(PACKAGES_BUILD) -xjf $(DOWNLOAD_DIR)/$(MTDUTILS_PACKAGE)
 ifeq ($(CONFIG_EMBTK_MTDUTILS_NEED_PATCH),y)
 	@cd $(MTDUTILS_TARGET_BUILD_DIR); \
@@ -102,7 +102,7 @@ endif
 	@touch $@
 
 mtdutils_target_clean:
-	$(call EMBTK_GENERIC_MESSAGE,"Cleaning mtd-utils in target ...")
+	$(call embtk_generic_message,"Cleaning mtd-utils in target ...")
 	$(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(MTDUTILS_BINS)
 	$(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(MTDUTILS_SBINS)
 	$(Q)-cd $(SYSROOT)/usr/include; rm -rf $(MTDUTILS_INCLUDES)
@@ -111,7 +111,7 @@ mtdutils_target_clean:
 	$(Q)-rm -rf $(MTDUTILS_TARGET_BUILD_DIR)*
 
 download_mtdutils:
-	$(call EMBTK_GENERIC_MESSAGE,"Downloading $(MTDUTILS_PACKAGE) \
+	$(call embtk_generic_message,"Downloading $(MTDUTILS_PACKAGE) \
 	if necessary...")
 	@test -e $(DOWNLOAD_DIR)/$(MTDUTILS_PACKAGE) || \
 	wget -O $(DOWNLOAD_DIR)/$(MTDUTILS_PACKAGE) \
diff --git a/mk/packages.mk b/mk/packages.mk
index 2b62a0b..8789052 100644
--- a/mk/packages.mk
+++ b/mk/packages.mk
@@ -84,7 +84,7 @@ ROOTFS_COMPONENTS_CLEAN := $(subst install,clean,$(ROOTFS_COMPONENTS-))
 host_packages_build:
 ifeq ($(HOSTTOOLS_COMPONENTS-y),)
 else
-	$(call EMBTK_GENERIC_MESSAGE,"Building extra packages intended to run \
+	$(call embtk_generic_message,"Building extra packages intended to run \
 	on your host machine ...")
 	@$(MAKE) $(HOSTTOOLS_COMPONENTS-y)
 endif
diff --git a/mk/pkgconfig.mk b/mk/pkgconfig.mk
index a4fd50b..1dde251 100644
--- a/mk/pkgconfig.mk
+++ b/mk/pkgconfig.mk
@@ -24,7 +24,7 @@
 ################################################################################
 
 PKGCONFIG_NAME		:= pkg-config
-PKGCONFIG_VERSION	:= $(call EMBTK_GET_PKG_VERSION,PKGCONFIG)
+PKGCONFIG_VERSION	:= $(call embtk_get_pkgversion,PKGCONFIG)
 PKGCONFIG_SITE		:= http://pkgconfig.freedesktop.org/releases
 PKGCONFIG_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
 PKGCONFIG_PATCH_SITE	:= ftp://ftp.embtoolkit.org/embtoolkit.org/pkgconfig/$(PKGCONFIG_VERSION)
@@ -40,7 +40,7 @@ PKGCONFIG_PREFIX	:= /usr
 PKGCONFIG_DESTDIR	:= $(HOSTTOOLS)
 
 pkgconfig_install:
-	$(call EMBTK_INSTALL_HOSTPKG,PKGCONFIG)
+	$(call embtk_install_hostpkg,PKGCONFIG)
 
 download_pkgconfig:
-	$(call EMBTK_DOWNLOAD_PKG,PKGCONFIG)
+	$(call embtk_download_pkg,PKGCONFIG)
diff --git a/mk/rootfs.mk b/mk/rootfs.mk
index 82d70a0..1f7bebf 100644
--- a/mk/rootfs.mk
+++ b/mk/rootfs.mk
@@ -68,12 +68,12 @@ ROOTFS_STRIPPED_FILES += `[ -d $$ROOTFS/usr/libexec ] && find $$ROOTFS/usr/libex
 endif
 
 rootfs_build:
-	$(call EMBTK_GENERIC_MESSAGE,"Building selected root filesystems...")
+	$(call embtk_generic_message,"Building selected root filesystems...")
 	@$(MAKE) rootfs_clean mkinitialrootfs $(ROOTFS_HOSTTOOLS-y) \
 	$(ROOTFS_COMPONENTS-y) build_rootfs_devnodes rootfs_fill \
 	build_tarbz2_rootfs $(FILESYSTEMS-y)
 	$(Q)rm -rf $(ROOTFS)
-	$(call EMBTK_GENERIC_MESSAGE,"Build of selected root filesystems \
+	$(call embtk_generic_message,"Build of selected root filesystems \
 	ended successfully!")
 
 rootfs_fill:
@@ -103,7 +103,7 @@ endif
 	@-cp -R $(SYSROOT)/etc/* $(ROOTFS)/etc/ >/dev/null 2>/dev/null
 	@cp -R $(SYSROOT)/root $(ROOTFS)/
 ifeq ($(CONFIG_EMBTK_TARGET_STRIPPED),y)
-	$(call EMBTK_GENERIC_MESSAGE,"Stripping binaries as specified...")
+	$(call embtk_generic_message,"Stripping binaries as specified...")
 	@-$(FAKEROOT_BIN) -i $(EMBTK_ROOT)/.fakeroot.001 -- \
 	$(TARGETSTRIP) $(ROOTFS_STRIPPED_FILES) >/dev/null 2>&1
 endif
diff --git a/mk/squashfs.mk b/mk/squashfs.mk
index 78c7e4c..de54f49 100644
--- a/mk/squashfs.mk
+++ b/mk/squashfs.mk
@@ -51,13 +51,13 @@ $(SQUASHFS_HOST_BUILD_DIR)/.installed: download_squashfs \
 	@touch $@
 
 $(SQUASHFS_HOST_BUILD_DIR)/.decompressed:
-	$(call EMBTK_GENERIC_MESSAGE,"Decompressing $(SQUASHFS_PACKAGE)...")
+	$(call embtk_generic_message,"Decompressing $(SQUASHFS_PACKAGE)...")
 	@tar -C $(TOOLS_BUILD) -xzvf $(DOWNLOAD_DIR)/$(SQUASHFS_PACKAGE)
 	@mkdir -p $(SQUASHFS_HOST_BUILD_DIR)
 	@touch $@
 
 squashfs_host_clean:
-	$(call EMBTK_GENERIC_MESSAGE,"Cleaning squashfs in host ...")
+	$(call embtk_generic_message,"Cleaning squashfs in host ...")
 
 #squashfs for target
 $(SQUASHFS_TARGET_BUILD_DIR)/.installed: download_squashfs \
@@ -65,16 +65,16 @@ $(SQUASHFS_TARGET_BUILD_DIR)/.installed: download_squashfs \
 	@touch $@
 
 $(SQUASHFS_TARGET_BUILD_DIR)/.decompressed:
-	$(call EMBTK_GENERIC_MESSAGE,"Decompressing $(SQUASHFS_PACKAGE)...")
+	$(call embtk_generic_message,"Decompressing $(SQUASHFS_PACKAGE)...")
 	@tar -C $(PACKAGES_BUILD) -xzvf $(DOWNLOAD_DIR)/$(SQUASHFS_PACKAGE)
 	@mkdir -p $(SQUASHFS_TARGET_BUILD_DIR)
 	@touch $@
 
 squashfs_target_clean:
-	$(call EMBTK_GENERIC_MESSAGE,"Cleaning squashfs in target ...")
+	$(call embtk_generic_message,"Cleaning squashfs in target ...")
 
 download_squashfs:
-	$(call EMBTK_GENERIC_MESSAGE,"Downloading $(SQUASHFS_PACKAGE) \
+	$(call embtk_generic_message,"Downloading $(SQUASHFS_PACKAGE) \
 	if necessary...")
 	@test -e $(DOWNLOAD_DIR)/$(SQUASHFS_PACKAGE) || \
 	wget -O $(DOWNLOAD_DIR)/$(SQUASHFS_PACKAGE) \
diff --git a/mk/strace.mk b/mk/strace.mk
index 325d9ed..ca9a34d 100644
--- a/mk/strace.mk
+++ b/mk/strace.mk
@@ -24,7 +24,7 @@
 ################################################################################
 
 STRACE_NAME := strace
-STRACE_VERSION:= $(call EMBTK_GET_PKG_VERSION,STRACE)
+STRACE_VERSION:= $(call embtk_get_pkgversion,STRACE)
 STRACE_SITE:=http://downloads.sourceforge.net/project/strace/strace/$(STRACE_VERSION)
 STRACE_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
 STRACE_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/strace/$(STRACE_VERSION)
@@ -39,10 +39,10 @@ STRACE_LIBS =
 STRACE_PKGCONFIGS =
 
 strace_install:
-	$(call EMBTK_INSTALL_PKG,STRACE)
+	$(call embtk_install_pkg,STRACE)
 
 download_strace:
-	$(call EMBTK_DOWNLOAD_PKG,STRACE)
+	$(call embtk_download_pkg,STRACE)
 
 strace_clean:
-	$(call EMBTK_CLEANUP_PKG,STRACE)
+	$(call embtk_cleanup_pkg,STRACE)
diff --git a/mk/toolchain.mk b/mk/toolchain.mk
index 54b157a..dce0fca 100644
--- a/mk/toolchain.mk
+++ b/mk/toolchain.mk
@@ -108,7 +108,7 @@ endif
 
 #targets
 buildtoolchain: $(TOOLCHAINBUILD)
-	$(call EMBTK_GENERIC_MESSAGE,"You successfully build a toolchain for \
+	$(call embtk_generic_message,"You successfully build a toolchain for \
 	$(STRICT_GNU_TARGET) !!!")
 
 symlink_tools:
diff --git a/mk/uclibc.mk b/mk/uclibc.mk
index a2358dc..baaf47a 100755
--- a/mk/uclibc.mk
+++ b/mk/uclibc.mk
@@ -40,7 +40,7 @@ uclibc_install: $(UCLIBC_BUILD_DIR)/.installed
 
 $(UCLIBC_BUILD_DIR)/.installed: uclibc_download \
 	$(UCLIBC_BUILD_DIR)/.decompressed $(UCLIBC_BUILD_DIR)/.configured
-	$(call EMBTK_GENERIC_MESSAGE,"Building and installing \
+	$(call embtk_generic_message,"Building and installing \
 	uClibc-$(UCLIBC_VERSION) ...")
 	$(MAKE) -C $(UCLIBC_BUILD_DIR) oldconfig
 	$(MAKE) -C $(UCLIBC_BUILD_DIR) PREFIX=$(SYSROOT)/ \
@@ -59,7 +59,7 @@ $(UCLIBC_BUILD_DIR)/.installed: uclibc_download \
 	UCLIBC_EXTRA_CFLAGS="$(EMBTK_UCLIBC_CFLAGS)" install
 
 uclibc_download:
-	$(call EMBTK_GENERIC_MESSAGE,"downloading uClibc-$(UCLIBC_VERSION) \
+	$(call embtk_generic_message,"downloading uClibc-$(UCLIBC_VERSION) \
 	if necessary ...")
 ifeq ($(CONFIG_EMBTK_UCLIBC_VERSION_GIT),y)
 	@test -e $(EMBTK_ROOT)/src/uClibc-git || \
@@ -87,7 +87,7 @@ ifeq ($(CONFIG_EMBTK_UCLIBC_NEED_PATCH),y)
 endif
 
 $(UCLIBC_BUILD_DIR)/.decompressed:
-	$(call EMBTK_GENERIC_MESSAGE,"Decompressing \
+	$(call embtk_generic_message,"Decompressing \
 	uClibc-$(UCLIBC_VERSION) ...")
 	$(Q)tar -C $(TOOLS_BUILD) -xjvf $(DOWNLOAD_DIR)/$(UCLIBC_PACKAGE)
 ifeq ($(CONFIG_EMBTK_UCLIBC_NEED_PATCH),y)
@@ -96,7 +96,7 @@ ifeq ($(CONFIG_EMBTK_UCLIBC_NEED_PATCH),y)
 endif
 
 $(UCLIBC_BUILD_DIR)/.configured:
-	$(call EMBTK_GENERIC_MESSAGE,"Configuring \
+	$(call embtk_generic_message,"Configuring \
 	uClibc-$(UCLIBC_VERSION) ...")
 	$(Q)grep "CONFIG_KEMBTK_UCLIBC_" $(EMBTK_ROOT)/.config | \
 	sed -e 's/CONFIG_KEMBTK_UCLIBC_*//g' \