Embtk generic macros: lower macros

Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
author: Abdoulaye Walsimou Gaye <awg@embtoolkit.org> 2011-07-02 14:45:48 +0200
committer: Abdoulaye Walsimou Gaye <awg@embtoolkit.org> 2011-07-02 14:45:48 +0200
commit: 082dbb99d068e26c577831a1ab26816f39d798b7 (patch)
tree: cb064d868b650be4b6b3b26d99127221ac651343 /packages
parent: 9c40b00ea89c6c0a6cc195e7636da1875052fa02 (diff)
download: embtoolkit-082dbb99d068e26c577831a1ab26816f39d798b7.tar.gz
embtoolkit-082dbb99d068e26c577831a1ab26816f39d798b7.tar.bz2
embtoolkit-082dbb99d068e26c577831a1ab26816f39d798b7.tar.xz
77 files changed, 363 insertions, 363 deletions
diff --git a/packages/busybox/busybox.mk b/packages/busybox/busybox.mk
index 34023b8..4b4973f 100644
--- a/packages/busybox/busybox.mk
+++ b/packages/busybox/busybox.mk
@@ -24,7 +24,7 @@
 ################################################################################
 
 BB_NAME := busybox
-BB_VERSION := $(call EMBTK_GET_PKG_VERSION,BB)
+BB_VERSION := $(call embtk_get_pkgversion,BB)
 BB_SITE := http://www.busybox.net/downloads
 BB_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
 BB_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/busybox/$(BB_VERSION)
@@ -36,7 +36,7 @@ busybox_install: $(BB_BUILD_DIR)/.installed
 
 $(BB_BUILD_DIR)/.installed: download_busybox $(BB_BUILD_DIR)/.decompressed \
 	$(BB_BUILD_DIR)/.configured
