Embtk generic macros: lower macros

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

13 files changed, 71 insertions, 71 deletions

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)