-	$(call EMBTK_GENERIC_MESSAGE,"Compiling and installing \
+	$(call embtk_generic_message,"Compiling and installing \
 	busybox-$(BB_VERSION) in your root filesystem...")
 	$(Q)$(MAKE) -C $(BB_BUILD_DIR) \
 	CROSS_COMPILE="$(CCACHE_HOST_DIR)/bin/ccache $(TOOLS)/bin/$(STRICT_GNU_TARGET)-" \
@@ -48,16 +48,16 @@ $(BB_BUILD_DIR)/.installed: download_busybox $(BB_BUILD_DIR)/.decompressed \
 	@touch $@
 
 download_busybox:
-	$(call EMBTK_DOWNLOAD_PKG,BB)
+	$(call embtk_download_pkg,BB)
 
 $(BB_BUILD_DIR)/.decompressed:
-	$(call EMBTK_DECOMPRESS_PKG,BB)
+	$(call embtk_decompress_pkg,BB)
 
 $(BB_BUILD_DIR)/.configured:
-	$(call EMBTK_GENERIC_MESSAGE,"Configuring busybox...")
+	$(call embtk_generic_message,"Configuring busybox...")
 	@grep "CONFIG_KEMBTK_BUSYB_" $(EMBTK_ROOT)/.config | \
 	sed -e 's/CONFIG_KEMBTK_BUSYB_*/CONFIG_/g' > $(BB_BUILD_DIR)/.config
 	@sed -i 's/_1_13_X_1_14_X//g' $(BB_BUILD_DIR)/.config
 
 busybox_clean:
-	$(call EMBTK_GENERIC_MESSAGE,"cleanup busybox...")
+	$(call embtk_generic_message,"cleanup busybox...")
diff --git a/packages/compression/lzo/lzo.mk b/packages/compression/lzo/lzo.mk
index da67b61..cdfff1d 100644
--- a/packages/compression/lzo/lzo.mk
+++ b/packages/compression/lzo/lzo.mk
@@ -24,7 +24,7 @@
 ################################################################################
 
 LZO_NAME		:= lzo
-LZO_VERSION		:= $(call EMBTK_GET_PKG_VERSION,LZO)
+LZO_VERSION		:= $(call embtk_get_pkgversion,LZO)
 LZO_SITE		:= http://www.oberhumer.com/opensource/lzo/download
 LZO_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
 LZO_PATCH_SITE		:= ftp://ftp.embtoolkit.org/embtoolkit.org/lzo/$(LZO_VERSION)
@@ -45,17 +45,17 @@ LZO_CONFIGURE_OPTS :=
 LZO_DEPS :=
 
 lzo_install:
-	$(call EMBTK_INSTALL_PKG,LZO)
+	$(call embtk_install_pkg,LZO)
 
 lzo_clean:
-	$(call EMBTK_CLEANUP_PKG,LZO)
+	$(call embtk_cleanup_pkg,LZO)
 
 #
 # lzo common targets
 #
 
 download_lzo download_lzo_host:
-	$(call EMBTK_DOWNLOAD_PKG,LZO)
+	$(call embtk_download_pkg,LZO)
 
 #
 # LZO for host development machine
@@ -72,4 +72,4 @@ LZO_HOST_SRC_DIR	:= $(TOOLS_BUILD)/lzo-$(LZO_VERSION)
 LZO_HOST_BUILD_DIR	:= $(TOOLS_BUILD)/lzo-$(LZO_VERSION)
 
 lzo_host_install:
-	$(call EMBTK_INSTALL_HOSTPKG,LZO_HOST)
+	$(call embtk_install_hostpkg,LZO_HOST)
diff --git a/packages/compression/zlib/zlib.mk b/packages/compression/zlib/zlib.mk
index 32080d4..7e9a1ad 100644
--- a/packages/compression/zlib/zlib.mk
+++ b/packages/compression/zlib/zlib.mk
@@ -24,7 +24,7 @@
 ################################################################################
 
 ZLIB_NAME		:= zlib
-ZLIB_VERSION		:= $(call EMBTK_GET_PKG_VERSION,ZLIB)
+ZLIB_VERSION		:= $(call embtk_get_pkgversion,ZLIB)
 ZLIB_SITE		:= http://zlib.net
 ZLIB_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
 ZLIB_PATCH_SITE		:= ftp://ftp.embtoolkit.org/embtoolkit.org/zlib/$(ZLIB_VERSION)
@@ -59,10 +59,10 @@ $(ZLIB_BUILD_DIR)/.installed: download_zlib \
 	@touch $@
 
 $(ZLIB_SRC_DIR)/.decompressed:
-	$(call EMBTK_DECOMPRESS_PKG,ZLIB)
+	$(call embtk_decompress_pkg,ZLIB)
 
 $(ZLIB_BUILD_DIR)/.configured:
-	$(call EMBTK_GENERIC_MSG,"Configure $(ZLIB_PACKAGE)...")
+	$(call embtk_generic_msg,"Configure $(ZLIB_PACKAGE)...")
 	$(call EMBTK_PRINT_CONFIGURE_OPTS,"$(ZLIB_CONFIGURE_OPTS)")
 	@cd $(ZLIB_BUILD_DIR);						\
 	CC=$(TARGETCC_CACHED)						\
@@ -88,7 +88,7 @@ $(ZLIB_BUILD_DIR)/.configured:
 	@touch $@
 
 zlib_clean:
-	$(call EMBTK_CLEANUP_PKG,ZLIB)
+	$(call embtk_cleanup_pkg,ZLIB)
 
 ########################
 # zlib on host machine #
@@ -118,10 +118,10 @@ $(ZLIB_HOST_BUILD_DIR)/.installed: download_zlib \
 	@touch $@
 
 $(ZLIB_HOST_SRC_DIR)/.decompressed:
-	$(call EMBTK_DECOMPRESS_HOSTPKG,ZLIB_HOST)
+	$(call embtk_decompress_hostpkg,ZLIB_HOST)
 
 $(ZLIB_HOST_BUILD_DIR)/.configured:
-	$(call EMBTK_GENERIC_MSG,"Configure $(ZLIB_HOST_PACKAGE) for host...")
+	$(call embtk_generic_msg,"Configure $(ZLIB_HOST_PACKAGE) for host...")
 	$(call EMBTK_PRINT_CONFIGURE_OPTS,"$(ZLIB_HOST_CONFIGURE_OPTS)")
 	@cd $(ZLIB_HOST_BUILD_DIR);					\
 	CPPFLAGS="-I$(HOSTTOOLS)/usr/include"				\
@@ -139,4 +139,4 @@ zlib_host_clean:
 
 #zlib download
 download_zlib download_zlib_host:
-	$(call EMBTK_DOWNLOAD_PKG,ZLIB)
+	$(call embtk_download_pkg,ZLIB)
diff --git a/packages/database/sqlite/sqlite.mk b/packages/database/sqlite/sqlite.mk
index f6e9361..8d059d2 100644
--- a/packages/database/sqlite/sqlite.mk
+++ b/packages/database/sqlite/sqlite.mk
@@ -24,7 +24,7 @@
 ################################################################################
 
 SQLITE_NAME := sqlite
-SQLITE_VERSION := $(call EMBTK_GET_PKG_VERSION,SQLITE)
+SQLITE_VERSION := $(call embtk_get_pkgversion,SQLITE)
 SQLITE_SITE := http://www.sqlite.org
 SQLITE_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
 SQLITE_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/sqlite/$(SQLITE_VERSION)
@@ -55,10 +55,10 @@ SQLITE_CONFIGURE_OPTS := --enable-threadsafe --enable-readline \
 SQLITE_DEPS :=
 
 sqlite_install:
-	$(call EMBTK_INSTALL_PKG,SQLITE)
+	$(call embtk_install_pkg,SQLITE)
 
 download_sqlite:
-	$(call EMBTK_DOWNLOAD_PKG,SQLITE)
+	$(call embtk_download_pkg,SQLITE)
 
 sqlite_clean:
-	$(call EMBTK_CLEANUP_PKG,SQLITE)
+	$(call embtk_cleanup_pkg,SQLITE)
diff --git a/packages/development/gdb/gdb.mk b/packages/development/gdb/gdb.mk
index d7e2f09..e0507a1 100644
--- a/packages/development/gdb/gdb.mk
+++ b/packages/development/gdb/gdb.mk
@@ -24,7 +24,7 @@
 ################################################################################
 
 GDB_NAME		:= gdb
-GDB_VERSION		:= $(call EMBTK_GET_PKG_VERSION,GDB)
+GDB_VERSION		:= $(call embtk_get_pkgversion,GDB)
 GDB_SITE		:= http://ftp.gnu.org/gnu/gdb
 GDB_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
 GDB_PATCH_SITE		:= ftp://ftp.embtoolkit.org/embtoolkit.org/gdb/$(GDB_VERSION)
@@ -56,7 +56,7 @@ GDB_DEPS := ncurses_install
 # GDB for target
 #
 gdbfull_install:
-	$(call EMBTK_INSTALL_PKG,GDB)
+	$(call embtk_install_pkg,GDB)
 
 gdbserver_install:
 	@test -e $(GDB_BUILD_DIR)/.gdbserver_installed ||		\
@@ -73,15 +73,15 @@ $(GDB_BUILD_DIR)/.gdbserver_installed: $(GDB_DEPS)			\
 	@touch $@
 
 $(GDB_BUILD_DIR)/.gdbserver_configured:
-	$(call EMBTK_CONFIGURE_PKG,GDB)
+	$(call embtk_configure_pkg,GDB)
 	@touch $@
 
 $(GDB_BUILD_DIR)/.gdbserver_decompressed:
-	$(call EMBTK_DECOMPRESS_PKG,GDB)
+	$(call embtk_decompress_pkg,GDB)
 	@touch $@
 
 gdbserver_clean gdbfull_clean:
-	$(call EMBTK_CLEANUP_PKG,GDB)
+	$(call embtk_cleanup_pkg,GDB)
 
 #
 # GDB for host development machine
@@ -113,13 +113,13 @@ GDB_HOST_CONFIGURE_OPTS	:= --disable-werror --disable-sim		\
 GDB_HOST_PREFIX := $(TOOLS)
 
 gdb_host_install:
-	$(call EMBTK_INSTALL_HOSTPKG,GDB_HOST)
+	$(call embtk_install_hostpkg,GDB_HOST)
 
 gdb_host_clean:
-	$(call EMBTK_GENERIC_MSG,"Clean up gdb host")
+	$(call embtk_generic_msg,"Clean up gdb host")
 
 #
 # Common for target and host development machine
 #
 download_gdb download_gdb_host:
-	$(call EMBTK_DOWNLOAD_PKG,GDB)
+	$(call embtk_download_pkg,GDB)
diff --git a/packages/development/libevent/libevent.mk b/packages/development/libevent/libevent.mk
index d9d59c0..379fd95 100644
--- a/packages/development/libevent/libevent.mk
+++ b/packages/development/libevent/libevent.mk
@@ -24,7 +24,7 @@
 ################################################################################
 
 LIBEVENT_NAME := libevent
-LIBEVENT_VERSION := $(call EMBTK_GET_PKG_VERSION,LIBEVENT)
+LIBEVENT_VERSION := $(call embtk_get_pkgversion,LIBEVENT)
 LIBEVENT_SITE := http://www.monkey.org/~provos
 LIBEVENT_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
 LIBEVENT_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/libevent/$(LIBEVENT_VERSION)
@@ -41,10 +41,10 @@ LIBEVENT_PKGCONFIGS =
 LIBEVENT_DEPS :=
 
 libevent_install:
-	$(call EMBTK_INSTALL_PKG,LIBEVENT)
+	$(call embtk_install_pkg,LIBEVENT)
 
 download_libevent:
-	$(call EMBTK_DOWNLOAD_PKG,LIBEVENT)
+	$(call embtk_download_pkg,LIBEVENT)
 
 libevent_clean:
-	$(call EMBTK_CLEANUP_PKG,LIBEVENT)
+	$(call embtk_cleanup_pkg,LIBEVENT)
diff --git a/packages/development/libnih/libnih.mk b/packages/development/libnih/libnih.mk
index b617556..94c39d8 100644
--- a/packages/development/libnih/libnih.mk
+++ b/packages/development/libnih/libnih.mk
@@ -24,8 +24,8 @@
 ################################################################################
 
 LIBNIH_NAME := libnih
-LIBNIH_VERSION := $(call EMBTK_GET_PKG_VERSION,LIBNIH)
-LIBNIH_MAJOR_VERSION := $(call EMBTK_GET_PKG_VERSION,LIBNIH_MAJOR)
+LIBNIH_VERSION := $(call embtk_get_pkgversion,LIBNIH)
+LIBNIH_MAJOR_VERSION := $(call embtk_get_pkgversion,LIBNIH_MAJOR)
 LIBNIH_SITE := http://launchpad.net/libnih/$(LIBNIH_MAJOR_VERSION)/$(LIBNIH_VERSION)/+download
 LIBNIH_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
 LIBNIH_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/libnih/$(LIBNIH_VERSION)
@@ -47,7 +47,7 @@ libnih_install:
 
 $(LIBNIH_BUILD_DIR)/.installed: $(LIBNIH_DEPS) download_libnih \
 	$(LIBNIH_BUILD_DIR)/.decompressed $(LIBNIH_BUILD_DIR)/.configured
-	$(call EMBTK_GENERIC_MESSAGE,"Compiling and installing \
+	$(call embtk_generic_message,"Compiling and installing \
 	libnih-$(LIBNIH_VERSION) in your root filesystem...")
 	$(Q)$(MAKE) -C $(LIBNIH_BUILD_DIR) $(J)
 	$(Q)$(MAKE) -C $(LIBNIH_BUILD_DIR) DESTDIR=$(SYSROOT) install
@@ -56,13 +56,13 @@ $(LIBNIH_BUILD_DIR)/.installed: $(LIBNIH_DEPS) download_libnih \
 	@touch $@
 
 download_libnih:
-	$(call EMBTK_DOWNLOAD_PKG,LIBNIH)
+	$(call embtk_download_pkg,LIBNIH)
 
 $(LIBNIH_BUILD_DIR)/.decompressed:
-	$(call EMBTK_DECOMPRESS_PKG,LIBNIH)
+	$(call embtk_decompress_pkg,LIBNIH)
 
 $(LIBNIH_BUILD_DIR)/.configured:
-	$(call EMBTK_CONFIGURE_PKG,LIBNIH)
+	$(call embtk_configure_pkg,LIBNIH)
 
 libnih_clean:
-	$(call EMBTK_CLEANUP_PKG,LIBNIH)
+	$(call embtk_cleanup_pkg,LIBNIH)
diff --git a/packages/development/libsigsegv/libsigsegv.mk b/packages/development/libsigsegv/libsigsegv.mk
index 1c59381..0eb7c44 100644
--- a/packages/development/libsigsegv/libsigsegv.mk
+++ b/packages/development/libsigsegv/libsigsegv.mk
@@ -24,7 +24,7 @@
 ################################################################################
 
 LIBSIGSEGV_NAME		:= libsigsegv
-LIBSIGSEGV_VERSION	:= $(call EMBTK_GET_PKG_VERSION,LIBSIGSEGV)
+LIBSIGSEGV_VERSION	:= $(call embtk_get_pkgversion,LIBSIGSEGV)
 LIBSIGSEGV_SITE		:= ftp://ftp.gnu.org/pub/gnu/libsigsegv
 LIBSIGSEGV_SITE_MIRROR3	:= http://ftp.gnu.org/gnu/libsigsegv
 LIBSIGSEGV_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
@@ -46,10 +46,10 @@ LIBSIGSEGV_CONFIGURE_OPTS :=
 LIBSIGSEGV_DEPS :=
 
 libsigsegv_install:
-	$(call EMBTK_INSTALL_PKG,LIBSIGSEGV)
+	$(call embtk_install_pkg,LIBSIGSEGV)
 
 download_libsigsegv:
-	$(call EMBTK_DOWNLOAD_PKG,LIBSIGSEGV)
+	$(call embtk_download_pkg,LIBSIGSEGV)
 
 libsigsegv_clean:
-	$(call EMBTK_CLEANUP_PKG,LIBSIGSEGV)
+	$(call embtk_cleanup_pkg,LIBSIGSEGV)
diff --git a/packages/graphics/atk/atk.mk b/packages/graphics/atk/atk.mk
index be825b3..ed38cb0 100644
--- a/packages/graphics/atk/atk.mk
+++ b/packages/graphics/atk/atk.mk
@@ -24,8 +24,8 @@
 ################################################################################
 
 ATK_NAME := atk
-ATK_VERSION := $(call EMBTK_GET_PKG_VERSION,ATK)
-ATK_MAJOR_VERSION := $(call EMBTK_GET_PKG_VERSION,ATK_MAJOR)
+ATK_VERSION := $(call embtk_get_pkgversion,ATK)
+ATK_MAJOR_VERSION := $(call embtk_get_pkgversion,ATK_MAJOR)
 ATK_SITE := http://ftp.gnome.org/pub/gnome/sources/atk/$(ATK_MAJOR_VERSION)
 ATK_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
 ATK_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/atk/$(ATK_VERSION)
@@ -43,10 +43,10 @@ ATK_CONFIGURE_OPTS := --disable-glibtest
 ATK_DEPS := glib_install
 
 atk_install:
-	$(call EMBTK_INSTALL_PKG,ATK)
+	$(call embtk_install_pkg,ATK)
 
 download_atk:
-	$(call EMBTK_DOWNLOAD_PKG,ATK)
+	$(call embtk_download_pkg,ATK)
 
 atk_clean:
-	$(call EMBTK_CLEANUP_PKG,ATK)
+	$(call embtk_cleanup_pkg,ATK)
diff --git a/packages/graphics/cairo/cairo.mk b/packages/graphics/cairo/cairo.mk
index e30d436..cd53440 100644
--- a/packages/graphics/cairo/cairo.mk
+++ b/packages/graphics/cairo/cairo.mk
@@ -24,7 +24,7 @@
 ################################################################################
 
 CAIRO_NAME		:= cairo
-CAIRO_VERSION		:= $(call EMBTK_GET_PKG_VERSION,CAIRO)
+CAIRO_VERSION		:= $(call embtk_get_pkgversion,CAIRO)
 CAIRO_SITE		:= http://www.cairographics.org/releases
 CAIRO_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
 CAIRO_PATCH_SITE	:= ftp://ftp.embtoolkit.org/embtoolkit.org/cairo/$(CAIRO_VERSION)
@@ -64,10 +64,10 @@ CAIRO_CONFIGURE_ENV	:= png_CFLAGS=`$(PKG_CONFIG_BIN) libpng --cflags`
 CAIRO_CONFIGURE_ENV	+= png_LIBS=`$(PKG_CONFIG_BIN) libpng --cflags`
 
 cairo_install:
-	$(call EMBTK_INSTALL_PKG,CAIRO)
+	$(call embtk_install_pkg,CAIRO)
 
 download_cairo:
-	$(call EMBTK_DOWNLOAD_PKG,CAIRO)
+	$(call embtk_download_pkg,CAIRO)
 
 cairo_clean:
-	$(call EMBTK_CLEANUP_PKG,CAIRO)
+	$(call embtk_cleanup_pkg,CAIRO)
diff --git a/packages/graphics/directfb/directfb.mk b/packages/graphics/directfb/directfb.mk
index cdb9b6b..1e9c05d 100644
--- a/packages/graphics/directfb/directfb.mk
+++ b/packages/graphics/directfb/directfb.mk
@@ -103,9 +103,9 @@ directfb_install:
 
 $(DIRECTFB_BUILD_DIR)/.installed:  $(DIRECTFB_DEPS) download_directfb \
 	$(DIRECTFB_BUILD_DIR)/.decompressed $(DIRECTFB_BUILD_DIR)/.configured
-	$(call EMBTK_GENERIC_MESSAGE,"Compiling and installing \
+	$(call embtk_generic_message,"Compiling and installing \
 	DirectFB-$(DIRECTFB_VERSION) in your root filesystem...")
-	$(call EMBTK_KILL_LT_RPATH, $(DIRECTFB_BUILD_DIR))
+	$(call __embtk_kill_lt_rpath, $(DIRECTFB_BUILD_DIR))
 	$(Q)$(MAKE) -C $(DIRECTFB_BUILD_DIR) $(J)
 	$(Q)$(MAKE) -C $(DIRECTFB_BUILD_DIR) DESTDIR=$(SYSROOT) install
 	$(Q)$(MAKE) libtool_files_adapt
@@ -114,14 +114,14 @@ $(DIRECTFB_BUILD_DIR)/.installed:  $(DIRECTFB_DEPS) download_directfb \
 	@touch $@
 
 download_directfb:
-	$(call EMBTK_GENERIC_MESSAGE,"Downloading $(DIRECTFB_PACKAGE) \
+	$(call embtk_generic_message,"Downloading $(DIRECTFB_PACKAGE) \
 	if necessary...")
 	@test -e $(DOWNLOAD_DIR)/$(DIRECTFB_PACKAGE) || \
 	wget -O $(DOWNLOAD_DIR)/$(DIRECTFB_PACKAGE) \
 	$(DIRECTFB_SITE)/$(DIRECTFB_PACKAGE)
 
 $(DIRECTFB_BUILD_DIR)/.decompressed:
-	$(call EMBTK_GENERIC_MESSAGE,"Decompressing $(DIRECTFB_PACKAGE) ...")
+	$(call embtk_generic_message,"Decompressing $(DIRECTFB_PACKAGE) ...")
 	@tar -C $(PACKAGES_BUILD) -xzvf $(DOWNLOAD_DIR)/$(DIRECTFB_PACKAGE)
 	@touch $@
 
@@ -196,7 +196,7 @@ endif
 	@touch $@
 
 directfb_clean:
-	$(call EMBTK_GENERIC_MESSAGE,"cleanup directfb...")
+	$(call embtk_generic_message,"cleanup directfb...")
 	$(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(DIRECTFB_BINS)
 	$(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(DIRECTFB_SBINS)
 	$(Q)-cd $(SYSROOT)/usr/include; rm -rf $(DIRECTFB_INCLUDES)
diff --git a/packages/graphics/fontconfig/fontconfig.mk b/packages/graphics/fontconfig/fontconfig.mk
index f9976ef..495f7f2 100644
--- a/packages/graphics/fontconfig/fontconfig.mk
+++ b/packages/graphics/fontconfig/fontconfig.mk
@@ -24,7 +24,7 @@
 ################################################################################
 
 FONTCONFIG_NAME		:= fontconfig
-FONTCONFIG_VERSION	:= $(call EMBTK_GET_PKG_VERSION,FONTCONFIG)
+FONTCONFIG_VERSION	:= $(call embtk_get_pkgversion,FONTCONFIG)
 FONTCONFIG_SITE		:= http://fontconfig.org/release
 FONTCONFIG_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
 FONTCONFIG_PATCH_SITE	:= ftp://ftp.embtoolkit.org/embtoolkit.org/fontconfig/$(FONTCONFIG_VERSION)
@@ -49,16 +49,16 @@ FONTCONFIG_CONFIGURE_OPTS := --with-arch=$(STRICT_GNU_TARGET)	\
 			--disable-docs --program-prefix=""
 
 fontconfig_install:
-	$(call EMBTK_INSTALL_PKG,FONTCONFIG)
+	$(call embtk_install_pkg,FONTCONFIG)
 	$(MAKE) $(FONTCONFIG_BUILD_DIR)/.special
 
 download_fontconfig:
-	$(call EMBTK_DOWNLOAD_PKG,FONTCONFIG)
+	$(call embtk_download_pkg,FONTCONFIG)
 
 .PHONY: $(FONTCONFIG_BUILD_DIR)/.special fontconfig_clean
 
 fontconfig_clean:
-	$(call EMBTK_CLEANUP_PKG,FONTCONFIG)
+	$(call embtk_cleanup_pkg,FONTCONFIG)
 
 $(FONTCONFIG_BUILD_DIR)/.special:
 	$(Q)-cp -R $(SYSROOT)/usr/etc/fonts $(ROOTFS)/etc/
diff --git a/packages/graphics/freefont/freefont.mk b/packages/graphics/freefont/freefont.mk
index 2b89f1c..9a95efc 100644
--- a/packages/graphics/freefont/freefont.mk
+++ b/packages/graphics/freefont/freefont.mk
@@ -49,7 +49,7 @@ $(TTMKFDIR_BUILD_DIR)/.installed: download_ttmkfdir \
 	@touch $@
 
 $(TTMKFDIR_BUILD_DIR)/.decompressed:
-	$(call EMBTK_GENERIC_MESSAGE,"Decompressing $(TTMKFDIR_PACKAGE)...")
+	$(call embtk_generic_message,"Decompressing $(TTMKFDIR_PACKAGE)...")
 	@tar -C $(PACKAGES_BUILD) -xzf $(DOWNLOAD_DIR)/$(TTMKFDIR_PACKAGE)
 	$(Q)cd $(TTMKFDIR_BUILD_DIR); \
 	patch -p1 < $(DOWNLOAD_DIR)/ttmkfdir-$(TTMKFDIR_VERSION).patch
@@ -59,7 +59,7 @@ ttmkfdir_clean:
 	$(Q)rm -rf $(SYSROOT)/usr/bin/ttmkfdir
 
 download_ttmkfdir:
-	$(call EMBTK_GENERIC_MESSAGE,"Downloading ttmkfdir-$(TTMKFDIR_VERSION) \
+	$(call embtk_generic_message,"Downloading ttmkfdir-$(TTMKFDIR_VERSION) \
 	if necessary...")
 	@test -e $(DOWNLOAD_DIR)/$(TTMKFDIR_PACKAGE) || \
 	wget -O $(DOWNLOAD_DIR)/$(TTMKFDIR_PACKAGE) \
@@ -70,7 +70,7 @@ download_ttmkfdir:
 
 $(FREEFONT_TTF_BUILD_DIR)/.installed: freetype_install \
 	download_freefont_ttf $(FREEFONT_TTF_BUILD_DIR)/.decompressed
-	$(call EMBTK_GENERIC_MESSAGE,"Installing \
+	$(call embtk_generic_message,"Installing \
 	freefont-$(FREEFONT_TTF_VERSION) in your root filesystem...")
 	$(Q)mkdir -p $(ROOTFS)/usr/share/fonts
 	$(Q)mkdir -p $(ROOTFS)/usr/share/fonts/truetype
@@ -80,16 +80,16 @@ $(FREEFONT_TTF_BUILD_DIR)/.installed: freetype_install \
 	@touch $@
 
 download_freefont_ttf:
-	$(call EMBTK_GENERIC_MESSAGE,"Downloading $(FREEFONT_TTF_PACKAGE) \
+	$(call embtk_generic_message,"Downloading $(FREEFONT_TTF_PACKAGE) \
 	if necessary...")
 	@test -e $(DOWNLOAD_DIR)/$(FREEFONT_TTF_PACKAGE) || \
 	wget -O $(DOWNLOAD_DIR)/$(FREEFONT_TTF_PACKAGE) \
 	$(FREEFONT_SITE)/$(FREEFONT_TTF_PACKAGE)
 
 $(FREEFONT_TTF_BUILD_DIR)/.decompressed:
-	$(call EMBTK_GENERIC_MESSAGE,"Decompressing $(FREEFONT_TTF_PACKAGE)...")
+	$(call embtk_generic_message,"Decompressing $(FREEFONT_TTF_PACKAGE)...")
 	@tar -C $(PACKAGES_BUILD) -xzf $(DOWNLOAD_DIR)/$(FREEFONT_TTF_PACKAGE)
 	@touch $@
 
 freefont_ttf_clean:
-	$(call EMBTK_GENERIC_MESSAGE,"Cleanup freefont...")
+	$(call embtk_generic_message,"Cleanup freefont...")
diff --git a/packages/graphics/freetype/freetype.mk b/packages/graphics/freetype/freetype.mk
index a63543a..fced3ca 100644
--- a/packages/graphics/freetype/freetype.mk
+++ b/packages/graphics/freetype/freetype.mk
@@ -24,7 +24,7 @@
 ################################################################################
 
 FREETYPE_NAME		:= freetype
-FREETYPE_VERSION	:= $(call EMBTK_GET_PKG_VERSION,FREETYPE)
+FREETYPE_VERSION	:= $(call embtk_get_pkgversion,FREETYPE)
 FREETYPE_SITE		:= http://downloads.sourceforge.net/project/freetype/freetype2/$(FREETYPE_VERSION)
 FREETYPE_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
 FREETYPE_PATCH_SITE	:= ftp://ftp.embtoolkit.org/embtoolkit.org/freetype/$(FREETYPE_VERSION)
@@ -42,10 +42,10 @@ FREETYPE_DEPS		:= zlib_install
 FREETYPE_MAKE_OPTS	:= LIBTOOL=$(FREETYPE_BUILD_DIR)/builds/unix/libtool
 
 freetype_install:
-	$(call EMBTK_INSTALL_PKG,FREETYPE)
+	$(call embtk_install_pkg,FREETYPE)
 
 download_freetype:
-	$(call EMBTK_DOWNLOAD_PKG,FREETYPE)
+	$(call embtk_download_pkg,FREETYPE)
 
 freetype_clean:
-	$(call EMBTK_CLEANUP_PKG,FREETYPE)
+	$(call embtk_cleanup_pkg,FREETYPE)
diff --git a/packages/graphics/gtk/gtk.mk b/packages/graphics/gtk/gtk.mk
index 5f4f404..a2c791e 100644
--- a/packages/graphics/gtk/gtk.mk
+++ b/packages/graphics/gtk/gtk.mk
@@ -24,8 +24,8 @@
 ################################################################################
 
 GTK_NAME := gtk+
-GTK_MAJOR_VERSION := $(call EMBTK_GET_PKG_VERSION,GTK_MAJOR)
-GTK_VERSION := $(call EMBTK_GET_PKG_VERSION,GTK)
+GTK_MAJOR_VERSION := $(call embtk_get_pkgversion,GTK_MAJOR)
+GTK_VERSION := $(call embtk_get_pkgversion,GTK)
 GTK_SITE := http://ftp.gnome.org/pub/gnome/sources/gtk+/$(GTK_MAJOR_VERSION)
 GTK_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
 GTK_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/gtk/$(GTK_VERSION)
@@ -62,9 +62,9 @@ gtk_install:
 
 $(GTK_BUILD_DIR)/.installed: $(GTK_DEPS) download_gtk \
 	$(GTK_BUILD_DIR)/.decompressed $(GTK_BUILD_DIR)/.configured
-	$(call EMBTK_GENERIC_MESSAGE,"Compiling and installing \
+	$(call embtk_generic_message,"Compiling and installing \
 	gtk-$(GTK_VERSION) in your root filesystem...")
-	$(call EMBTK_KILL_LT_RPATH, $(GTK_BUILD_DIR))
+	$(call __embtk_kill_lt_rpath, $(GTK_BUILD_DIR))
 	$(Q)$(MAKE) -C $(GTK_BUILD_DIR) $(J)
 	$(Q)$(MAKE) -C $(GTK_BUILD_DIR) DESTDIR=$(SYSROOT) install
 	$(Q)$(MAKE) libtool_files_adapt
@@ -73,13 +73,13 @@ $(GTK_BUILD_DIR)/.installed: $(GTK_DEPS) download_gtk \
 	@touch $@
 
 download_gtk:
-	$(call EMBTK_DOWNLOAD_PKG,GTK)
+	$(call embtk_download_pkg,GTK)
 
 $(GTK_BUILD_DIR)/.decompressed:
-	$(call EMBTK_DECOMPRESS_PKG,GTK)
+	$(call embtk_decompress_pkg,GTK)
 
 $(GTK_BUILD_DIR)/.configured:
-	$(call EMBTK_CONFIGURE_PKG,GTK)
+	$(call embtk_configure_pkg,GTK)
 
 $(GTK_BUILD_DIR)/.patchlibtool:
 ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y)
@@ -118,4 +118,4 @@ $(GTK_BUILD_DIR)/.special:
 	@touch $@
 
 gtk_clean:
-	$(call EMBTK_CLEANUP_PKG,GTK)
+	$(call embtk_cleanup_pkg,GTK)
diff --git a/packages/graphics/imlib2/imlib2.mk b/packages/graphics/imlib2/imlib2.mk
index 990a3b9..c51dfdf 100644
--- a/packages/graphics/imlib2/imlib2.mk
+++ b/packages/graphics/imlib2/imlib2.mk
@@ -24,7 +24,7 @@
 ################################################################################
 
 IMLIB2_NAME := imlib2
-IMLIB2_VERSION := $(call EMBTK_GET_PKG_VERSION,IMLIB2)
+IMLIB2_VERSION := $(call embtk_get_pkgversion,IMLIB2)
 IMLIB2_SITE := http://downloads.sourceforge.net/project/enlightenment/imlib2-src/$(IMLIB2_VERSION)
 IMLIB2_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
 IMLIB2_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/imlib2/$(IMLIB2_VERSION)
@@ -48,7 +48,7 @@ imlib2_install:
 
 $(IMLIB2_BUILD_DIR)/.installed: $(IMLIB2_DEPS) download_imlib2 \
 	$(IMLIB2_BUILD_DIR)/.decompressed $(IMLIB2_BUILD_DIR)/.configured
-	$(call EMBTK_GENERIC_MESSAGE,"Compiling and installing \
+	$(call embtk_generic_message,"Compiling and installing \
 	imlib2-$(IMLIB2_VERSION) in your root filesystem...")
 	$(Q)$(MAKE) -C $(IMLIB2_BUILD_DIR) $(J)
 	$(Q)$(MAKE) -C $(IMLIB2_BUILD_DIR) DESTDIR=$(SYSROOT) install
@@ -57,16 +57,16 @@ $(IMLIB2_BUILD_DIR)/.installed: $(IMLIB2_DEPS) download_imlib2 \
 	@touch $@
 
 download_imlib2:
-	$(call EMBTK_DOWNLOAD_PKG,IMLIB2)
+	$(call embtk_download_pkg,IMLIB2)
 
 $(IMLIB2_BUILD_DIR)/.decompressed:
-	$(call EMBTK_DECOMPRESS_PKG,IMLIB2)
+	$(call embtk_decompress_pkg,IMLIB2)
 
 $(IMLIB2_BUILD_DIR)/.configured:
-	$(call EMBTK_CONFIGURE_PKG,IMLIB2)
+	$(call embtk_configure_pkg,IMLIB2)
 
 imlib2_clean:
-	$(call EMBTK_CLEANUP_PKG,IMLIB2)
+	$(call embtk_cleanup_pkg,IMLIB2)
 
 .PHONY: $(IMLIB2_BUILD_DIR)/.special
 
diff --git a/packages/graphics/libjpeg/libjpeg.mk b/packages/graphics/libjpeg/libjpeg.mk
index 6942b1c..d0e8407 100644
--- a/packages/graphics/libjpeg/libjpeg.mk
+++ b/packages/graphics/libjpeg/libjpeg.mk
@@ -24,7 +24,7 @@
 ################################################################################
 
 LIBJPEG_NAME := jpeg
-LIBJPEG_VERSION := $(call EMBTK_GET_PKG_VERSION,LIBJPEG)
+LIBJPEG_VERSION := $(call embtk_get_pkgversion,LIBJPEG)
 LIBJPEG_SITE := http://www.ijg.org/files
 LIBJPEG_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
 LIBJPEG_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/jpeg/$(LIBJPEG_VERSION)
@@ -45,7 +45,7 @@ libjpeg_install:
 
 $(LIBJPEG_BUILD_DIR)/.installed: download_libjpeg \
 	$(LIBJPEG_BUILD_DIR)/.decompressed $(LIBJPEG_BUILD_DIR)/.configured
-	$(call EMBTK_GENERIC_MESSAGE,"Compiling and installing \
+	$(call embtk_generic_message,"Compiling and installing \
 	jpeg-$(LIBJPEG_VERSION) in your root filesystem...")
 	$(Q)$(MAKE) -C $(LIBJPEG_BUILD_DIR) $(J)
 	$(Q)$(MAKE) -C $(LIBJPEG_BUILD_DIR) DESTDIR=$(SYSROOT) install
@@ -53,13 +53,13 @@ $(LIBJPEG_BUILD_DIR)/.installed: download_libjpeg \
 	@touch $@
 
 download_libjpeg:
-	$(call EMBTK_DOWNLOAD_PKG,LIBJPEG)
+	$(call embtk_download_pkg,LIBJPEG)
 
 $(LIBJPEG_BUILD_DIR)/.decompressed:
-	$(call EMBTK_DECOMPRESS_PKG,LIBJPEG)
+	$(call embtk_decompress_pkg,LIBJPEG)
 
 $(LIBJPEG_BUILD_DIR)/.configured:
-	$(call EMBTK_CONFIGURE_PKG,LIBJPEG)
+	$(call embtk_configure_pkg,LIBJPEG)
 
 libjpeg_clean:
-	$(call EMBTK_CLEANUP_PKG,LIBJPEG)
+	$(call embtk_cleanup_pkg,LIBJPEG)
diff --git a/packages/graphics/libpng/libpng.mk b/packages/graphics/libpng/libpng.mk
index 9917528..2171006 100644
--- a/packages/graphics/libpng/libpng.mk
+++ b/packages/graphics/libpng/libpng.mk
@@ -24,7 +24,7 @@
 ################################################################################
 
 LIBPNG_NAME := libpng
-LIBPNG_VERSION := $(call EMBTK_GET_PKG_VERSION,LIBPNG)
+LIBPNG_VERSION := $(call embtk_get_pkgversion,LIBPNG)
 LIBPNG_SITE := http://download.sourceforge.net/libpng
 LIBPNG_PACKAGE := libpng-$(LIBPNG_VERSION).tar.gz
 LIBPNG_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
@@ -48,7 +48,7 @@ libpng_install:
 
 $(LIBPNG_BUILD_DIR)/.installed:  $(LIBPNG_DEPS) download_libpng \
 	$(LIBPNG_BUILD_DIR)/.decompressed $(LIBPNG_BUILD_DIR)/.configured
-	$(call EMBTK_GENERIC_MESSAGE,"Compiling and installing \
+	$(call embtk_generic_message,"Compiling and installing \
 	libpng-$(LIBPNG_VERSION) in your root filesystem...")
 	$(Q)$(MAKE) -C $(LIBPNG_BUILD_DIR) $(J)
 	$(Q)$(MAKE) -C $(LIBPNG_BUILD_DIR) DESTDIR=$(SYSROOT) install
@@ -57,13 +57,13 @@ $(LIBPNG_BUILD_DIR)/.installed:  $(LIBPNG_DEPS) download_libpng \
 	@touch $@
 
 download_libpng:
-	$(call EMBTK_DOWNLOAD_PKG,LIBPNG)
+	$(call embtk_download_pkg,LIBPNG)
 
 $(LIBPNG_BUILD_DIR)/.decompressed:
-	$(call EMBTK_DECOMPRESS_PKG,LIBPNG)
+	$(call embtk_decompress_pkg,LIBPNG)
 
 $(LIBPNG_BUILD_DIR)/.configured:
-	$(call EMBTK_CONFIGURE_PKG,LIBPNG)
+	$(call embtk_configure_pkg,LIBPNG)
 
 libpng_clean:
-	$(call EMBTK_CLEANUP_PKG,LIBPNG)
+	$(call embtk_cleanup_pkg,LIBPNG)
diff --git a/packages/graphics/libtiff/libtiff.mk b/packages/graphics/libtiff/libtiff.mk
index a67ad26..c7ad8f7 100644
--- a/packages/graphics/libtiff/libtiff.mk
+++ b/packages/graphics/libtiff/libtiff.mk
@@ -24,7 +24,7 @@
 ################################################################################
 
 LIBTIFF_NAME := libtiff
-LIBTIFF_VERSION := $(call EMBTK_GET_PKG_VERSION,LIBTIFF)
+LIBTIFF_VERSION := $(call embtk_get_pkgversion,LIBTIFF)
 LIBTIFF_SITE := ftp://ftp.remotesensing.org/pub/libtiff
 LIBTIFF_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
 LIBTIFF_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/libtiff/$(LIBTIFF_VERSION)
@@ -49,7 +49,7 @@ libtiff_install:
 
 $(LIBTIFF_BUILD_DIR)/.installed: download_libtiff \
 	$(LIBTIFF_BUILD_DIR)/.decompressed $(LIBTIFF_BUILD_DIR)/.configured
-	$(call EMBTK_GENERIC_MESSAGE,"Compiling and installing \
+	$(call embtk_generic_message,"Compiling and installing \
 	libtiff-$(LIBTIFF_VERSION) in your root filesystem...")
 	$(Q)$(MAKE) -C $(LIBTIFF_BUILD_DIR) $(J)
 	$(Q)$(MAKE) -C $(LIBTIFF_BUILD_DIR) DESTDIR=$(SYSROOT) install
@@ -58,13 +58,13 @@ $(LIBTIFF_BUILD_DIR)/.installed: download_libtiff \
 	@touch $@
 
 download_libtiff:
-	$(call EMBTK_DOWNLOAD_PKG,LIBTIFF)
+	$(call embtk_download_pkg,LIBTIFF)
 
 $(LIBTIFF_BUILD_DIR)/.decompressed:
-	$(call EMBTK_DECOMPRESS_PKG,LIBTIFF)
+	$(call embtk_decompress_pkg,LIBTIFF)
 
 $(LIBTIFF_BUILD_DIR)/.configured:
-	$(call EMBTK_CONFIGURE_PKG,LIBTIFF)
+	$(call embtk_configure_pkg,LIBTIFF)
 
 libtiff_clean:
-	$(call EMBTK_CLEANUP_PKG,LIBTIFF)
+	$(call embtk_cleanup_pkg,LIBTIFF)
diff --git a/packages/graphics/pango/pango.mk b/packages/graphics/pango/pango.mk
index 3e7c3fe..07f7358 100644
--- a/packages/graphics/pango/pango.mk
+++ b/packages/graphics/pango/pango.mk
@@ -24,8 +24,8 @@
 ################################################################################
 
 PANGO_NAME := pango
-PANGO_MAJOR_VERSION := $(call EMBTK_GET_PKG_VERSION,PANGO_MAJOR)
-PANGO_VERSION := $(call EMBTK_GET_PKG_VERSION,PANGO)
+PANGO_MAJOR_VERSION := $(call embtk_get_pkgversion,PANGO_MAJOR)
+PANGO_VERSION := $(call embtk_get_pkgversion,PANGO)
 PANGO_SITE := http://ftp.gnome.org/pub/gnome/sources/pango/$(PANGO_MAJOR_VERSION)
 PANGO_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
 PANGO_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/pango/$(PANGO_VERSION)
@@ -55,7 +55,7 @@ pango_install:
 
 $(PANGO_BUILD_DIR)/.installed: $(PANGO_DEPS) download_pango \
 	$(PANGO_BUILD_DIR)/.decompressed $(PANGO_BUILD_DIR)/.configured
-	$(call EMBTK_GENERIC_MESSAGE,"Compiling and installing \
+	$(call embtk_generic_message,"Compiling and installing \
 	pango-$(PANGO_VERSION) in your root filesystem...")
 	$(Q)$(MAKE) -C $(PANGO_BUILD_DIR) $(J)
 	$(Q)$(MAKE) -C $(PANGO_BUILD_DIR) DESTDIR=$(SYSROOT) install
@@ -65,13 +65,13 @@ $(PANGO_BUILD_DIR)/.installed: $(PANGO_DEPS) download_pango \
 	@touch $@
 
 download_pango:
-	$(call EMBTK_DOWNLOAD_PKG,PANGO)
+	$(call embtk_download_pkg,PANGO)
 
 $(PANGO_BUILD_DIR)/.decompressed:
-	$(call EMBTK_DECOMPRESS_PKG,PANGO)
+	$(call embtk_decompress_pkg,PANGO)
 
 $(PANGO_BUILD_DIR)/.configured:
-	$(call EMBTK_CONFIGURE_PKG,PANGO)
+	$(call embtk_configure_pkg,PANGO)
 
 $(PANGO_BUILD_DIR)/.patchlibtool:
 	$(Q)PANGO_LT_FILES=`find $(SYSROOT)/usr/$(LIBDIR)/* -type f -name *.la`; \
@@ -91,4 +91,4 @@ $(PANGO_BUILD_DIR)/.special:
 	@touch $@
 
 pango_clean:
-	$(call EMBTK_CLEANUP_PKG,PANGO)
+	$(call embtk_cleanup_pkg,PANGO)
diff --git a/packages/graphics/pixman/pixman.mk b/packages/graphics/pixman/pixman.mk
index 26d4460..bcceb7b 100644
--- a/packages/graphics/pixman/pixman.mk
+++ b/packages/graphics/pixman/pixman.mk
@@ -24,7 +24,7 @@
 ################################################################################
 
 PIXMAN_NAME := pixman
-PIXMAN_VERSION := $(call EMBTK_GET_PKG_VERSION,PIXMAN)
+PIXMAN_VERSION := $(call embtk_get_pkgversion,PIXMAN)
 PIXMAN_SITE := http://www.cairographics.org/releases
 PIXMAN_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
 PIXMAN_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/pixman/$(PIXMAN_VERSION)
@@ -39,10 +39,10 @@ PIXMAN_LIBS = libpixman-*
 PIXMAN_PKGCONFIGS = pixman-*.pc
 
 pixman_install:
-	$(call EMBTK_INSTALL_PKG,PIXMAN)
+	$(call embtk_install_pkg,PIXMAN)
 
 download_pixman:
-	$(call EMBTK_DOWNLOAD_PKG,PIXMAN)
+	$(call embtk_download_pkg,PIXMAN)
 
 pixman_clean:
-	$(call EMBTK_CLEANUP_PKG,PIXMAN)
+	$(call embtk_cleanup_pkg,PIXMAN)
diff --git a/packages/misc/expat/expat.mk b/packages/misc/expat/expat.mk
index b74814c..51468d2 100644
--- a/packages/misc/expat/expat.mk
+++ b/packages/misc/expat/expat.mk
@@ -24,7 +24,7 @@
 ################################################################################
 
 EXPAT_NAME := expat
-EXPAT_VERSION := $(call EMBTK_GET_PKG_VERSION,EXPAT)
+EXPAT_VERSION := $(call embtk_get_pkgversion,EXPAT)
 EXPAT_SITE := http://downloads.sourceforge.net/expat
 EXPAT_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
 EXPAT_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/expat/$(EXPAT_VERSION)
@@ -41,10 +41,10 @@ EXPAT_PKGCONFIGS =
 EXPAT_DEPS =
 
 expat_install:
-	$(call EMBTK_INSTALL_PKG,EXPAT)
+	$(call embtk_install_pkg,EXPAT)
 
 download_expat:
-	$(call EMBTK_DOWNLOAD_PKG,EXPAT)
+	$(call embtk_download_pkg,EXPAT)
 
 expat_clean:
-	$(call EMBTK_CLEANUP_PKG,EXPAT)
+	$(call embtk_cleanup_pkg,EXPAT)
diff --git a/packages/misc/foo/foo-autotools.mk b/packages/misc/foo/foo-autotools.mk
index 87fd9a2..81bc730 100644
--- a/packages/misc/foo/foo-autotools.mk
+++ b/packages/misc/foo/foo-autotools.mk
@@ -24,7 +24,7 @@
 ################################################################################
 
 FOO_NAME		:= foo
-FOO_VERSION		:= $(call EMBTK_GET_PKG_VERSION,FOO)
+FOO_VERSION		:= $(call embtk_get_pkgversion,FOO)
 FOO_SITE		:= http://www.foo.org/download
 FOO_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
 FOO_PATCH_SITE		:= ftp://ftp.embtoolkit.org/embtoolkit.org/foo/$(FOO_VERSION)
@@ -45,10 +45,10 @@ FOO_CONFIGURE_OPTS	:=
 FOO_DEPS :=
 
 foo_install:
-	$(call EMBTK_INSTALL_PKG,FOO)
+	$(call embtk_install_pkg,FOO)
 
 download_foo:
-	$(call EMBTK_DOWNLOAD_PKG,FOO)
+	$(call embtk_download_pkg,FOO)
 
 foo_clean:
-	$(call EMBTK_CLEANUP_PKG,FOO)
+	$(call embtk_cleanup_pkg,FOO)
diff --git a/packages/misc/gettext/gettext.mk b/packages/misc/gettext/gettext.mk
index b4392be..8e57677 100644
--- a/packages/misc/gettext/gettext.mk
+++ b/packages/misc/gettext/gettext.mk
@@ -24,7 +24,7 @@
 ################################################################################
 
 GETTEXT_NAME		:= gettext
-GETTEXT_VERSION		:= $(call EMBTK_GET_PKG_VERSION,GETTEXT)
+GETTEXT_VERSION		:= $(call embtk_get_pkgversion,GETTEXT)
 GETTEXT_SITE		:= http://ftp.gnu.org/pub/gnu/gettext
 GETTEXT_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
 GETTEXT_PATCH_SITE	:= ftp://ftp.embtoolkit.org/embtoolkit.org/gettext/$(GETTEXT_VERSION)
@@ -53,15 +53,15 @@ GETTEXT_CONFIGURE_OPTS	:= --enable-relocatable --with-included-gettext	\
 GETTEXT_DEPS = ncurses_install libxml2_install
 
 gettext_install:
-	$(call EMBTK_INSTALL_PKG,GETTEXT)
+	$(call embtk_install_pkg,GETTEXT)
 	@test -e $(GETTEXT_BUILD_DIR)/.patchlibtool || \
 	$(MAKE) $(GETTEXT_BUILD_DIR)/.patchlibtool
 
 download_gettext:
-	$(call EMBTK_DOWNLOAD_PKG,GETTEXT)
+	$(call embtk_download_pkg,GETTEXT)
 
 gettext_clean:
-	$(call EMBTK_CLEANUP_PKG,GETTEXT)
+	$(call embtk_cleanup_pkg,GETTEXT)
 
 #FIXME: this should be fixed in gettext project
 $(GETTEXT_BUILD_DIR)/.patchlibtool:
diff --git a/packages/misc/glib/glib.mk b/packages/misc/glib/glib.mk
index e999b8c..58e2a6d 100644
--- a/packages/misc/glib/glib.mk
+++ b/packages/misc/glib/glib.mk
@@ -24,8 +24,8 @@
 ################################################################################
 
 GLIB_NAME		:= glib
-GLIB_MAJOR_VERSION	:= $(call EMBTK_GET_PKG_VERSION,GLIB_MAJOR)
-GLIB_VERSION		:= $(call EMBTK_GET_PKG_VERSION,GLIB)
+GLIB_MAJOR_VERSION	:= $(call embtk_get_pkgversion,GLIB_MAJOR)
+GLIB_VERSION		:= $(call embtk_get_pkgversion,GLIB)
 GLIB_SITE		:= http://ftp.gnome.org/pub/gnome/sources/glib/$(GLIB_MAJOR_VERSION)
 GLIB_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
 GLIB_PATCH_SITE		:= ftp://ftp.embtoolkit.org/embtoolkit.org/glib/$(GLIB_VERSION)
@@ -53,12 +53,12 @@ GLIB_CONFIGURE_OPTS	:= --disable-fam
 GLIB_DEPS := zlib_install gettext_install
 
 glib_install:
-	$(call EMBTK_INSTALL_PKG,GLIB)
+	$(call embtk_install_pkg,GLIB)
 	@test -e $(GLIB_BUILD_DIR)/.patchlibtool || \
 	$(MAKE) $(GLIB_BUILD_DIR)/.patchlibtool
 
 download_glib:
-	$(call EMBTK_DOWNLOAD_PKG,GLIB)
+	$(call embtk_download_pkg,GLIB)
 
 #FIXME: this should be fixed in glib2 project
 $(GLIB_BUILD_DIR)/.patchlibtool:
@@ -85,5 +85,5 @@ $(GLIB_BUILD_DIR)/.patchlibtool:
 	@touch $@
 
 glib_clean:
-	$(call EMBTK_CLEANUP_PKG,GLIB)
+	$(call embtk_cleanup_pkg,GLIB)
 
diff --git a/packages/misc/gperf/gperf.mk b/packages/misc/gperf/gperf.mk
index dbbdce3..2d98b3f 100644
--- a/packages/misc/gperf/gperf.mk
+++ b/packages/misc/gperf/gperf.mk
@@ -24,7 +24,7 @@
 ################################################################################
 
 GPERF_NAME		:= gperf
-GPERF_VERSION		:= $(call EMBTK_GET_PKG_VERSION,GPERF)
+GPERF_VERSION		:= $(call embtk_get_pkgversion,GPERF)
 GPERF_SITE		:= http://ftp.gnu.org/gnu/gperf
 GPERF_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
 GPERF_PATCH_SITE	:= ftp://ftp.embtoolkit.org/embtoolkit.org/gperf/$(GPERF_VERSION)
@@ -48,10 +48,10 @@ GPERF_CONFIGURE_OPTS	:=
 GPERF_DEPS :=
 
 gperf_install:
-	$(call EMBTK_INSTALL_PKG,GPERF)
+	$(call embtk_install_pkg,GPERF)
 
 gperf_clean:
-	$(call EMBTK_CLEANUP_PKG,GPERF)
+	$(call embtk_cleanup_pkg,GPERF)
 
 #
 # gperf for for host
@@ -71,7 +71,7 @@ GPERF_HOST_BUILD_DIR	:= $(TOOLS_BUILD)/gperf-$(GPERF_VERSION)
 # common targets
 #
 gperf_host_install:
-	$(call EMBTK_INSTALL_HOSTPKG,GPERF_HOST)
+	$(call embtk_install_hostpkg,GPERF_HOST)
 
 download_gperf download_gperf_host:
-	$(call EMBTK_DOWNLOAD_PKG,GPERF)
+	$(call embtk_download_pkg,GPERF)
diff --git a/packages/misc/intltool/intltool.mk b/packages/misc/intltool/intltool.mk
index 71b2703..6b54fdd 100644
--- a/packages/misc/intltool/intltool.mk
+++ b/packages/misc/intltool/intltool.mk
@@ -24,8 +24,8 @@
 ################################################################################
 
 INTLTOOL_NAME		:= intltool
-INTLTOOL_MAJOR_VERSION	:= $(call EMBTK_GET_PKG_VERSION,INTLTOOL_MAJOR)
-INTLTOOL_VERSION	:= $(call EMBTK_GET_PKG_VERSION,INTLTOOL)
+INTLTOOL_MAJOR_VERSION	:= $(call embtk_get_pkgversion,INTLTOOL_MAJOR)
+INTLTOOL_VERSION	:= $(call embtk_get_pkgversion,INTLTOOL)
 INTLTOOL_SITE		:= http://ftp.gnome.org/pub/gnome/sources/intltool/$(INTLTOOL_MAJOR_VERSION)
 INTLTOOL_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
 INTLTOOL_PATCH_SITE	:= ftp://ftp.embtoolkit.org/embtoolkit.org/intltool/$(INTLTOOL_VERSION)
@@ -49,10 +49,10 @@ INTLTOOL_CONFIGURE_OPTS	:=
 INTLTOOL_DEPS :=
 
 intltool_install:
-	$(call EMBTK_INSTALL_PKG,INTLTOOL)
+	$(call embtk_install_pkg,INTLTOOL)
 
 intltool_clean:
-	$(call EMBTK_CLEANUP_PKG,INTLTOOL)
+	$(call embtk_cleanup_pkg,INTLTOOL)
 
 #
 # intltool for host
@@ -67,10 +67,10 @@ INTLTOOL_HOST_SRC_DIR		:= $(TOOLS_BUILD)/intltool-$(INTLTOOL_VERSION)
 INTLTOOL_HOST_BUILD_DIR		:= $(TOOLS_BUILD)/intltool-$(INTLTOOL_VERSION)
 
 intltool_host_install:
-	$(call EMBTK_INSTALL_HOSTPKG,INTLTOOL_HOST)
+	$(call embtk_install_hostpkg,INTLTOOL_HOST)
 
 #
 # common targets
 #
 download_intltool download_intltool_host:
-	$(call EMBTK_DOWNLOAD_PKG,INTLTOOL)
+	$(call embtk_download_pkg,INTLTOOL)
diff --git a/packages/misc/libelf/libelf.mk b/packages/misc/libelf/libelf.mk
index 656abb2..fb974da 100644
--- a/packages/misc/libelf/libelf.mk
+++ b/packages/misc/libelf/libelf.mk
@@ -43,7 +43,7 @@ libelf_install:
 
 $(LIBELF_BUILD_DIR)/.installed: $(LIBELF_DEPS) download_libelf \
 	$(LIBELF_BUILD_DIR)/.decompressed $(LIBELF_BUILD_DIR)/.configured
-	$(call EMBTK_GENERIC_MESSAGE,"Compiling and installing \
+	$(call embtk_generic_message,"Compiling and installing \
 	libelf-$(LIBELF_VERSION) in your root filesystem...")
 	$(Q)$(MAKE) -C $(LIBELF_BUILD_DIR) $(J)
 	$(Q)$(MAKE) -C $(LIBELF_BUILD_DIR) install
@@ -51,7 +51,7 @@ $(LIBELF_BUILD_DIR)/.installed: $(LIBELF_DEPS) download_libelf \
 	@touch $@
 
 download_libelf:
-	$(call EMBTK_GENERIC_MESSAGE,"Downloading $(LIBELF_PACKAGE) \
+	$(call embtk_generic_message,"Downloading $(LIBELF_PACKAGE) \
 	if necessary...")
 	@test -e $(DOWNLOAD_DIR)/$(LIBELF_PACKAGE) || \
 	wget -O $(DOWNLOAD_DIR)/$(LIBELF_PACKAGE) \
@@ -63,7 +63,7 @@ ifeq ($(CONFIG_EMBTK_LIBELF_NEED_PATCH),y)
 endif
 
 $(LIBELF_BUILD_DIR)/.decompressed:
-	$(call EMBTK_GENERIC_MESSAGE,"Decompressing $(LIBELF_PACKAGE) ...")
+	$(call embtk_generic_message,"Decompressing $(LIBELF_PACKAGE) ...")
 	@tar -C $(PACKAGES_BUILD) -xzf $(DOWNLOAD_DIR)/$(LIBELF_PACKAGE)
 ifeq ($(CONFIG_EMBTK_LIBELF_NEED_PATCH),y)
 	cd $(LIBELF_BUILD_DIR); \
@@ -96,7 +96,7 @@ $(LIBELF_BUILD_DIR)/.configured:
 	@touch $@
 
 libelf_clean:
-	$(call EMBTK_GENERIC_MESSAGE,"cleanup libelf...")
+	$(call embtk_generic_message,"cleanup libelf...")
 	$(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(LIBELF_BINS)
 	$(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(LIBELF_SBINS)
 	$(Q)-cd $(SYSROOT)/usr/include; rm -rf $(LIBELF_INCLUDES)
diff --git a/packages/misc/libxml/libxml.mk b/packages/misc/libxml/libxml.mk
index 465167a..f8a38de 100644
--- a/packages/misc/libxml/libxml.mk
+++ b/packages/misc/libxml/libxml.mk
@@ -24,7 +24,7 @@
 ################################################################################
 
 LIBXML2_NAME		:= libxml2
-LIBXML2_VERSION		:= $(call EMBTK_GET_PKG_VERSION,LIBXML2)
+LIBXML2_VERSION		:= $(call embtk_get_pkgversion,LIBXML2)
 LIBXML2_SITE		:= ftp://xmlsoft.org/libxml2
 LIBXML2_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
 LIBXML2_PATCH_SITE	:= ftp://ftp.embtoolkit.org/embtoolkit.org/libxml2/$(LIBXML2_VERSION)
@@ -41,10 +41,10 @@ LIBXML2_PKGCONFIGS	= libxml*.pc
 LIBXML2_CONFIGURE_OPTS	:= --without-python
 
 libxml2_install:
-	$(call EMBTK_INSTALL_PKG,LIBXML2)
+	$(call embtk_install_pkg,LIBXML2)
 
 download_libxml2:
-	$(call EMBTK_DOWNLOAD_PKG,LIBXML2)
+	$(call embtk_download_pkg,LIBXML2)
 
 libxml2_clean:
-	$(call EMBTK_CLEANUP_PKG,LIBXML2)
+	$(call embtk_cleanup_pkg,LIBXML2)
diff --git a/packages/misc/ncurses/ncurses.mk b/packages/misc/ncurses/ncurses.mk
index cf5b22d..e65507b 100644
--- a/packages/misc/ncurses/ncurses.mk
+++ b/packages/misc/ncurses/ncurses.mk
@@ -24,7 +24,7 @@
 ################################################################################
 
 NCURSES_NAME := ncurses
-NCURSES_VERSION := $(call EMBTK_GET_PKG_VERSION,NCURSES)
+NCURSES_VERSION := $(call embtk_get_pkgversion,NCURSES)
 NCURSES_SITE := http://ftp.gnu.org/pub/gnu/ncurses
 NCURSES_PACKAGE := ncurses-$(NCURSES_VERSION).tar.gz
 NCURSES_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
@@ -51,14 +51,14 @@ NCURSES_CONFIGURE_OPTS	:= --disable-rpath --without-cxx-binding	\
 			--program-prefix=""
 
 ncurses_install:
-	$(call EMBTK_INSTALL_PKG,NCURSES)
+	$(call embtk_install_pkg,NCURSES)
 	$(Q)$(MAKE) $(NCURSES_BUILD_DIR)/.special
 
 download_ncurses:
-	$(call EMBTK_DOWNLOAD_PKG,NCURSES)
+	$(call embtk_download_pkg,NCURSES)
 
 ncurses_clean:
-	$(call EMBTK_CLEANUP_PKG,NCURSES)
+	$(call embtk_cleanup_pkg,NCURSES)
 
 .PHONY: $(NCURSES_BUILD_DIR)/.special ncurses_clean
 
diff --git a/packages/misc/tslib/tslib.mk b/packages/misc/tslib/tslib.mk
index e8194a1..970a89b 100644
--- a/packages/misc/tslib/tslib.mk
+++ b/packages/misc/tslib/tslib.mk
@@ -24,7 +24,7 @@
 ################################################################################
 
 TSLIB_NAME		:= tslib
-TSLIB_VERSION		:= $(call EMBTK_GET_PKG_VERSION,TSLIB)
+TSLIB_VERSION		:= $(call embtk_get_pkgversion,TSLIB)
 TSLIB_SITE		:= http://download.berlios.de/tslib
 TSLIB_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
 TSLIB_PATCH_SITE	:= ftp://ftp.embtoolkit.org/embtoolkit.org/tslib/$(TSLIB_VERSION)
@@ -41,14 +41,14 @@ TSLIB_PKGCONFIGS	= tslib*.pc
 TSLIB_DEPS =
 
 tslib_install:
-	$(call EMBTK_INSTALL_PKG,TSLIB)
+	$(call embtk_install_pkg,TSLIB)
 	$(Q)$(MAKE) $(TSLIB_BUILD_DIR)/.special
 
 download_tslib:
-	$(call EMBTK_DOWNLOAD_PKG,TSLIB)
+	$(call embtk_download_pkg,TSLIB)
 
 tslib_clean:
-	$(call EMBTK_CLEANUP_PKG,TSLIB)
+	$(call embtk_cleanup_pkg,TSLIB)
 
 .PHONY: $(TSLIB_BUILD_DIR)/.special
 
diff --git a/packages/scripting-languages/lua/lua.mk b/packages/scripting-languages/lua/lua.mk
index 6ef2582..da98949 100644
--- a/packages/scripting-languages/lua/lua.mk
+++ b/packages/scripting-languages/lua/lua.mk
@@ -43,7 +43,7 @@ lua_install:
 
 $(LUA_BUILD_DIR)/.installed: $(LUA_DEPS) download_lua \
 	$(LUA_BUILD_DIR)/.decompressed
-	$(call EMBTK_GENERIC_MESSAGE,"Compiling and installing \
+	$(call embtk_generic_message,"Compiling and installing \
 	lua-$(LUA_VERSION) in your root filesystem...")
 	$(Q)$(MAKE) -C $(LUA_BUILD_DIR) CC=$(TARGETCC_CACHED) \
 	AR="$(TARGETAR) rcu" RANLIB=$(TARGETRANLIB) \
@@ -55,7 +55,7 @@ $(LUA_BUILD_DIR)/.installed: $(LUA_DEPS) download_lua \
 	@touch $@
 
 download_lua:
-	$(call EMBTK_GENERIC_MESSAGE,"Downloading $(LUA_PACKAGE) \
+	$(call embtk_generic_message,"Downloading $(LUA_PACKAGE) \
 	if necessary...")
 	@test -e $(DOWNLOAD_DIR)/$(LUA_PACKAGE) || \
 	wget -O $(DOWNLOAD_DIR)/$(LUA_PACKAGE) \
@@ -67,7 +67,7 @@ ifeq ($(CONFIG_EMBTK_LUA_NEED_PATCH),y)
 endif
 
 $(LUA_BUILD_DIR)/.decompressed:
-	$(call EMBTK_GENERIC_MESSAGE,"Decompressing $(LUA_PACKAGE) ...")
+	$(call embtk_generic_message,"Decompressing $(LUA_PACKAGE) ...")
 	@tar -C $(PACKAGES_BUILD) -xjf $(DOWNLOAD_DIR)/$(LUA_PACKAGE)
 ifeq ($(CONFIG_EMBTK_LUA_NEED_PATCH),y)
 	@cd $(LUA_BUILD_DIR); \
@@ -76,7 +76,7 @@ endif
 	@touch $@
 
 lua_clean:
-	$(call EMBTK_GENERIC_MESSAGE,"cleanup lua...")
+	$(call embtk_generic_message,"cleanup lua...")
 	$(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(LUA_BINS)
 	$(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(LUA_SBINS)
 	$(Q)-cd $(SYSROOT)/usr/include; rm -rf $(LUA_INCLUDES)
diff --git a/packages/scripting-languages/perl/perl.mk b/packages/scripting-languages/perl/perl.mk
index 2812b44..3a3f91f 100644
--- a/packages/scripting-languages/perl/perl.mk
+++ b/packages/scripting-languages/perl/perl.mk
@@ -33,7 +33,7 @@ microperl_install: $(MICROPERL_BUILD_DIR)/.installed
 
 $(MICROPERL_BUILD_DIR)/.installed: download_perl \
 	$(PERL_BUILD_DIR)/.decompressed
-	$(call EMBTK_GENERIC_MESSAGE,"Compiling and installing \
+	$(call embtk_generic_message,"Compiling and installing \
 	microperl-$(PERL_VERSION) in your root filesystem...")
 	$(Q)$(MAKE) -C $(MICROPERL_BUILD_DIR) -f Makefile.micro \
 	OPTIMIZE="$(TARGET_CFLAGS)" CC=$(TARGETCC_CACHED)
@@ -43,7 +43,7 @@ $(MICROPERL_BUILD_DIR)/.installed: download_perl \
 	@touch $@
 
 download_perl:
-	$(call EMBTK_GENERIC_MESSAGE,"Downloading $(PERL_PACKAGE) \
+	$(call embtk_generic_message,"Downloading $(PERL_PACKAGE) \
 	if necessary...")
 	@test -e $(DOWNLOAD_DIR)/$(PERL_PACKAGE) || \
 	wget -O $(DOWNLOAD_DIR)/$(PERL_PACKAGE) \
@@ -55,7 +55,7 @@ ifeq ($(CONFIG_EMBTK_PERL_NEED_PATCH),y)
 endif
 
 $(PERL_BUILD_DIR)/.decompressed:
-	$(call EMBTK_GENERIC_MESSAGE,"Decompressing $(PERL_PACKAGE) ...")
+	$(call embtk_generic_message,"Decompressing $(PERL_PACKAGE) ...")
 	@tar -C $(PACKAGES_BUILD) -xzvf $(DOWNLOAD_DIR)/$(PERL_PACKAGE)
 ifeq ($(CONFIG_EMBTK_PERL_NEED_PATCH),y)
 	@cd $(PERL_BUILD_DIR); \
@@ -67,4 +67,4 @@ endif
 	@touch $@
 
 microperl_clean:
-	$(call EMBTK_GENERIC_MESSAGE,"Clean microperl for target...")
+	$(call embtk_generic_message,"Clean microperl for target...")
diff --git a/packages/security/openssl/openssl.mk b/packages/security/openssl/openssl.mk
index 459e6e7..4bf51db 100644
--- a/packages/security/openssl/openssl.mk
+++ b/packages/security/openssl/openssl.mk
@@ -24,7 +24,7 @@
 ################################################################################
 
 OPENSSL_NAME := openssl
-OPENSSL_VERSION := $(call EMBTK_GET_PKG_VERSION,OPENSSL)
+OPENSSL_VERSION := $(call embtk_get_pkgversion,OPENSSL)
 OPENSSL_SITE := ftp://ftp.openssl.org/source
 OPENSSL_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
 OPENSSL_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/openssl/$(OPENSSL_VERSION)
@@ -57,7 +57,7 @@ openssl_install:
 
 $(OPENSSL_BUILD_DIR)/.installed: download_openssl \
 	$(OPENSSL_BUILD_DIR)/.decompressed $(OPENSSL_BUILD_DIR)/.configured
-	$(call EMBTK_GENERIC_MESSAGE,"Compiling and installing \
+	$(call embtk_generic_message,"Compiling and installing \
 	openssl-$(OPENSSL_VERSION) in your root filesystem...")
 	$(Q)$(MAKE) -C $(OPENSSL_BUILD_DIR) CC=$(TARGETCC_CACHED)
 ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y)
@@ -72,10 +72,10 @@ endif
 	@touch $@
 
 download_openssl:
-	$(call EMBTK_DOWNLOAD_PKG,OPENSSL)
+	$(call embtk_download_pkg,OPENSSL)
 
 $(OPENSSL_BUILD_DIR)/.decompressed:
-	$(call EMBTK_DECOMPRESS_PKG,OPENSSL)
+	$(call embtk_decompress_pkg,OPENSSL)
 
 $(OPENSSL_BUILD_DIR)/.configured:
 	$(Q)cd $(OPENSSL_BUILD_DIR); \
@@ -84,7 +84,7 @@ $(OPENSSL_BUILD_DIR)/.configured:
 	@touch $@
 
 openssl_clean:
-	$(call EMBTK_CLEANUP_PKG,OPENSSL)
+	$(call embtk_cleanup_pkg,OPENSSL)
 
 .PHONY: $(OPENSSL_BUILD_DIR)/.special
 
diff --git a/packages/system/dbus/dbus.mk b/packages/system/dbus/dbus.mk
index e44e017..51638dd 100644
--- a/packages/system/dbus/dbus.mk
+++ b/packages/system/dbus/dbus.mk
@@ -24,7 +24,7 @@
 ################################################################################
 
 DBUS_NAME := dbus
-DBUS_VERSION := $(call EMBTK_GET_PKG_VERSION,DBUS)
+DBUS_VERSION := $(call embtk_get_pkgversion,DBUS)
 DBUS_SITE := http://dbus.freedesktop.org/releases/dbus
 DBUS_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
 DBUS_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/dbus/$(DBUS_VERSION)
@@ -46,14 +46,14 @@ DBUS_CONFIGURE_OPTS := --enable-abstract-sockets \
 	$(if $(CONFIG_EMBTK_HAVE_LIBX11),--with-x,--without-x)
 
 dbus_install:
-	$(call EMBTK_INSTALL_PKG,DBUS)
+	$(call embtk_install_pkg,DBUS)
 	$(Q)$(MAKE) $(DBUS_BUILD_DIR)/.special
 
 download_dbus:
-	$(call EMBTK_DOWNLOAD_PKG,DBUS)
+	$(call embtk_download_pkg,DBUS)
 
 dbus_clean:
-	$(call EMBTK_CLEANUP_PKG,DBUS)
+	$(call embtk_cleanup_pkg,DBUS)
 
 .PHONY: $(DBUS_BUILD_DIR)/.special dbus_clean
 
diff --git a/packages/system/e2fsprogs/e2fsprogs.mk b/packages/system/e2fsprogs/e2fsprogs.mk
index a444326..d5f753b 100644
--- a/packages/system/e2fsprogs/e2fsprogs.mk
+++ b/packages/system/e2fsprogs/e2fsprogs.mk
@@ -24,7 +24,7 @@
 ################################################################################
 
 E2FSPROGS_NAME		:= e2fsprogs
-E2FSPROGS_VERSION	:= $(call EMBTK_GET_PKG_VERSION,E2FSPROGS)
+E2FSPROGS_VERSION	:= $(call embtk_get_pkgversion,E2FSPROGS)
 E2FSPROGS_SITE		:= http://sourceforge.net/projects/e2fsprogs/files/e2fsprogs/$(E2FSPROGS_VERSION)
 E2FSPROGS_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
 E2FSPROGS_PATCH_SITE	:= ftp://ftp.embtoolkit.org/embtoolkit.org/e2fsprogs/$(E2FSPROGS_VERSION)
@@ -52,13 +52,13 @@ E2FSPROGS_CONFIGURE_OPTS := --disable-compression --disable-htree	\
 		--disable-nls --disable-rpath --with-included-gettext
 
 e2fsprogs_install:
-	$(call EMBTK_INSTALL_PKG,E2FSPROGS)
+	$(call embtk_install_pkg,E2FSPROGS)
 
 download_e2fsprogs:
-	$(call EMBTK_DOWNLOAD_PKG,E2FSPROGS)
+	$(call embtk_download_pkg,E2FSPROGS)
 
 e2fsprogs_clean:
-	$(call EMBTK_CLEANUP_PKG,E2FSPROGS)
+	$(call embtk_cleanup_pkg,E2FSPROGS)
 
 #
 # E2FSPROGS for host development machine
@@ -77,9 +77,9 @@ E2FSPROGS_HOST_MAKE_DIRS := $(E2FSPROGS_MAKE_DIRS)
 E2FSPROGS_CONFIGURE_OPTS := $(E2FSPROGS_CONFIGURE_OPTS)
 
 e2fsprogs_host_install:
-	$(call EMBTK_INSTALL_HOSTPKG,E2FSPROGS_HOST)
+	$(call embtk_install_hostpkg,E2FSPROGS_HOST)
 
 download_e2fsprogs_host:
-	$(call EMBTK_DOWNLOAD_PKG,E2FSPROGS_HOST)
+	$(call embtk_download_pkg,E2FSPROGS_HOST)
 
 e2fsprogs_host_clean:
diff --git a/packages/system/upstart/upstart.mk b/packages/system/upstart/upstart.mk
index 70b5460..af1e8a5 100644
--- a/packages/system/upstart/upstart.mk
+++ b/packages/system/upstart/upstart.mk
@@ -42,16 +42,16 @@ upstart_install: $(UPSTART_BUILD_DIR)/.installed
 
 $(UPSTART_BUILD_DIR)/.installed: $(UPSTART_DEPS) download_upstart \
 	$(UPSTART_BUILD_DIR)/.decompressed $(UPSTART_BUILD_DIR)/.configured
-	$(call EMBTK_GENERIC_MESSAGE,"Compiling and installing \
+	$(call embtk_generic_message,"Compiling and installing \
 	upstart-$(UPSTART_VERSION) in your root filesystem...")
-	$(call EMBTK_KILL_LT_RPATH,$(UPSTART_BUILD_DIR))
+	$(call __embtk_kill_lt_rpath,$(UPSTART_BUILD_DIR))
 	$(Q)$(MAKE) -C $(UPSTART_BUILD_DIR) $(J)
 	$(Q)$(MAKE) -C $(UPSTART_BUILD_DIR) DESTDIR=$(ROOTFS)/ install
 	$(Q)-rm -rf $(ROOTFS)/share
 	@touch $@
 
 download_upstart:
-	$(call EMBTK_GENERIC_MESSAGE,"Downloading $(UPSTART_PACKAGE) \
+	$(call embtk_generic_message,"Downloading $(UPSTART_PACKAGE) \
 	if necessary...")
 	@test -e $(DOWNLOAD_DIR)/$(UPSTART_PACKAGE) || \
 	wget -O $(DOWNLOAD_DIR)/$(UPSTART_PACKAGE) \
@@ -63,7 +63,7 @@ ifeq ($(CONFIG_EMBTK_UPSTART_NEED_PATCH),y)
 endif
 
 $(UPSTART_BUILD_DIR)/.decompressed:
-	$(call EMBTK_GENERIC_MESSAGE,"Decompressing $(UPSTART_PACKAGE) ...")
+	$(call embtk_generic_message,"Decompressing $(UPSTART_PACKAGE) ...")
 	@tar -C $(PACKAGES_BUILD) -xzf $(DOWNLOAD_DIR)/$(UPSTART_PACKAGE)
 ifeq ($(CONFIG_EMBTK_UPSTART_NEED_PATCH),y)
 	@cd $(UPSTART_BUILD_DIR); \
@@ -95,7 +95,7 @@ $(UPSTART_BUILD_DIR)/.configured:
 	@touch $@
 
 upstart_clean:
-	$(call EMBTK_GENERIC_MESSAGE,"cleanup upstart...")
+	$(call embtk_generic_message,"cleanup upstart...")
 	$(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(UPSTART_BINS)
 	$(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(UPSTART_SBINS)
 	$(Q)-cd $(SYSROOT)/usr/include; rm -rf $(UPSTART_INCLUDES)
diff --git a/packages/x11/bigreqsproto/bigreqsproto.mk b/packages/x11/bigreqsproto/bigreqsproto.mk
index cfc18d7..f1f1734 100644
--- a/packages/x11/bigreqsproto/bigreqsproto.mk
+++ b/packages/x11/bigreqsproto/bigreqsproto.mk
@@ -24,7 +24,7 @@
 ################################################################################
 
 BIGREQSPROTO_NAME := bigreqsproto
-BIGREQSPROTO_VERSION := $(call EMBTK_GET_PKG_VERSION,BIGREQSPROTO)
+BIGREQSPROTO_VERSION := $(call embtk_get_pkgversion,BIGREQSPROTO)
 BIGREQSPROTO_SITE := http://xorg.freedesktop.org/archive/individual/proto
 BIGREQSPROTO_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
 BIGREQSPROTO_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/bigreqsprot/$(BIGREQSPROTO_VERSION)
@@ -39,10 +39,10 @@ BIGREQSPROTO_LIBS =
 BIGREQSPROTO_PKGCONFIGS = bigreqsproto.pc
 
 bigreqsproto_install:
-	$(call EMBTK_INSTALL_PKG,BIGREQSPROTO)
+	$(call embtk_install_pkg,BIGREQSPROTO)
 
 download_bigreqsproto:
-	$(call EMBTK_DOWNLOAD_PKG,BIGREQSPROTO)
+	$(call embtk_download_pkg,BIGREQSPROTO)
 
 bigreqsproto_clean:
-	$(call EMBTK_CLEANUP_PKG,BIGREQSPROTO)
+	$(call embtk_cleanup_pkg,BIGREQSPROTO)
diff --git a/packages/x11/compositeproto/compositeproto.mk b/packages/x11/compositeproto/compositeproto.mk
index e06a255..72d4558 100644
--- a/packages/x11/compositeproto/compositeproto.mk
+++ b/packages/x11/compositeproto/compositeproto.mk
@@ -41,7 +41,7 @@ compositeproto_install:
 
 $(COMPOSITEPROTO_BUILD_DIR)/.installed: download_compositeproto \
 	$(COMPOSITEPROTO_BUILD_DIR)/.decompressed $(COMPOSITEPROTO_BUILD_DIR)/.configured
-	$(call EMBTK_GENERIC_MESSAGE,"Compiling and installing \
+	$(call embtk_generic_message,"Compiling and installing \
 	compositeproto-$(COMPOSITEPROTO_VERSION) in your root filesystem...")
 	$(Q)$(MAKE) -C $(COMPOSITEPROTO_BUILD_DIR) $(J)
 	$(Q)$(MAKE) -C $(COMPOSITEPROTO_BUILD_DIR) DESTDIR=$(SYSROOT) install
@@ -50,14 +50,14 @@ $(COMPOSITEPROTO_BUILD_DIR)/.installed: download_compositeproto \
 	@touch $@
 
 download_compositeproto:
-	$(call EMBTK_GENERIC_MESSAGE,"Downloading $(COMPOSITEPROTO_PACKAGE) \
+	$(call embtk_generic_message,"Downloading $(COMPOSITEPROTO_PACKAGE) \
 	if necessary...")
 	@test -e $(DOWNLOAD_DIR)/$(COMPOSITEPROTO_PACKAGE) || \
 	wget -O $(DOWNLOAD_DIR)/$(COMPOSITEPROTO_PACKAGE) \
 	$(COMPOSITEPROTO_SITE)/$(COMPOSITEPROTO_PACKAGE)
 
 $(COMPOSITEPROTO_BUILD_DIR)/.decompressed:
-	$(call EMBTK_GENERIC_MESSAGE,"Decompressing $(COMPOSITEPROTO_PACKAGE) ...")
+	$(call embtk_generic_message,"Decompressing $(COMPOSITEPROTO_PACKAGE) ...")
 	@tar -C $(PACKAGES_BUILD) -xjvf $(DOWNLOAD_DIR)/$(COMPOSITEPROTO_PACKAGE)
 	@touch $@
 
@@ -85,7 +85,7 @@ $(COMPOSITEPROTO_BUILD_DIR)/.configured:
 	@touch $@
 
 compositeproto_clean:
-	$(call EMBTK_GENERIC_MESSAGE,"cleanup compositeproto-$(COMPOSITEPROTO_VERSION)...")
+	$(call embtk_generic_message,"cleanup compositeproto-$(COMPOSITEPROTO_VERSION)...")
 	$(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(COMPOSITEPROTO_BINS)
 	$(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(COMPOSITEPROTO_SBINS)
 	$(Q)-cd $(SYSROOT)/usr/include; rm -rf $(COMPOSITEPROTO_INCLUDES)
diff --git a/packages/x11/damageproto/damageproto.mk b/packages/x11/damageproto/damageproto.mk
index f5262b1..42b3100 100644
--- a/packages/x11/damageproto/damageproto.mk
+++ b/packages/x11/damageproto/damageproto.mk
@@ -40,7 +40,7 @@ damageproto_install:
 
 $(DAMAGEPROTO_BUILD_DIR)/.installed: download_damageproto \
 	$(DAMAGEPROTO_BUILD_DIR)/.decompressed $(DAMAGEPROTO_BUILD_DIR)/.configured
-	$(call EMBTK_GENERIC_MESSAGE,"Compiling and installing \
+	$(call embtk_generic_message,"Compiling and installing \
 	damageproto-$(DAMAGEPROTO_VERSION) in your root filesystem...")
 	$(Q)$(MAKE) -C $(DAMAGEPROTO_BUILD_DIR) $(J)
 	$(Q)$(MAKE) -C $(DAMAGEPROTO_BUILD_DIR) DESTDIR=$(SYSROOT) install
@@ -49,14 +49,14 @@ $(DAMAGEPROTO_BUILD_DIR)/.installed: download_damageproto \
 	@touch $@
 
 download_damageproto:
-	$(call EMBTK_GENERIC_MESSAGE,"Downloading $(DAMAGEPROTO_PACKAGE) \
+	$(call embtk_generic_message,"Downloading $(DAMAGEPROTO_PACKAGE) \
 	if necessary...")
 	@test -e $(DOWNLOAD_DIR)/$(DAMAGEPROTO_PACKAGE) || \
 	wget -O $(DOWNLOAD_DIR)/$(DAMAGEPROTO_PACKAGE) \
 	$(DAMAGEPROTO_SITE)/$(DAMAGEPROTO_PACKAGE)
 
 $(DAMAGEPROTO_BUILD_DIR)/.decompressed:
-	$(call EMBTK_GENERIC_MESSAGE,"Decompressing $(DAMAGEPROTO_PACKAGE) ...")
+	$(call embtk_generic_message,"Decompressing $(DAMAGEPROTO_PACKAGE) ...")
 	@tar -C $(PACKAGES_BUILD) -xjvf $(DOWNLOAD_DIR)/$(DAMAGEPROTO_PACKAGE)
 	@touch $@
 
@@ -84,7 +84,7 @@ $(DAMAGEPROTO_BUILD_DIR)/.configured:
 	@touch $@
 
 damageproto_clean:
-	$(call EMBTK_GENERIC_MESSAGE,"cleanup damageproto-$(DAMAGEPROTO_VERSION)...")
+	$(call embtk_generic_message,"cleanup damageproto-$(DAMAGEPROTO_VERSION)...")
 	$(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(DAMAGEPROTO_BINS)
 	$(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(DAMAGEPROTO_SBINS)
 	$(Q)-cd $(SYSROOT)/usr/include; rm -rf $(DAMAGEPROTO_INCLUDES)
diff --git a/packages/x11/fixesproto/fixesproto.mk b/packages/x11/fixesproto/fixesproto.mk
index 9585cfd..5bf0a84 100644
--- a/packages/x11/fixesproto/fixesproto.mk
+++ b/packages/x11/fixesproto/fixesproto.mk
@@ -40,7 +40,7 @@ fixesproto_install:
 
 $(FIXESPROTO_BUILD_DIR)/.installed: download_fixesproto \
 	$(FIXESPROTO_BUILD_DIR)/.decompressed $(FIXESPROTO_BUILD_DIR)/.configured
-	$(call EMBTK_GENERIC_MESSAGE,"Compiling and installing \
+	$(call embtk_generic_message,"Compiling and installing \
 	fixesproto-$(FIXESPROTO_VERSION) in your root filesystem...")
 	$(Q)$(MAKE) -C $(FIXESPROTO_BUILD_DIR) $(J)
 	$(Q)$(MAKE) -C $(FIXESPROTO_BUILD_DIR) DESTDIR=$(SYSROOT) install
@@ -49,14 +49,14 @@ $(FIXESPROTO_BUILD_DIR)/.installed: download_fixesproto \
 	@touch $@
 
 download_fixesproto:
-	$(call EMBTK_GENERIC_MESSAGE,"Downloading $(FIXESPROTO_PACKAGE) \
+	$(call embtk_generic_message,"Downloading $(FIXESPROTO_PACKAGE) \
 	if necessary...")
 	@test -e $(DOWNLOAD_DIR)/$(FIXESPROTO_PACKAGE) || \
 	wget -O $(DOWNLOAD_DIR)/$(FIXESPROTO_PACKAGE) \
 	$(FIXESPROTO_SITE)/$(FIXESPROTO_PACKAGE)
 
 $(FIXESPROTO_BUILD_DIR)/.decompressed:
-	$(call EMBTK_GENERIC_MESSAGE,"Decompressing $(FIXESPROTO_PACKAGE) ...")
+	$(call embtk_generic_message,"Decompressing $(FIXESPROTO_PACKAGE) ...")
 	@tar -C $(PACKAGES_BUILD) -xjvf $(DOWNLOAD_DIR)/$(FIXESPROTO_PACKAGE)
 	@touch $@
 
@@ -84,7 +84,7 @@ $(FIXESPROTO_BUILD_DIR)/.configured:
 	@touch $@
 
 fixesproto_clean:
-	$(call EMBTK_GENERIC_MESSAGE,"cleanup fixesproto-$(FIXESPROTO_VERSION)...")
+	$(call embtk_generic_message,"cleanup fixesproto-$(FIXESPROTO_VERSION)...")
 	$(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(FIXESPROTO_BINS)
 	$(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(FIXESPROTO_SBINS)
 	$(Q)-cd $(SYSROOT)/usr/include; rm -rf $(FIXESPROTO_INCLUDES)
diff --git a/packages/x11/fontsproto/fontsproto.mk b/packages/x11/fontsproto/fontsproto.mk
index 7c03d1d..18fdf66 100644
--- a/packages/x11/fontsproto/fontsproto.mk
+++ b/packages/x11/fontsproto/fontsproto.mk
@@ -42,7 +42,7 @@ fontsproto_install:
 
 $(FONTSPROTO_BUILD_DIR)/.installed: download_fontsproto \
 	$(FONTSPROTO_BUILD_DIR)/.decompressed $(FONTSPROTO_BUILD_DIR)/.configured
-	$(call EMBTK_GENERIC_MESSAGE,"Compiling and installing \
+	$(call embtk_generic_message,"Compiling and installing \
 	fontsproto-$(FONTSPROTO_VERSION) in your root filesystem...")
 	$(Q)$(MAKE) -C $(FONTSPROTO_BUILD_DIR) $(J)
 	$(Q)$(MAKE) -C $(FONTSPROTO_BUILD_DIR) DESTDIR=$(SYSROOT) install
@@ -51,14 +51,14 @@ $(FONTSPROTO_BUILD_DIR)/.installed: download_fontsproto \
 	@touch $@
 
 download_fontsproto:
-	$(call EMBTK_GENERIC_MESSAGE,"Downloading $(FONTSPROTO_PACKAGE) \
+	$(call embtk_generic_message,"Downloading $(FONTSPROTO_PACKAGE) \
 	if necessary...")
 	@test -e $(DOWNLOAD_DIR)/$(FONTSPROTO_PACKAGE) || \
 	wget -O $(DOWNLOAD_DIR)/$(FONTSPROTO_PACKAGE) \
 	$(FONTSPROTO_SITE)/$(FONTSPROTO_PACKAGE)
 
 $(FONTSPROTO_BUILD_DIR)/.decompressed:
-	$(call EMBTK_GENERIC_MESSAGE,"Decompressing $(FONTSPROTO_PACKAGE) ...")
+	$(call embtk_generic_message,"Decompressing $(FONTSPROTO_PACKAGE) ...")
 	@tar -C $(PACKAGES_BUILD) -xjvf $(DOWNLOAD_DIR)/$(FONTSPROTO_PACKAGE)
 	@touch $@
 
@@ -86,7 +86,7 @@ $(FONTSPROTO_BUILD_DIR)/.configured:
 	@touch $@
 
 fontsproto_clean:
-	$(call EMBTK_GENERIC_MESSAGE,"cleanup fontsproto...")
+	$(call embtk_generic_message,"cleanup fontsproto...")
 	$(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(FONTSPROTO_BINS)
 	$(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(FONTSPROTO_SBINS)
 	$(Q)-cd $(SYSROOT)/usr/include; rm -rf $(FONTSPROTO_INCLUDES)
diff --git a/packages/x11/inputproto/inputproto.mk b/packages/x11/inputproto/inputproto.mk
index 5169668..dd86196 100644
--- a/packages/x11/inputproto/inputproto.mk
+++ b/packages/x11/inputproto/inputproto.mk
@@ -41,7 +41,7 @@ inputproto_install:
 
 $(INPUTPROTO_BUILD_DIR)/.installed: download_inputproto \
 	$(INPUTPROTO_BUILD_DIR)/.decompressed $(INPUTPROTO_BUILD_DIR)/.configured
-	$(call EMBTK_GENERIC_MESSAGE,"Compiling and installing \
+	$(call embtk_generic_message,"Compiling and installing \
 	inputproto-$(INPUTPROTO_VERSION) in your root filesystem...")
 	$(Q)$(MAKE) -C $(INPUTPROTO_BUILD_DIR) $(J)
 	$(Q)$(MAKE) -C $(INPUTPROTO_BUILD_DIR) DESTDIR=$(SYSROOT) install
@@ -50,14 +50,14 @@ $(INPUTPROTO_BUILD_DIR)/.installed: download_inputproto \
 	@touch $@
 
 download_inputproto:
-	$(call EMBTK_GENERIC_MESSAGE,"Downloading $(INPUTPROTO_PACKAGE) \
+	$(call embtk_generic_message,"Downloading $(INPUTPROTO_PACKAGE) \
 	if necessary...")
 	@test -e $(DOWNLOAD_DIR)/$(INPUTPROTO_PACKAGE) || \
 	wget -O $(DOWNLOAD_DIR)/$(INPUTPROTO_PACKAGE) \
 	$(INPUTPROTO_SITE)/$(INPUTPROTO_PACKAGE)
 
 $(INPUTPROTO_BUILD_DIR)/.decompressed:
-	$(call EMBTK_GENERIC_MESSAGE,"Decompressing $(INPUTPROTO_PACKAGE) ...")
+	$(call embtk_generic_message,"Decompressing $(INPUTPROTO_PACKAGE) ...")
 	@tar -C $(PACKAGES_BUILD) -xjvf $(DOWNLOAD_DIR)/$(INPUTPROTO_PACKAGE)
 	@touch $@
 
@@ -85,7 +85,7 @@ $(INPUTPROTO_BUILD_DIR)/.configured:
 	@touch $@
 
 inputproto_clean:
-	$(call EMBTK_GENERIC_MESSAGE,"cleanup inputproto-$(INPUTPROTO_VERSION)...")
+	$(call embtk_generic_message,"cleanup inputproto-$(INPUTPROTO_VERSION)...")
 	$(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(INPUTPROTO_BINS)
 	$(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(INPUTPROTO_SBINS)
 	$(Q)-cd $(SYSROOT)/usr/include; rm -rf $(INPUTPROTO_INCLUDES)
diff --git a/packages/x11/kbproto/kbproto.mk b/packages/x11/kbproto/kbproto.mk
index 2837cdb..51ca611 100644
--- a/packages/x11/kbproto/kbproto.mk
+++ b/packages/x11/kbproto/kbproto.mk
@@ -42,7 +42,7 @@ kbproto_install:
 
 $(KBPROTO_BUILD_DIR)/.installed: download_kbproto \
 	$(KBPROTO_BUILD_DIR)/.decompressed $(KBPROTO_BUILD_DIR)/.configured
-	$(call EMBTK_GENERIC_MESSAGE,"Compiling and installing \
+	$(call embtk_generic_message,"Compiling and installing \
 	kbproto-$(KBPROTO_VERSION) in your root filesystem...")
 	$(Q)$(MAKE) -C $(KBPROTO_BUILD_DIR) $(J)
 	$(Q)$(MAKE) -C $(KBPROTO_BUILD_DIR) DESTDIR=$(SYSROOT) install
@@ -51,14 +51,14 @@ $(KBPROTO_BUILD_DIR)/.installed: download_kbproto \
 	@touch $@
 
 download_kbproto:
-	$(call EMBTK_GENERIC_MESSAGE,"Downloading $(KBPROTO_PACKAGE) \
+	$(call embtk_generic_message,"Downloading $(KBPROTO_PACKAGE) \
 	if necessary...")
 	@test -e $(DOWNLOAD_DIR)/$(KBPROTO_PACKAGE) || \
 	wget -O $(DOWNLOAD_DIR)/$(KBPROTO_PACKAGE) \
 	$(KBPROTO_SITE)/$(KBPROTO_PACKAGE)
 
 $(KBPROTO_BUILD_DIR)/.decompressed:
-	$(call EMBTK_GENERIC_MESSAGE,"Decompressing $(KBPROTO_PACKAGE) ...")
+	$(call embtk_generic_message,"Decompressing $(KBPROTO_PACKAGE) ...")
 	@tar -C $(PACKAGES_BUILD) -xjvf $(DOWNLOAD_DIR)/$(KBPROTO_PACKAGE)
 	@touch $@
 
@@ -86,7 +86,7 @@ $(KBPROTO_BUILD_DIR)/.configured:
 	@touch $@
 
 kbproto_clean:
-	$(call EMBTK_GENERIC_MESSAGE,"cleanup kbproto...")
+	$(call embtk_generic_message,"cleanup kbproto...")
 	$(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(KBPROTO_BINS)
 	$(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(KBPROTO_SBINS)
 	$(Q)-cd $(SYSROOT)/usr/include; rm -rf $(KBPROTO_INCLUDES)
diff --git a/packages/x11/libfontenc/libfontenc.mk b/packages/x11/libfontenc/libfontenc.mk
index fe1c8ea..eec6ef3 100644
--- a/packages/x11/libfontenc/libfontenc.mk
+++ b/packages/x11/libfontenc/libfontenc.mk
@@ -24,7 +24,7 @@
 ################################################################################
 
 LIBFONTENC_NAME := libfontenc
-LIBFONTENC_VERSION := $(call EMBTK_GET_PKG_VERSION,LIBFONTENC)
+LIBFONTENC_VERSION := $(call embtk_get_pkgversion,LIBFONTENC)
 LIBFONTENC_SITE := http://xorg.freedesktop.org/archive/individual/lib
 LIBFONTENC_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
 LIBFONTENC_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/libfontenc/$(LIBFONTENC_VERSION)
@@ -48,7 +48,7 @@ libfontenc_install:
 
 $(LIBFONTENC_BUILD_DIR)/.installed: $(LIBFONTENC_DEPS) download_libfontenc \
 	$(LIBFONTENC_BUILD_DIR)/.decompressed $(LIBFONTENC_BUILD_DIR)/.configured
-	$(call EMBTK_GENERIC_MESSAGE,"Compiling and installing \
+	$(call embtk_generic_message,"Compiling and installing \
 	libfontenc-$(LIBFONTENC_VERSION) in your root filesystem...")
 	$(Q)$(MAKE) -C $(LIBFONTENC_BUILD_DIR) $(J)
 	$(Q)$(MAKE) -C $(LIBFONTENC_BUILD_DIR) DESTDIR=$(SYSROOT) install
@@ -57,13 +57,13 @@ $(LIBFONTENC_BUILD_DIR)/.installed: $(LIBFONTENC_DEPS) download_libfontenc \
 	@touch $@
 
 download_libfontenc:
-	$(call EMBTK_DOWNLOAD_PKG,LIBFONTENC)
+	$(call embtk_download_pkg,LIBFONTENC)
 
 $(LIBFONTENC_BUILD_DIR)/.decompressed:
-	$(call EMBTK_DECOMPRESS_PKG,LIBFONTENC)
+	$(call embtk_decompress_pkg,LIBFONTENC)
 
 $(LIBFONTENC_BUILD_DIR)/.configured:
-	$(call EMBTK_CONFIGURE_PKG,LIBFONTENC)
+	$(call embtk_configure_pkg,LIBFONTENC)
 
 libfontenc_clean:
-	$(call EMBTK_CLEANUP_PKG,LIBFONTENC)
+	$(call embtk_cleanup_pkg,LIBFONTENC)
diff --git a/packages/x11/libpciaccess/libpciaccess.mk b/packages/x11/libpciaccess/libpciaccess.mk
index e4d0d9c..397f193 100644
--- a/packages/x11/libpciaccess/libpciaccess.mk
+++ b/packages/x11/libpciaccess/libpciaccess.mk
@@ -24,7 +24,7 @@
 ################################################################################
 
 LIBPCIACCESS_NAME := libpciaccess
-LIBPCIACCESS_VERSION := $(call EMBTK_GET_PKG_VERSION,LIBPCIACCESS)
+LIBPCIACCESS_VERSION := $(call embtk_get_pkgversion,LIBPCIACCESS)
 LIBPCIACCESS_SITE := http://xorg.freedesktop.org/archive/individual/lib
 LIBPCIACCESS_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/libpciaccess/$(LIBPCIACCESS_VERSION)
 LIBPCIACCESS_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
@@ -47,7 +47,7 @@ libpciaccess_install:
 $(LIBPCIACCESS_BUILD_DIR)/.installed: $(LIBPCIACCESS_DEPS) \
 	download_libpciaccess $(LIBPCIACCESS_BUILD_DIR)/.decompressed \
 	$(LIBPCIACCESS_BUILD_DIR)/.configured
-	$(call EMBTK_GENERIC_MESSAGE,"Compiling and installing \
+	$(call embtk_generic_message,"Compiling and installing \
 	libpciaccess-$(LIBPCIACCESS_VERSION) in your root filesystem...")
 	$(Q)$(MAKE) -C $(LIBPCIACCESS_BUILD_DIR) $(J)
 	$(Q)$(MAKE) -C $(LIBPCIACCESS_BUILD_DIR) DESTDIR=$(SYSROOT) install
@@ -56,13 +56,13 @@ $(LIBPCIACCESS_BUILD_DIR)/.installed: $(LIBPCIACCESS_DEPS) \
 	@touch $@
 
 download_libpciaccess:
-	$(call EMBTK_DOWNLOAD_PKG,LIBPCIACCESS)
+	$(call embtk_download_pkg,LIBPCIACCESS)
 
 $(LIBPCIACCESS_BUILD_DIR)/.decompressed:
-	$(call EMBTK_DECOMPRESS_PKG,LIBPCIACCESS)
+	$(call embtk_decompress_pkg,LIBPCIACCESS)
 
 $(LIBPCIACCESS_BUILD_DIR)/.configured:
-	$(call EMBTK_CONFIGURE_PKG,LIBPCIACCESS)
+	$(call embtk_configure_pkg,LIBPCIACCESS)
 
 libpciaccess_clean:
-	$(call EMBTK_CLEANUP_PKG,LIBPCIACCESS)
+	$(call embtk_cleanup_pkg,LIBPCIACCESS)
diff --git a/packages/x11/libpthreadstubs/libpthreadstubs.mk b/packages/x11/libpthreadstubs/libpthreadstubs.mk
index 26303ea..7049994 100644
--- a/packages/x11/libpthreadstubs/libpthreadstubs.mk
+++ b/packages/x11/libpthreadstubs/libpthreadstubs.mk
@@ -24,7 +24,7 @@
 ################################################################################
 
 LIBPTHREADSTUBS_NAME := libpthread-stubs
-LIBPTHREADSTUBS_VERSION := $(call EMBTK_GET_PKG_VERSION,LIBPTHREADSTUBS)
+LIBPTHREADSTUBS_VERSION := $(call embtk_get_pkgversion,LIBPTHREADSTUBS)
 LIBPTHREADSTUBS_SITE := http://xcb.freedesktop.org/dist
 LIBPTHREADSTUBS_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
 LIBPTHREADSTUBS_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/libpthreadstubs/$(LIBPTHREADSTUBS_VERSION)
@@ -44,7 +44,7 @@ libpthreadstubs_install:
 
 $(LIBPTHREADSTUBS_BUILD_DIR)/.installed: download_libpthreadstubs \
 	$(LIBPTHREADSTUBS_BUILD_DIR)/.decompressed $(LIBPTHREADSTUBS_BUILD_DIR)/.configured
-	$(call EMBTK_GENERIC_MESSAGE,"Compiling and installing \
+	$(call embtk_generic_message,"Compiling and installing \
 	libpthreadstubs-$(LIBPTHREADSTUBS_VERSION) in your root filesystem...")
 	$(Q)$(MAKE) -C $(LIBPTHREADSTUBS_BUILD_DIR) $(J)
 	$(Q)$(MAKE) -C $(LIBPTHREADSTUBS_BUILD_DIR) DESTDIR=$(SYSROOT) install
@@ -53,13 +53,13 @@ $(LIBPTHREADSTUBS_BUILD_DIR)/.installed: download_libpthreadstubs \
 	@touch $@
 
 download_libpthreadstubs:
-	$(call EMBTK_DOWNLOAD_PKG,LIBPTHREADSTUBS)
+	$(call embtk_download_pkg,LIBPTHREADSTUBS)
 
 $(LIBPTHREADSTUBS_BUILD_DIR)/.decompressed:
-	$(call EMBTK_DECOMPRESS_PKG,LIBPTHREADSTUBS)
+	$(call embtk_decompress_pkg,LIBPTHREADSTUBS)
 
 $(LIBPTHREADSTUBS_BUILD_DIR)/.configured:
-	$(call EMBTK_CONFIGURE_PKG,LIBPTHREADSTUBS)
+	$(call embtk_configure_pkg,LIBPTHREADSTUBS)
 
 libpthreadstubs_clean:
-	$(call EMBTK_CLEANUP_PKG,LIBPTHREADSTUBS)
+	$(call embtk_cleanup_pkg,LIBPTHREADSTUBS)
diff --git a/packages/x11/libx11/libx11.mk b/packages/x11/libx11/libx11.mk
index b8da49b..efc2207 100644
--- a/packages/x11/libx11/libx11.mk
+++ b/packages/x11/libx11/libx11.mk
@@ -24,7 +24,7 @@
 ################################################################################
 
 LIBX11_NAME := libX11
-LIBX11_VERSION := $(call EMBTK_GET_PKG_VERSION,LIBX11)
+LIBX11_VERSION := $(call embtk_get_pkgversion,LIBX11)
 LIBX11_SITE := http://xorg.freedesktop.org/archive/individual/lib
 LIBX11_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
 LIBX11_PACKAGE := libX11-$(LIBX11_VERSION).tar.bz2
@@ -52,7 +52,7 @@ libx11_install:
 
 $(LIBX11_BUILD_DIR)/.installed: $(LIBX11_DEPS) download_libx11 \
 	$(LIBX11_BUILD_DIR)/.decompressed $(LIBX11_BUILD_DIR)/.configured
-	$(call EMBTK_GENERIC_MESSAGE,"Compiling and installing \
+	$(call embtk_generic_message,"Compiling and installing \
 	libx11-$(LIBX11_VERSION) in your root filesystem...")
 	@cd $(LIBX11_BUILD_DIR)/src/util; \
 	gcc makekeys.c -c -o makekeys-makekeys.o; gcc makekeys.c -o makekeys
@@ -64,16 +64,16 @@ $(LIBX11_BUILD_DIR)/.installed: $(LIBX11_DEPS) download_libx11 \
 	@touch $@
 
 download_libx11:
-	$(call EMBTK_DOWNLOAD_PKG,LIBX11)
+	$(call embtk_download_pkg,LIBX11)
 
 $(LIBX11_BUILD_DIR)/.decompressed:
-	$(call EMBTK_DECOMPRESS_PKG,LIBX11)
+	$(call embtk_decompress_pkg,LIBX11)
 
 $(LIBX11_BUILD_DIR)/.configured:
-	$(call EMBTK_CONFIGURE_PKG,LIBX11)
+	$(call embtk_configure_pkg,LIBX11)
 
 libx11_clean:
-	$(call EMBTK_CLEANUP_PKG,LIBX11)
+	$(call embtk_cleanup_pkg,LIBX11)
 
 $(LIBX11_BUILD_DIR)/.patchlibtool:
 	@LIBX11_LT_FILES=`find $(SYSROOT)/usr/$(LIBDIR)/libX11-* -type f -name *.la`; \
diff --git a/packages/x11/libxau/libxau.mk b/packages/x11/libxau/libxau.mk
index 46db6be..9084030 100644
--- a/packages/x11/libxau/libxau.mk
+++ b/packages/x11/libxau/libxau.mk
@@ -24,7 +24,7 @@
 ################################################################################
 
 LIBXAU_NAME := libXau
-LIBXAU_VERSION := $(call EMBTK_GET_PKG_VERSION,LIBXAU)
+LIBXAU_VERSION := $(call embtk_get_pkgversion,LIBXAU)
 LIBXAU_SITE := http://xorg.freedesktop.org/archive/individual/lib
 LIBXAU_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
 LIBXAU_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/libxau/$(LIBXAU_VERSION)
@@ -46,7 +46,7 @@ libxau_install:
 
 $(LIBXAU_BUILD_DIR)/.installed: $(LIBXAU_DEPS) download_libxau \
 	$(LIBXAU_BUILD_DIR)/.decompressed $(LIBXAU_BUILD_DIR)/.configured
-	$(call EMBTK_GENERIC_MESSAGE,"Compiling and installing \
+	$(call embtk_generic_message,"Compiling and installing \
 	libxau-$(LIBXAU_VERSION) in your root filesystem...")
 	$(Q)$(MAKE) -C $(LIBXAU_BUILD_DIR) $(J)
 	$(Q)$(MAKE) -C $(LIBXAU_BUILD_DIR) DESTDIR=$(SYSROOT) install
@@ -55,13 +55,13 @@ $(LIBXAU_BUILD_DIR)/.installed: $(LIBXAU_DEPS) download_libxau \
 	@touch $@
 
 download_libxau:
-	$(call EMBTK_DOWNLOAD_PKG,LIBXAU)
+	$(call embtk_download_pkg,LIBXAU)
 
 $(LIBXAU_BUILD_DIR)/.decompressed:
-	$(call EMBTK_DECOMPRESS_PKG,LIBXAU)
+	$(call embtk_decompress_pkg,LIBXAU)
 
 $(LIBXAU_BUILD_DIR)/.configured:
-	$(call EMBTK_CONFIGURE_PKG,LIBXAU)
+	$(call embtk_configure_pkg,LIBXAU)
 
 libxau_clean:
-	$(call EMBTK_CLEANUP_PKG,LIBXAU)
+	$(call embtk_cleanup_pkg,LIBXAU)
diff --git a/packages/x11/libxcb/libxcb.mk b/packages/x11/libxcb/libxcb.mk
index 5fb9221..ef87b4e 100644
--- a/packages/x11/libxcb/libxcb.mk
+++ b/packages/x11/libxcb/libxcb.mk
@@ -24,7 +24,7 @@
 ################################################################################
 
 LIBXCB_NAME := libxcb
-LIBXCB_VERSION := $(call EMBTK_GET_PKG_VERSION,LIBXCB)
+LIBXCB_VERSION := $(call embtk_get_pkgversion,LIBXCB)
 LIBXCB_SITE := http://xcb.freedesktop.org/dist
 LIBXCB_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
 LIBXCB_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/libxcb/$(LIBXCB_VERSION)
@@ -48,7 +48,7 @@ libxcb_install:
 
 $(LIBXCB_BUILD_DIR)/.installed: $(LIBXCB_DEPS) download_libxcb \
 	$(LIBXCB_BUILD_DIR)/.decompressed $(LIBXCB_BUILD_DIR)/.configured
-	$(call EMBTK_GENERIC_MESSAGE,"Compiling and installing \
+	$(call embtk_generic_message,"Compiling and installing \
 	libxcb-$(LIBXCB_VERSION) in your root filesystem...")
 	$(Q)$(MAKE) -C $(LIBXCB_BUILD_DIR) $(J)
 	$(Q)$(MAKE) -C $(LIBXCB_BUILD_DIR) DESTDIR=$(SYSROOT)/ install
@@ -58,16 +58,16 @@ $(LIBXCB_BUILD_DIR)/.installed: $(LIBXCB_DEPS) download_libxcb \
 	@touch $@
 
 download_libxcb:
-	$(call EMBTK_DOWNLOAD_PKG,LIBXCB)
+	$(call embtk_download_pkg,LIBXCB)
 
 $(LIBXCB_BUILD_DIR)/.decompressed:
-	$(call EMBTK_DECOMPRESS_PKG,LIBXCB)
+	$(call embtk_decompress_pkg,LIBXCB)
 
 $(LIBXCB_BUILD_DIR)/.configured:
-	$(call EMBTK_CONFIGURE_PKG,LIBXCB)
+	$(call embtk_configure_pkg,LIBXCB)
 
 libxcb_clean:
-	$(call EMBTK_CLEANUP_PKG,LIBXCB)
+	$(call embtk_cleanup_pkg,LIBXCB)
 
 $(LIBXCB_BUILD_DIR)/.patchlibtool:
 	@LIBXCB_LT_FILES=`find $(SYSROOT)/usr/$(LIBDIR)/libxcb-* -type f -name *.la`; \
diff --git a/packages/x11/libxcomposite/libxcomposite.mk b/packages/x11/libxcomposite/libxcomposite.mk
index a3a6e9a..46adb99 100644
--- a/packages/x11/libxcomposite/libxcomposite.mk
+++ b/packages/x11/libxcomposite/libxcomposite.mk
@@ -24,7 +24,7 @@
 ################################################################################
 
 LIBXCOMPOSITE_NAME := libXcomposite
-LIBXCOMPOSITE_VERSION := $(call EMBTK_GET_PKG_VERSION,LIBXCOMPOSITE)
+LIBXCOMPOSITE_VERSION := $(call embtk_get_pkgversion,LIBXCOMPOSITE)
 LIBXCOMPOSITE_SITE := http://xorg.freedesktop.org/archive/individual/lib
 LIBXCOMPOSITE_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/libxcomposite/$(LIBXCOMPOSITE_VERSION)
 LIBXCOMPOSITE_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
@@ -46,7 +46,7 @@ libxcomposite_install:
 
 $(LIBXCOMPOSITE_BUILD_DIR)/.installed: $(LIBXCOMPOSITE_DEPS) download_libxcomposite \
 	$(LIBXCOMPOSITE_BUILD_DIR)/.decompressed $(LIBXCOMPOSITE_BUILD_DIR)/.configured
-	$(call EMBTK_GENERIC_MESSAGE,"Compiling and installing \
+	$(call embtk_generic_message,"Compiling and installing \
 	libxcomposite-$(LIBXCOMPOSITE_VERSION) in your root filesystem...")
 	$(Q)$(MAKE) -C $(LIBXCOMPOSITE_BUILD_DIR) $(J)
 	$(Q)$(MAKE) -C $(LIBXCOMPOSITE_BUILD_DIR) DESTDIR=$(SYSROOT) install
@@ -55,13 +55,13 @@ $(LIBXCOMPOSITE_BUILD_DIR)/.installed: $(LIBXCOMPOSITE_DEPS) download_libxcompos
 	@touch $@
 
 download_libxcomposite:
-	$(call EMBTK_DOWNLOAD_PKG,LIBXCOMPOSITE)
+	$(call embtk_download_pkg,LIBXCOMPOSITE)
 
 $(LIBXCOMPOSITE_BUILD_DIR)/.decompressed:
-	$(call EMBTK_DECOMPRESS_PKG,LIBXCOMPOSITE)
+	$(call embtk_decompress_pkg,LIBXCOMPOSITE)
 
 $(LIBXCOMPOSITE_BUILD_DIR)/.configured:
-	$(call EMBTK_CONFIGURE_PKG,LIBXCOMPOSITE)
+	$(call embtk_configure_pkg,LIBXCOMPOSITE)
 
 libxcomposite_clean:
-	$(call EMBTK_CLEANUP_PKG,LIBXCOMPOSITE)
+	$(call embtk_cleanup_pkg,LIBXCOMPOSITE)
diff --git a/packages/x11/libxext/libxext.mk b/packages/x11/libxext/libxext.mk
index 03f042c..1ec522f 100644
--- a/packages/x11/libxext/libxext.mk
+++ b/packages/x11/libxext/libxext.mk
@@ -24,7 +24,7 @@
 ################################################################################
 
 LIBXEXT_NAME := libXext
-LIBXEXT_VERSION := $(call EMBTK_GET_PKG_VERSION,LIBXEXT)
+LIBXEXT_VERSION := $(call embtk_get_pkgversion,LIBXEXT)
 LIBXEXT_SITE := http://xorg.freedesktop.org/archive/individual/lib
 LIBXEXT_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
 LIBXEXT_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/expat/$(LIBXEXT_VERSION)
@@ -56,7 +56,7 @@ libxext_install:
 
 $(LIBXEXT_BUILD_DIR)/.installed: $(LIBXEXT_DEPS) download_libxext \
 	$(LIBXEXT_BUILD_DIR)/.decompressed $(LIBXEXT_BUILD_DIR)/.configured
-	$(call EMBTK_GENERIC_MESSAGE,"Compiling and installing \
+	$(call embtk_generic_message,"Compiling and installing \
 	libxext-$(LIBXEXT_VERSION) in your root filesystem...")
 	$(Q)$(MAKE) -C $(LIBXEXT_BUILD_DIR) $(J)
 	$(Q)$(MAKE) -C $(LIBXEXT_BUILD_DIR) DESTDIR=$(SYSROOT) install
@@ -65,13 +65,13 @@ $(LIBXEXT_BUILD_DIR)/.installed: $(LIBXEXT_DEPS) download_libxext \
 	@touch $@
 
 download_libxext:
-	$(call EMBTK_DOWNLOAD_PKG,LIBXEXT)
+	$(call embtk_download_pkg,LIBXEXT)
 
 $(LIBXEXT_BUILD_DIR)/.decompressed:
-	$(call EMBTK_DECOMPRESS_PKG,LIBXEXT)
+	$(call embtk_decompress_pkg,LIBXEXT)
 
 $(LIBXEXT_BUILD_DIR)/.configured:
-	$(call EMBTK_CONFIGURE_PKG,LIBXEXT)
+	$(call embtk_configure_pkg,LIBXEXT)
 
 libxext_clean:
-	$(call EMBTK_CLEANUP_PKG,LIBXEXT)
+	$(call embtk_cleanup_pkg,LIBXEXT)
diff --git a/packages/x11/libxfixes/libxfixes.mk b/packages/x11/libxfixes/libxfixes.mk
index ca5c25c..e9f06fd 100644
--- a/packages/x11/libxfixes/libxfixes.mk
+++ b/packages/x11/libxfixes/libxfixes.mk
@@ -46,7 +46,7 @@ libxfixes_install:
 
 $(LIBXFIXES_BUILD_DIR)/.installed: $(LIBXFIXES_DEPS) download_libxfixes \
 	$(LIBXFIXES_BUILD_DIR)/.decompressed $(LIBXFIXES_BUILD_DIR)/.configured
-	$(call EMBTK_GENERIC_MESSAGE,"Compiling and installing \
+	$(call embtk_generic_message,"Compiling and installing \
 	libxfixes-$(LIBXFIXES_VERSION) in your root filesystem...")
 	$(Q)$(MAKE) -C $(LIBXFIXES_BUILD_DIR) $(J)
 	$(Q)$(MAKE) -C $(LIBXFIXES_BUILD_DIR) DESTDIR=$(SYSROOT) install
@@ -55,13 +55,13 @@ $(LIBXFIXES_BUILD_DIR)/.installed: $(LIBXFIXES_DEPS) download_libxfixes \
 	@touch $@
 
 download_libxfixes:
-	$(call EMBTK_DOWNLOAD_PKG,LIBXFIXES)
+	$(call embtk_download_pkg,LIBXFIXES)
 
 $(LIBXFIXES_BUILD_DIR)/.decompressed:
-	$(call EMBTK_DECOMPRESS_PKG,LIBXFIXES)
+	$(call embtk_decompress_pkg,LIBXFIXES)
 
 $(LIBXFIXES_BUILD_DIR)/.configured:
-	$(call EMBTK_CONFIGURE_PKG,LIBXFIXES)
+	$(call embtk_configure_pkg,LIBXFIXES)
 
 libxfixes_clean:
-	$(call EMBTK_CLEANUP_PKG,LIBXFIXES)
+	$(call embtk_cleanup_pkg,LIBXFIXES)
diff --git a/packages/x11/libxfont/libxfont.mk b/packages/x11/libxfont/libxfont.mk
index 8175f1a..a16c88a 100644
--- a/packages/x11/libxfont/libxfont.mk
+++ b/packages/x11/libxfont/libxfont.mk
@@ -24,7 +24,7 @@
 ################################################################################
 
 LIBXFONT_NAME := libXfont
-LIBXFONT_VERSION := $(call EMBTK_GET_PKG_VERSION,LIBXFONT)
+LIBXFONT_VERSION := $(call embtk_get_pkgversion,LIBXFONT)
 LIBXFONT_SITE := http://xorg.freedesktop.org/archive/individual/lib
 LIBXFONT_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
 LIBXFONT_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/libxfont/$(LIBXFONT_VERSION)
@@ -47,10 +47,10 @@ LIBXFONT_CONFIGURE_OPTS := --disable-malloc0returnsnull
 LIBXFONT_DEPS = libfontenc_install freetype_install
 
 libxfont_install:
-	$(call EMBTK_INSTALL_PKG,LIBXFONT)
+	$(call embtk_install_pkg,LIBXFONT)
 
 download_libxfont:
-	$(call EMBTK_DOWNLOAD_PKG,LIBXFONT)
+	$(call embtk_download_pkg,LIBXFONT)
 
 libxfont_clean:
-	$(call EMBTK_CLEANUP_PKG,LIBXFONT)
+	$(call embtk_cleanup_pkg,LIBXFONT)
diff --git a/packages/x11/libxft/libxft.mk b/packages/x11/libxft/libxft.mk
index 469905d..3169eff 100644
--- a/packages/x11/libxft/libxft.mk
+++ b/packages/x11/libxft/libxft.mk
@@ -24,7 +24,7 @@
 ################################################################################
 
 LIBXFT_NAME := libXft
-LIBXFT_VERSION := $(call EMBTK_GET_PKG_VERSION,LIBXFT)
+LIBXFT_VERSION := $(call embtk_get_pkgversion,LIBXFT)
 LIBXFT_SITE := http://xorg.freedesktop.org/archive/individual/lib
 LIBXFT_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
 LIBXFT_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/libxft/$(LIBXFT_VERSION)
@@ -43,10 +43,10 @@ LIBXFT_CONFIGURE_OPTS := --disable-malloc0returnsnull
 LIBXFT_DEPS = freetype_install fontconfig_install libxrender_install
 
 libxft_install:
-	$(call EMBTK_INSTALL_PKG,LIBXFT)
+	$(call embtk_install_pkg,LIBXFT)
 
 download_libxft:
-	$(call EMBTK_DOWNLOAD_PKG,LIBXFT)
+	$(call embtk_download_pkg,LIBXFT)
 
 libxft_clean:
-	$(call EMBTK_CLEANUP_PKG,LIBXFT)
+	$(call embtk_cleanup_pkg,LIBXFT)
diff --git a/packages/x11/libxi/libxi.mk b/packages/x11/libxi/libxi.mk
index 312363e..e519531 100644
--- a/packages/x11/libxi/libxi.mk
+++ b/packages/x11/libxi/libxi.mk
@@ -24,7 +24,7 @@
 ################################################################################
 
 LIBXI_NAME := libXi
-LIBXI_VERSION := $(call EMBTK_GET_PKG_VERSION,LIBXI)
+LIBXI_VERSION := $(call embtk_get_pkgversion,LIBXI)
 LIBXI_SITE := http://xorg.freedesktop.org/archive/individual/lib
 LIBXI_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
 LIBXI_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/libxi/$(LIBXI_VERSION)
@@ -44,10 +44,10 @@ LIBXI_DEPS := xproto_install xextproto_install inputproto_install \
 	libx11_install libxext_install
 
 libxi_install:
-	$(call EMBTK_INSTALL_PKG,LIBXI)
+	$(call embtk_install_pkg,LIBXI)
 
 download_libxi:
-	$(call EMBTK_DOWNLOAD_PKG,LIBXI)
+	$(call embtk_download_pkg,LIBXI)
 
 libxi_clean:
-	$(call EMBTK_CLEANUP_PKG,LIBXI)
+	$(call embtk_cleanup_pkg,LIBXI)
diff --git a/packages/x11/libxkbfile/libxkbfile.mk b/packages/x11/libxkbfile/libxkbfile.mk
index 5c2a092..f56ab8b 100644
--- a/packages/x11/libxkbfile/libxkbfile.mk
+++ b/packages/x11/libxkbfile/libxkbfile.mk
@@ -24,7 +24,7 @@
 ################################################################################
 
 LIBXKBFILE_NAME := libxkbfile
-LIBXKBFILE_VERSION := $(call EMBTK_GET_PKG_VERSION,LIBXKBFILE)
+LIBXKBFILE_VERSION := $(call embtk_get_pkgversion,LIBXKBFILE)
 LIBXKBFILE_SITE := http://xorg.freedesktop.org/archive/individual/lib
 LIBXKBFILE_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
 LIBXKBFILE_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/libxkbfile/$(LIBXKBFILE_VERSION)
@@ -43,10 +43,10 @@ LIBXKBFILE_PKGCONFIGS =
 LIBXKBFILE_DEPS = kbproto_install libx11_install
 
 libxkbfile_install:
-	$(call EMBTK_INSTALL_PKG,LIBXKBFILE)
+	$(call embtk_install_pkg,LIBXKBFILE)
 
 download_libxkbfile:
-	$(call EMBTK_DOWNLOAD_PKG,LIBXKBFILE)
+	$(call embtk_download_pkg,LIBXKBFILE)
 
 libxkbfile_clean:
-	$(call EMBTK_CLEANUP_PKG,LIBXKBFILE)
+	$(call embtk_cleanup_pkg,LIBXKBFILE)
diff --git a/packages/x11/libxrandr/libxrandr.mk b/packages/x11/libxrandr/libxrandr.mk
index 69ddb33..d76a558 100644
--- a/packages/x11/libxrandr/libxrandr.mk
+++ b/packages/x11/libxrandr/libxrandr.mk
@@ -43,10 +43,10 @@ LIBXRANDR_CONFIGURE_OPTS := --disable-malloc0returnsnull
 LIBXRANDR_DEPS = xproto_install randrproto_install
 
 libxrandr_install:
-	$(call EMBTK_INSTALL_PKG,LIBXRANDR)
+	$(call embtk_install_pkg,LIBXRANDR)
 
 download_libxrandr:
-	$(call EMBTK_DOWNLOAD_PKG,LIBXRANDR)
+	$(call embtk_download_pkg,LIBXRANDR)
 
 libxrandr_clean:
-	$(call EMBTK_CLEANUP_PKG,LIBXRANDR)
+	$(call embtk_cleanup_pkg,LIBXRANDR)
diff --git a/packages/x11/libxrender/libxrender.mk b/packages/x11/libxrender/libxrender.mk
index 097a558..acdaa51 100644
--- a/packages/x11/libxrender/libxrender.mk
+++ b/packages/x11/libxrender/libxrender.mk
@@ -24,7 +24,7 @@
 ################################################################################
 
 LIBXRENDER_NAME := libXrender
-LIBXRENDER_VERSION := $(call EMBTK_GET_PKG_VERSION,LIBXRENDER)
+LIBXRENDER_VERSION := $(call embtk_get_pkgversion,LIBXRENDER)
 LIBXRENDER_SITE := http://xorg.freedesktop.org/archive/individual/lib
 LIBXRENDER_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
 LIBXRENDER_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/libxrender/$(LIBXI_VERSION)
@@ -43,10 +43,10 @@ LIBXRENDER_CONFIGURE_OPTS := --disable-malloc0returnsnull
 LIBXRENDER_DEPS = renderproto_install libx11_install
 
 libxrender_install:
-	$(call EMBTK_INSTALL_PKG,LIBXRENDER)
+	$(call embtk_install_pkg,LIBXRENDER)
 
 download_libxrender:
-	$(call EMBTK_DOWNLOAD_PKG,LIBXRENDER)
+	$(call embtk_download_pkg,LIBXRENDER)
 
 libxrender_clean:
-	$(call EMBTK_CLEANUP_PKG,LIBXRENDER)
+	$(call embtk_cleanup_pkg,LIBXRENDER)
diff --git a/packages/x11/randrproto/randrproto.mk b/packages/x11/randrproto/randrproto.mk
index 69236e4..fe542fb 100644
--- a/packages/x11/randrproto/randrproto.mk
+++ b/packages/x11/randrproto/randrproto.mk
@@ -40,7 +40,7 @@ randrproto_install:
 
 $(RANDRPROTO_BUILD_DIR)/.installed: download_randrproto \
 	$(RANDRPROTO_BUILD_DIR)/.decompressed $(RANDRPROTO_BUILD_DIR)/.configured
-	$(call EMBTK_GENERIC_MESSAGE,"Compiling and installing \
+	$(call embtk_generic_message,"Compiling and installing \
 	randrproto-$(RANDRPROTO_VERSION) in your root filesystem...")
 	$(Q)$(MAKE) -C $(RANDRPROTO_BUILD_DIR) $(J)
 	$(Q)$(MAKE) -C $(RANDRPROTO_BUILD_DIR) DESTDIR=$(SYSROOT) install
@@ -49,14 +49,14 @@ $(RANDRPROTO_BUILD_DIR)/.installed: download_randrproto \
 	@touch $@
 
 download_randrproto:
-	$(call EMBTK_GENERIC_MESSAGE,"Downloading $(RANDRPROTO_PACKAGE) \
+	$(call embtk_generic_message,"Downloading $(RANDRPROTO_PACKAGE) \
 	if necessary...")
 	@test -e $(DOWNLOAD_DIR)/$(RANDRPROTO_PACKAGE) || \
 	wget -O $(DOWNLOAD_DIR)/$(RANDRPROTO_PACKAGE) \
 	$(RANDRPROTO_SITE)/$(RANDRPROTO_PACKAGE)
 
 $(RANDRPROTO_BUILD_DIR)/.decompressed:
-	$(call EMBTK_GENERIC_MESSAGE,"Decompressing $(RANDRPROTO_PACKAGE) ...")
+	$(call embtk_generic_message,"Decompressing $(RANDRPROTO_PACKAGE) ...")
 	@tar -C $(PACKAGES_BUILD) -xjvf $(DOWNLOAD_DIR)/$(RANDRPROTO_PACKAGE)
 	@touch $@
 
@@ -84,7 +84,7 @@ $(RANDRPROTO_BUILD_DIR)/.configured:
 	@touch $@
 
 randrproto_clean:
-	$(call EMBTK_GENERIC_MESSAGE,"cleanup randrproto-$(RANDRPROTO_VERSION)...")
+	$(call embtk_generic_message,"cleanup randrproto-$(RANDRPROTO_VERSION)...")
 	$(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(RANDRPROTO_BINS)
 	$(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(RANDRPROTO_SBINS)
 	$(Q)-cd $(SYSROOT)/usr/include; rm -rf $(RANDRPROTO_INCLUDES)
diff --git a/packages/x11/recordproto/recordproto.mk b/packages/x11/recordproto/recordproto.mk
index 8980874..483cfe8 100644
--- a/packages/x11/recordproto/recordproto.mk
+++ b/packages/x11/recordproto/recordproto.mk
@@ -41,7 +41,7 @@ recordproto_install:
 
 $(RECORDPROTO_BUILD_DIR)/.installed: download_recordproto \
 	$(RECORDPROTO_BUILD_DIR)/.decompressed $(RECORDPROTO_BUILD_DIR)/.configured
-	$(call EMBTK_GENERIC_MESSAGE,"Compiling and installing \
+	$(call embtk_generic_message,"Compiling and installing \
 	recordproto-$(RECORDPROTO_VERSION) in your root filesystem...")
 	$(Q)$(MAKE) -C $(RECORDPROTO_BUILD_DIR) $(J)
 	$(Q)$(MAKE) -C $(RECORDPROTO_BUILD_DIR) DESTDIR=$(SYSROOT) install
@@ -50,14 +50,14 @@ $(RECORDPROTO_BUILD_DIR)/.installed: download_recordproto \
 	@touch $@
 
 download_recordproto:
-	$(call EMBTK_GENERIC_MESSAGE,"Downloading $(RECORDPROTO_PACKAGE) \
+	$(call embtk_generic_message,"Downloading $(RECORDPROTO_PACKAGE) \
 	if necessary...")
 	@test -e $(DOWNLOAD_DIR)/$(RECORDPROTO_PACKAGE) || \
 	wget -O $(DOWNLOAD_DIR)/$(RECORDPROTO_PACKAGE) \
 	$(RECORDPROTO_SITE)/$(RECORDPROTO_PACKAGE)
 
 $(RECORDPROTO_BUILD_DIR)/.decompressed:
-	$(call EMBTK_GENERIC_MESSAGE,"Decompressing $(RECORDPROTO_PACKAGE) ...")
+	$(call embtk_generic_message,"Decompressing $(RECORDPROTO_PACKAGE) ...")
 	@tar -C $(PACKAGES_BUILD) -xjvf $(DOWNLOAD_DIR)/$(RECORDPROTO_PACKAGE)
 	@touch $@
 
@@ -84,7 +84,7 @@ $(RECORDPROTO_BUILD_DIR)/.configured:
 	@touch $@
 
 recordproto_clean:
-	$(call EMBTK_GENERIC_MESSAGE,"cleanup recordproto-$(RECORDPROTO_VERSION)...")
+	$(call embtk_generic_message,"cleanup recordproto-$(RECORDPROTO_VERSION)...")
 	$(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(RECORDPROTO_BINS)
 	$(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(RECORDPROTO_SBINS)
 	$(Q)-cd $(SYSROOT)/usr/include; rm -rf $(RECORDPROTO_INCLUDES)
diff --git a/packages/x11/renderproto/renderproto.mk b/packages/x11/renderproto/renderproto.mk
index de78c97..79d4b59 100644
--- a/packages/x11/renderproto/renderproto.mk
+++ b/packages/x11/renderproto/renderproto.mk
@@ -40,7 +40,7 @@ renderproto_install:
 
 $(RENDERPROTO_BUILD_DIR)/.installed: download_renderproto \
 	$(RENDERPROTO_BUILD_DIR)/.decompressed $(RENDERPROTO_BUILD_DIR)/.configured
-	$(call EMBTK_GENERIC_MESSAGE,"Compiling and installing \
+	$(call embtk_generic_message,"Compiling and installing \
 	renderproto-$(RENDERPROTO_VERSION) in your root filesystem...")
 	$(Q)$(MAKE) -C $(RENDERPROTO_BUILD_DIR) $(J)
 	$(Q)$(MAKE) -C $(RENDERPROTO_BUILD_DIR) DESTDIR=$(SYSROOT) install
@@ -49,14 +49,14 @@ $(RENDERPROTO_BUILD_DIR)/.installed: download_renderproto \
 	@touch $@
 
 download_renderproto:
-	$(call EMBTK_GENERIC_MESSAGE,"Downloading $(RENDERPROTO_PACKAGE) \
+	$(call embtk_generic_message,"Downloading $(RENDERPROTO_PACKAGE) \
 	if necessary...")
 	@test -e $(DOWNLOAD_DIR)/$(RENDERPROTO_PACKAGE) || \
 	wget -O $(DOWNLOAD_DIR)/$(RENDERPROTO_PACKAGE) \
 	$(RENDERPROTO_SITE)/$(RENDERPROTO_PACKAGE)
 
 $(RENDERPROTO_BUILD_DIR)/.decompressed:
-	$(call EMBTK_GENERIC_MESSAGE,"Decompressing $(RENDERPROTO_PACKAGE) ...")
+	$(call embtk_generic_message,"Decompressing $(RENDERPROTO_PACKAGE) ...")
 	@tar -C $(PACKAGES_BUILD) -xjvf $(DOWNLOAD_DIR)/$(RENDERPROTO_PACKAGE)
 	@touch $@
 
@@ -84,7 +84,7 @@ $(RENDERPROTO_BUILD_DIR)/.configured:
 	@touch $@
 
 renderproto_clean:
-	$(call EMBTK_GENERIC_MESSAGE,"cleanup renderproto-$(RENDERPROTO_VERSION)...")
+	$(call embtk_generic_message,"cleanup renderproto-$(RENDERPROTO_VERSION)...")
 	$(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(RENDERPROTO_BINS)
 	$(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(RENDERPROTO_SBINS)
 	$(Q)-cd $(SYSROOT)/usr/include; rm -rf $(RENDERPROTO_INCLUDES)
diff --git a/packages/x11/resourceproto/resourceproto.mk b/packages/x11/resourceproto/resourceproto.mk
index 31fca81..847a5b9 100644
--- a/packages/x11/resourceproto/resourceproto.mk
+++ b/packages/x11/resourceproto/resourceproto.mk
@@ -40,7 +40,7 @@ resourceproto_install:
 
 $(RESOURCEPROTO_BUILD_DIR)/.installed: download_resourceproto \
 	$(RESOURCEPROTO_BUILD_DIR)/.decompressed $(RESOURCEPROTO_BUILD_DIR)/.configured
-	$(call EMBTK_GENERIC_MESSAGE,"Compiling and installing \
+	$(call embtk_generic_message,"Compiling and installing \
 	resourceproto-$(RESOURCEPROTO_VERSION) in your root filesystem...")
 	$(Q)$(MAKE) -C $(RESOURCEPROTO_BUILD_DIR) $(J)
 	$(Q)$(MAKE) -C $(RESOURCEPROTO_BUILD_DIR) DESTDIR=$(SYSROOT) install
@@ -49,14 +49,14 @@ $(RESOURCEPROTO_BUILD_DIR)/.installed: download_resourceproto \
 	@touch $@
 
 download_resourceproto:
-	$(call EMBTK_GENERIC_MESSAGE,"Downloading $(RESOURCEPROTO_PACKAGE) \
+	$(call embtk_generic_message,"Downloading $(RESOURCEPROTO_PACKAGE) \
 	if necessary...")
 	@test -e $(DOWNLOAD_DIR)/$(RESOURCEPROTO_PACKAGE) || \
 	wget -O $(DOWNLOAD_DIR)/$(RESOURCEPROTO_PACKAGE) \
 	$(RESOURCEPROTO_SITE)/$(RESOURCEPROTO_PACKAGE)
 
 $(RESOURCEPROTO_BUILD_DIR)/.decompressed:
-	$(call EMBTK_GENERIC_MESSAGE,"Decompressing $(RESOURCEPROTO_PACKAGE) ...")
+	$(call embtk_generic_message,"Decompressing $(RESOURCEPROTO_PACKAGE) ...")
 	@tar -C $(PACKAGES_BUILD) -xjvf $(DOWNLOAD_DIR)/$(RESOURCEPROTO_PACKAGE)
 	@touch $@
 
@@ -84,7 +84,7 @@ $(RESOURCEPROTO_BUILD_DIR)/.configured:
 	@touch $@
 
 resourceproto_clean:
-	$(call EMBTK_GENERIC_MESSAGE,"cleanup resourceproto-$(RESOURCEPROTO_VERSION)...")
+	$(call embtk_generic_message,"cleanup resourceproto-$(RESOURCEPROTO_VERSION)...")
 	$(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(RESOURCEPROTO_BINS)
 	$(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(RESOURCEPROTO_SBINS)
 	$(Q)-cd $(SYSROOT)/usr/include; rm -rf $(RESOURCEPROTO_INCLUDES)
diff --git a/packages/x11/utilmacros/utilmacros.mk b/packages/x11/utilmacros/utilmacros.mk
index a04975a..04a3d6c 100644
--- a/packages/x11/utilmacros/utilmacros.mk
+++ b/packages/x11/utilmacros/utilmacros.mk
@@ -24,7 +24,7 @@
 ################################################################################
 
 UTILMACROS_NAME := util-macro
-UTILMACROS_VERSION := $(call EMBTK_GET_PKG_VERSION,UTILMACROS)
+UTILMACROS_VERSION := $(call embtk_get_pkgversion,UTILMACROS)
 UTILMACROS_SITE := http://xorg.freedesktop.org/archive/individual/util
 UTILMACROS_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
 UTILMACROS_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/util-macro/$(UTILMACROS_VERSION)
@@ -41,12 +41,12 @@ UTILMACROS_PKGCONFIGS = xorg-macros.pc
 UTILMACROS_CONFIGURE_OPTS := --disable-malloc0returnsnull
 
 utilmacros_install:
-	$(call EMBTK_INSTALL_PKG,UTILMACROS) && \
+	$(call embtk_install_pkg,UTILMACROS) && \
 	cp $(SYSROOT)/usr/share/pkgconfig/xorg-macros.pc $(EMBTK_PKG_CONFIG_PATH) \
 	&& $(MAKE) pkgconfig_files_adapt
 
 download_utilmacros:
-	$(call EMBTK_DOWNLOAD_PKG,UTILMACROS)
+	$(call embtk_download_pkg,UTILMACROS)
 
 utilmacros_clean:
-	$(call EMBTK_CLEANUP_PKG,UTILMACROS)
+	$(call embtk_cleanup_pkg,UTILMACROS)
diff --git a/packages/x11/videoproto/videoproto.mk b/packages/x11/videoproto/videoproto.mk
index 358b611..49f4809 100644
--- a/packages/x11/videoproto/videoproto.mk
+++ b/packages/x11/videoproto/videoproto.mk
@@ -42,7 +42,7 @@ videoproto_install:
 
 $(VIDEOPROTO_BUILD_DIR)/.installed: download_videoproto \
 	$(VIDEOPROTO_BUILD_DIR)/.decompressed $(VIDEOPROTO_BUILD_DIR)/.configured
-	$(call EMBTK_GENERIC_MESSAGE,"Compiling and installing \
+	$(call embtk_generic_message,"Compiling and installing \
 	videoproto-$(VIDEOPROTO_VERSION) in your root filesystem...")
 	$(Q)$(MAKE) -C $(VIDEOPROTO_BUILD_DIR) $(J)
 	$(Q)$(MAKE) -C $(VIDEOPROTO_BUILD_DIR) DESTDIR=$(SYSROOT) install
@@ -51,14 +51,14 @@ $(VIDEOPROTO_BUILD_DIR)/.installed: download_videoproto \
 	@touch $@
 
 download_videoproto:
-	$(call EMBTK_GENERIC_MESSAGE,"Downloading $(VIDEOPROTO_PACKAGE) \
+	$(call embtk_generic_message,"Downloading $(VIDEOPROTO_PACKAGE) \
 	if necessary...")
 	@test -e $(DOWNLOAD_DIR)/$(VIDEOPROTO_PACKAGE) || \
 	wget -O $(DOWNLOAD_DIR)/$(VIDEOPROTO_PACKAGE) \
 	$(VIDEOPROTO_SITE)/$(VIDEOPROTO_PACKAGE)
 
 $(VIDEOPROTO_BUILD_DIR)/.decompressed:
-	$(call EMBTK_GENERIC_MESSAGE,"Decompressing $(VIDEOPROTO_PACKAGE) ...")
+	$(call embtk_generic_message,"Decompressing $(VIDEOPROTO_PACKAGE) ...")
 	@tar -C $(PACKAGES_BUILD) -xjvf $(DOWNLOAD_DIR)/$(VIDEOPROTO_PACKAGE)
 	@touch $@
 
@@ -86,7 +86,7 @@ $(VIDEOPROTO_BUILD_DIR)/.configured:
 	@touch $@
 
 videoproto_clean:
-	$(call EMBTK_GENERIC_MESSAGE,"cleanup videoproto-$(VIDEOPROTO_VERSION)...")
+	$(call embtk_generic_message,"cleanup videoproto-$(VIDEOPROTO_VERSION)...")
 	$(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(VIDEOPROTO_BINS)
 	$(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(VIDEOPROTO_SBINS)
 	$(Q)-cd $(SYSROOT)/usr/include; rm -rf $(VIDEOPROTO_INCLUDES)
diff --git a/packages/x11/xcbproto/xcbproto.mk b/packages/x11/xcbproto/xcbproto.mk
index cc08f1d..646895a 100644
--- a/packages/x11/xcbproto/xcbproto.mk
+++ b/packages/x11/xcbproto/xcbproto.mk
@@ -39,7 +39,7 @@ xcbproto_install:
 
 $(XCBPROTO_BUILD_DIR)/.installed: download_xcbproto \
 	$(XCBPROTO_BUILD_DIR)/.decompressed $(XCBPROTO_BUILD_DIR)/.configured
-	$(call EMBTK_GENERIC_MESSAGE,"Compiling and installing \
+	$(call embtk_generic_message,"Compiling and installing \
 	xcbproto-$(XCBPROTO_VERSION) in your root filesystem...")
 	$(Q)$(MAKE) -C $(XCBPROTO_BUILD_DIR) $(J)
 	$(Q)$(MAKE) -C $(XCBPROTO_BUILD_DIR) DESTDIR=$(SYSROOT) install
@@ -48,14 +48,14 @@ $(XCBPROTO_BUILD_DIR)/.installed: download_xcbproto \
 	@touch $@
 
 download_xcbproto:
-	$(call EMBTK_GENERIC_MESSAGE,"Downloading $(XCBPROTO_PACKAGE) \
+	$(call embtk_generic_message,"Downloading $(XCBPROTO_PACKAGE) \
 	if necessary...")
 	@test -e $(DOWNLOAD_DIR)/$(XCBPROTO_PACKAGE) || \
 	wget -O $(DOWNLOAD_DIR)/$(XCBPROTO_PACKAGE) \
 	$(XCBPROTO_SITE)/$(XCBPROTO_PACKAGE)
 
 $(XCBPROTO_BUILD_DIR)/.decompressed:
-	$(call EMBTK_GENERIC_MESSAGE,"Decompressing $(XCBPROTO_PACKAGE) ...")
+	$(call embtk_generic_message,"Decompressing $(XCBPROTO_PACKAGE) ...")
 	@tar -C $(PACKAGES_BUILD) -xzf $(DOWNLOAD_DIR)/$(XCBPROTO_PACKAGE)
 	@touch $@
 
@@ -83,7 +83,7 @@ $(XCBPROTO_BUILD_DIR)/.configured:
 	@touch $@
 
 xcbproto_clean:
-	$(call EMBTK_GENERIC_MESSAGE,"cleanup xcbproto-$(XCBPROTO_VERSION)...")
+	$(call embtk_generic_message,"cleanup xcbproto-$(XCBPROTO_VERSION)...")
 	$(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(XCBPROTO_BINS)
 	$(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(XCBPROTO_SBINS)
 	$(Q)-cd $(SYSROOT)/usr/include; rm -rf $(XCBPROTO_INCLUDES)
diff --git a/packages/x11/xcbutil/xcbutil.mk b/packages/x11/xcbutil/xcbutil.mk
index 51b3f54..8154670 100644
--- a/packages/x11/xcbutil/xcbutil.mk
+++ b/packages/x11/xcbutil/xcbutil.mk
@@ -24,7 +24,7 @@
 ################################################################################
 
 XCBUTIL_NAME := xcb-util
-XCBUTIL_VERSION := $(call EMBTK_GET_PKG_VERSION,XCBUTIL)
+XCBUTIL_VERSION := $(call embtk_get_pkgversion,XCBUTIL)
 XCBUTIL_SITE := http://xcb.freedesktop.org/dist
 XCBUTIL_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
 XCBUTIL_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/xcb-util/$(XCBUTIL_VERSION)
@@ -48,14 +48,14 @@ XCBUTIL_PKGCONFIGS = xcb-atom.pc xcb-aux.pc xcb-event.pc xcb-icccm.pc \
 XCBUTIL_DEPS = gperf_host_install libxcb_install
 
 xcbutil_install:
-	$(call EMBTK_INSTALL_PKG,XCBUTIL)
+	$(call embtk_install_pkg,XCBUTIL)
 	$(Q)$(MAKE) $(XCBUTIL_BUILD_DIR)/.patchlibtool
 
 download_xcbutil:
-	$(call EMBTK_DOWNLOAD_PKG,XCBUTIL)
+	$(call embtk_download_pkg,XCBUTIL)
 
 xcbutil_clean:
-	$(call EMBTK_CLEANUP_PKG,XCBUTIL)
+	$(call embtk_cleanup_pkg,XCBUTIL)
 
 $(XCBUTIL_BUILD_DIR)/.patchlibtool:
 	@XCBUTIL_LT_FILES=`find $(SYSROOT)/usr/$(LIBDIR)/libxcb-* -type f -name *.la`; \
diff --git a/packages/x11/xcmiscproto/xcmiscproto.mk b/packages/x11/xcmiscproto/xcmiscproto.mk
index ab6012c..e27938a 100644
--- a/packages/x11/xcmiscproto/xcmiscproto.mk
+++ b/packages/x11/xcmiscproto/xcmiscproto.mk
@@ -40,7 +40,7 @@ xcmiscproto_install:
 
 $(XCMISCPROTO_BUILD_DIR)/.installed: download_xcmiscproto \
 	$(XCMISCPROTO_BUILD_DIR)/.decompressed $(XCMISCPROTO_BUILD_DIR)/.configured
-	$(call EMBTK_GENERIC_MESSAGE,"Compiling and installing \
+	$(call embtk_generic_message,"Compiling and installing \
 	xcmiscproto-$(XCMISCPROTO_VERSION) in your root filesystem...")
 	$(Q)$(MAKE) -C $(XCMISCPROTO_BUILD_DIR) $(J)
 	$(Q)$(MAKE) -C $(XCMISCPROTO_BUILD_DIR) DESTDIR=$(SYSROOT) install
@@ -49,14 +49,14 @@ $(XCMISCPROTO_BUILD_DIR)/.installed: download_xcmiscproto \
 	@touch $@
 
 download_xcmiscproto:
-	$(call EMBTK_GENERIC_MESSAGE,"Downloading $(XCMISCPROTO_PACKAGE) \
+	$(call embtk_generic_message,"Downloading $(XCMISCPROTO_PACKAGE) \
 	if necessary...")
 	@test -e $(DOWNLOAD_DIR)/$(XCMISCPROTO_PACKAGE) || \
 	wget -O $(DOWNLOAD_DIR)/$(XCMISCPROTO_PACKAGE) \
 	$(XCMISCPROTO_SITE)/$(XCMISCPROTO_PACKAGE)
 
 $(XCMISCPROTO_BUILD_DIR)/.decompressed:
-	$(call EMBTK_GENERIC_MESSAGE,"Decompressing $(XCMISCPROTO_PACKAGE) ...")
+	$(call embtk_generic_message,"Decompressing $(XCMISCPROTO_PACKAGE) ...")
 	@tar -C $(PACKAGES_BUILD) -xjvf $(DOWNLOAD_DIR)/$(XCMISCPROTO_PACKAGE)
 	@touch $@
 
@@ -84,7 +84,7 @@ $(XCMISCPROTO_BUILD_DIR)/.configured:
 	@touch $@
 
 xcmiscproto_clean:
-	$(call EMBTK_GENERIC_MESSAGE,"cleanup xcmiscproto-$(XCMISCPROTO_VERSION)...")
+	$(call embtk_generic_message,"cleanup xcmiscproto-$(XCMISCPROTO_VERSION)...")
 	$(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(XCMISCPROTO_BINS)
 	$(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(XCMISCPROTO_SBINS)
 	$(Q)-cd $(SYSROOT)/usr/include; rm -rf $(XCMISCPROTO_INCLUDES)
diff --git a/packages/x11/xextproto/xextproto.mk b/packages/x11/xextproto/xextproto.mk
index e451348..c8921c2 100644
--- a/packages/x11/xextproto/xextproto.mk
+++ b/packages/x11/xextproto/xextproto.mk
@@ -54,7 +54,7 @@ xextproto_install:
 
 $(XEXTPROTO_BUILD_DIR)/.installed: download_xextproto \
 	$(XEXTPROTO_BUILD_DIR)/.decompressed $(XEXTPROTO_BUILD_DIR)/.configured
-	$(call EMBTK_GENERIC_MESSAGE,"Compiling and installing \
+	$(call embtk_generic_message,"Compiling and installing \
 	xextproto-$(XEXTPROTO_VERSION) in your root filesystem...")
 	$(Q)$(MAKE) -C $(XEXTPROTO_BUILD_DIR) $(J)
 	$(Q)$(MAKE) -C $(XEXTPROTO_BUILD_DIR) DESTDIR=$(SYSROOT) install
@@ -63,14 +63,14 @@ $(XEXTPROTO_BUILD_DIR)/.installed: download_xextproto \
 	@touch $@
 
 download_xextproto:
-	$(call EMBTK_GENERIC_MESSAGE,"Downloading $(XEXTPROTO_PACKAGE) \
+	$(call embtk_generic_message,"Downloading $(XEXTPROTO_PACKAGE) \
 	if necessary...")
 	@test -e $(DOWNLOAD_DIR)/$(XEXTPROTO_PACKAGE) || \
 	wget -O $(DOWNLOAD_DIR)/$(XEXTPROTO_PACKAGE) \
 	$(XEXTPROTO_SITE)/$(XEXTPROTO_PACKAGE)
 
 $(XEXTPROTO_BUILD_DIR)/.decompressed:
-	$(call EMBTK_GENERIC_MESSAGE,"Decompressing $(XEXTPROTO_PACKAGE) ...")
+	$(call embtk_generic_message,"Decompressing $(XEXTPROTO_PACKAGE) ...")
 	@tar -C $(PACKAGES_BUILD) -xjvf $(DOWNLOAD_DIR)/$(XEXTPROTO_PACKAGE)
 	@touch $@
 
@@ -98,7 +98,7 @@ $(XEXTPROTO_BUILD_DIR)/.configured:
 	@touch $@
 
 xextproto_clean:
-	$(call EMBTK_GENERIC_MESSAGE,"cleanup xextproto-$(XEXTPROTO_VERSION)...")
+	$(call embtk_generic_message,"cleanup xextproto-$(XEXTPROTO_VERSION)...")
 	$(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(XEXTPROTO_BINS)
 	$(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(XEXTPROTO_SBINS)
 	$(Q)-cd $(SYSROOT)/usr/include; rm -rf $(XEXTPROTO_INCLUDES)
diff --git a/packages/x11/xf86inputevdev/xf86inputevdev.mk b/packages/x11/xf86inputevdev/xf86inputevdev.mk
index eb557a4..874aecc 100644
--- a/packages/x11/xf86inputevdev/xf86inputevdev.mk
+++ b/packages/x11/xf86inputevdev/xf86inputevdev.mk
@@ -48,7 +48,7 @@ xf86inputevdev_install:
 $(XF86INPUTEVDEV_BUILD_DIR)/.installed: $(XF86INPUTEVDEV_DEPS) \
 	download_xf86inputevdev $(XF86INPUTEVDEV_BUILD_DIR)/.decompressed \
 	$(XF86INPUTEVDEV_BUILD_DIR)/.configured
-	$(call EMBTK_GENERIC_MESSAGE,"Compiling and installing \
+	$(call embtk_generic_message,"Compiling and installing \
 	xf86inputevdev-$(XF86INPUTEVDEV_VERSION) in your root filesystem...")
 	$(Q)$(MAKE) -C $(XF86INPUTEVDEV_BUILD_DIR) $(J)
 	$(Q)$(MAKE) -C $(XF86INPUTEVDEV_BUILD_DIR) DESTDIR=$(SYSROOT) install
@@ -57,16 +57,16 @@ $(XF86INPUTEVDEV_BUILD_DIR)/.installed: $(XF86INPUTEVDEV_DEPS) \
 	@touch $@
 
 download_xf86inputevdev:
-	$(call EMBTK_DOWNLOAD_PKG,XF86INPUTEVDEV)
+	$(call embtk_download_pkg,XF86INPUTEVDEV)
 
 $(XF86INPUTEVDEV_BUILD_DIR)/.decompressed:
-	$(call EMBTK_DECOMPRESS_PKG,XF86INPUTEVDEV)
+	$(call embtk_decompress_pkg,XF86INPUTEVDEV)
 
 $(XF86INPUTEVDEV_BUILD_DIR)/.configured:
-	$(call EMBTK_CONFIGURE_PKG,XF86INPUTEVDEV)
+	$(call embtk_configure_pkg,XF86INPUTEVDEV)
 
 xf86inputevdev_clean:
-	$(call EMBTK_CLEANUP_PKG,XF86INPUTEVDEV)
+	$(call embtk_cleanup_pkg,XF86INPUTEVDEV)
 
 .PHONY: $(XF86INPUTEVDEV_BUILD_DIR)/.special
 
diff --git a/packages/x11/xf86videofbdev/xf86videofbdev.mk b/packages/x11/xf86videofbdev/xf86videofbdev.mk
index 5440c65..67338a3 100644
--- a/packages/x11/xf86videofbdev/xf86videofbdev.mk
+++ b/packages/x11/xf86videofbdev/xf86videofbdev.mk
@@ -48,7 +48,7 @@ xf86videofbdev_install:
 $(XF86VIDEOFBDEV_BUILD_DIR)/.installed: $(XF86VIDEOFBDEV_DEPS) \
 	download_xf86videofbdev $(XF86VIDEOFBDEV_BUILD_DIR)/.decompressed \
 	$(XF86VIDEOFBDEV_BUILD_DIR)/.configured
-	$(call EMBTK_GENERIC_MESSAGE,"Compiling and installing \
+	$(call embtk_generic_message,"Compiling and installing \
 	xf86videofbdev-$(XF86VIDEOFBDEV_VERSION) in your root filesystem...")
 	$(Q)$(MAKE) -C $(XF86VIDEOFBDEV_BUILD_DIR) $(J)
 	$(Q)$(MAKE) -C $(XF86VIDEOFBDEV_BUILD_DIR) DESTDIR=$(SYSROOT) install
@@ -57,16 +57,16 @@ $(XF86VIDEOFBDEV_BUILD_DIR)/.installed: $(XF86VIDEOFBDEV_DEPS) \
 	@touch $@
 
 download_xf86videofbdev:
-	$(call EMBTK_DOWNLOAD_PKG,XF86VIDEOFBDEV)
+	$(call embtk_download_pkg,XF86VIDEOFBDEV)
 
 $(XF86VIDEOFBDEV_BUILD_DIR)/.decompressed:
-	$(call EMBTK_DECOMPRESS_PKG,XF86VIDEOFBDEV)
+	$(call embtk_decompress_pkg,XF86VIDEOFBDEV)
 
 $(XF86VIDEOFBDEV_BUILD_DIR)/.configured:
-	$(call EMBTK_CONFIGURE_PKG,XF86VIDEOFBDEV)
+	$(call embtk_configure_pkg,XF86VIDEOFBDEV)
 
 xf86videofbdev_clean:
-	$(call EMBTK_CLEANUP_PKG,XF86VIDEOFBDEV)
+	$(call embtk_cleanup_pkg,XF86VIDEOFBDEV)
 
 .PHONY: $(XF86VIDEOFBDEV_BUILD_DIR)/.special
 
diff --git a/packages/x11/xinput/xinput.mk b/packages/x11/xinput/xinput.mk
index 2c10493..9c2aea2 100644
--- a/packages/x11/xinput/xinput.mk
+++ b/packages/x11/xinput/xinput.mk
@@ -42,10 +42,10 @@ XINPUT_DEPS := xproto_install inputproto_install libx11_install \
 	libxext_install libxi_install
 
 xinput_install:
-	$(call EMBTK_INSTALL_PKG,XINPUT)
+	$(call embtk_install_pkg,XINPUT)
 
 download_xinput:
-	$(call EMBTK_DOWNLOAD_PKG,XINPUT)
+	$(call embtk_download_pkg,XINPUT)
 
 xinput_clean:
-	$(call EMBTK_CLEANUP_PKG,XINPUT)
+	$(call embtk_cleanup_pkg,XINPUT)
diff --git a/packages/x11/xkbcomp/xkbcomp.mk b/packages/x11/xkbcomp/xkbcomp.mk
index 7a950e1..5bf3ccb 100644
--- a/packages/x11/xkbcomp/xkbcomp.mk
+++ b/packages/x11/xkbcomp/xkbcomp.mk
@@ -41,10 +41,10 @@ XKBCOMP_PKGCONFIGS =
 XKBCOMP_DEPS = libxkbfile_install
 
 xkbcomp_install:
-	$(call EMBTK_INSTALL_PKG,XKBCOMP)
+	$(call embtk_install_pkg,XKBCOMP)
 
 download_xkbcomp:
-	$(call EMBTK_CLEANUP_PKG,XKBCOMP)
+	$(call embtk_cleanup_pkg,XKBCOMP)
 
 xkbcomp_clean:
-	$(call EMBTK_CLEANUP_PKG,XKBCOMP)
+	$(call embtk_cleanup_pkg,XKBCOMP)
diff --git a/packages/x11/xkeyboardconfig/xkeyboardconfig.mk b/packages/x11/xkeyboardconfig/xkeyboardconfig.mk
index 30aa9b1..aec0d7f 100644
--- a/packages/x11/xkeyboardconfig/xkeyboardconfig.mk
+++ b/packages/x11/xkeyboardconfig/xkeyboardconfig.mk
@@ -24,7 +24,7 @@
 ################################################################################
 
 XKEYBOARDCONFIG_NAME		:= xkeyboard-config
-XKEYBOARDCONFIG_VERSION		:= $(call EMBTK_GET_PKG_VERSION,XKEYBOARDCONFIG)
+XKEYBOARDCONFIG_VERSION		:= $(call embtk_get_pkgversion,XKEYBOARDCONFIG)
 XKEYBOARDCONFIG_SITE		:= http://www.x.org/releases/individual/data/xkeyboard-config
 XKEYBOARDCONFIG_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
 XKEYBOARDCONFIG_PATCH_SITE	:= ftp://ftp.embtoolkit.org/embtoolkit.org/xkeyboard-config/$(XKEYBOARDCONFIG_VERSION)
@@ -41,14 +41,14 @@ XKEYBOARDCONFIG_PKGCONFIGS =
 XKEYBOARDCONFIG_DEPS = intltool_host_install xkbcomp_install
 
 xkeyboardconfig_install:
-	$(call EMBTK_INSTALL_PKG,XKEYBOARDCONFIG)
+	$(call embtk_install_pkg,XKEYBOARDCONFIG)
 	$(Q)$(MAKE) $(XKEYBOARDCONFIG_BUILD_DIR)/.special
 
 download_xkeyboardconfig:
-	$(call EMBTK_DOWNLOAD_PKG,XKEYBOARDCONFIG)
+	$(call embtk_download_pkg,XKEYBOARDCONFIG)
 
 xkeyboardconfig_clean:
-	$(call EMBTK_CLEANUP_PKG,XKEYBOARDCONFIG)
+	$(call embtk_cleanup_pkg,XKEYBOARDCONFIG)
 
 .PHONY: $(XKEYBOARDCONFIG_BUILD_DIR)/.special
 
diff --git a/packages/x11/xproto/xproto.mk b/packages/x11/xproto/xproto.mk
index 0272ca6..72be7fb 100644
--- a/packages/x11/xproto/xproto.mk
+++ b/packages/x11/xproto/xproto.mk
@@ -43,7 +43,7 @@ xproto_install:
 
 $(XPROTO_BUILD_DIR)/.installed: download_xproto \
 	$(XPROTO_BUILD_DIR)/.decompressed $(XPROTO_BUILD_DIR)/.configured
-	$(call EMBTK_GENERIC_MESSAGE,"Compiling and installing \
+	$(call embtk_generic_message,"Compiling and installing \
 	xproto-$(XPROTO_VERSION) in your root filesystem...")
 	$(Q)$(MAKE) -C $(XPROTO_BUILD_DIR) $(J)
 	$(Q)$(MAKE) -C $(XPROTO_BUILD_DIR) DESTDIR=$(SYSROOT) install
@@ -52,14 +52,14 @@ $(XPROTO_BUILD_DIR)/.installed: download_xproto \
 	@touch $@
 
 download_xproto:
-	$(call EMBTK_GENERIC_MESSAGE,"Downloading $(XPROTO_PACKAGE) \
+	$(call embtk_generic_message,"Downloading $(XPROTO_PACKAGE) \
 	if necessary...")
 	@test -e $(DOWNLOAD_DIR)/$(XPROTO_PACKAGE) || \
 	wget -O $(DOWNLOAD_DIR)/$(XPROTO_PACKAGE) \
 	$(XPROTO_SITE)/$(XPROTO_PACKAGE)
 
 $(XPROTO_BUILD_DIR)/.decompressed:
-	$(call EMBTK_GENERIC_MESSAGE,"Decompressing $(XPROTO_PACKAGE) ...")
+	$(call embtk_generic_message,"Decompressing $(XPROTO_PACKAGE) ...")
 	@tar -C $(PACKAGES_BUILD) -xjvf $(DOWNLOAD_DIR)/$(XPROTO_PACKAGE)
 	@touch $@
 
@@ -87,7 +87,7 @@ $(XPROTO_BUILD_DIR)/.configured:
 	@touch $@
 
 xproto_clean:
-	$(call EMBTK_GENERIC_MESSAGE,"cleanup xproto...")
+	$(call embtk_generic_message,"cleanup xproto...")
 	$(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(XPROTO_BINS)
 	$(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(XPROTO_SBINS)
 	$(Q)-cd $(SYSROOT)/usr/include; rm -rf $(XPROTO_INCLUDES)
diff --git a/packages/x11/xserver/xserver.mk b/packages/x11/xserver/xserver.mk
index 55eb928..81246a3 100644
--- a/packages/x11/xserver/xserver.mk
+++ b/packages/x11/xserver/xserver.mk
@@ -24,7 +24,7 @@
 ################################################################################
 
 XSERVER_NAME := xorg-server
-XSERVER_VERSION := $(call EMBTK_GET_PKG_VERSION,XSERVER)
+XSERVER_VERSION := $(call embtk_get_pkgversion,XSERVER)
 XSERVER_SITE := http://ftp.x.org/pub/individual/xserver
 XSERVER_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
 XSERVER_PACKAGE := xorg-server-$(XSERVER_VERSION).tar.bz2
@@ -87,14 +87,14 @@ XSERVER_CONFIGURE_OPTS += --disable-tslib
 endif
 
 xserver_install:
-	$(call EMBTK_INSTALL_PKG,XSERVER)
+	$(call embtk_install_pkg,XSERVER)
 	$(Q)$(MAKE) $(XSERVER_BUILD_DIR)/.special
 
 download_xserver:
-	$(call EMBTK_DOWNLOAD_PKG,XSERVER)
+	$(call embtk_download_pkg,XSERVER)
 
 xserver_clean:
-	$(call EMBTK_CLEANUP_PKG,XSERVER)
+	$(call embtk_cleanup_pkg,XSERVER)
 
 .PHONY: $(XSERVER_BUILD_DIR)/.special
 
diff --git a/packages/x11/xtrans/xtrans.mk b/packages/x11/xtrans/xtrans.mk
index 373b9c1..22153ce 100644
--- a/packages/x11/xtrans/xtrans.mk
+++ b/packages/x11/xtrans/xtrans.mk
@@ -41,12 +41,12 @@ XTRANS_PKGCONFIGS =
 XTRANS_CONFIGURE_OPTS := --disable-malloc0returnsnull
 
 xtrans_install:
-	$(call EMBTK_INSTALL_PKG,XTRANS) && 				\
+	$(call embtk_install_pkg,XTRANS) && 				\
 	cp $(SYSROOT)/usr/share/pkgconfig/xtrans.pc $(EMBTK_PKG_CONFIG_PATH)	\
 	&& $(MAKE) pkgconfig_files_adapt
 
 download_xtrans:
-	$(call EMBTK_DOWNLOAD_PKG,XTRANS)
+	$(call embtk_download_pkg,XTRANS)
 
 xtrans_clean:
-	$(call EMBTK_CLEANUP_PKG,XTRANS)
+	$(call embtk_cleanup_pkg,XTRANS)
author	Abdoulaye Walsimou Gaye <awg@embtoolkit.org>	2011-07-02 14:45:48 +0200
committer	Abdoulaye Walsimou Gaye <awg@embtoolkit.org>	2011-07-02 14:45:48 +0200
commit	082dbb99d068e26c577831a1ab26816f39d798b7 (patch)
tree	cb064d868b650be4b6b3b26d99127221ac651343 /packages
parent	9c40b00ea89c6c0a6cc195e7636da1875052fa02 (diff)
download	embtoolkit-082dbb99d068e26c577831a1ab26816f39d798b7.tar.gz embtoolkit-082dbb99d068e26c577831a1ab26816f39d798b7.tar.bz2 embtoolkit-082dbb99d068e26c577831a1ab26816f39d798b7.tar.xz