diff options
| 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/x11 | |
| parent | 9c40b00ea89c6c0a6cc195e7636da1875052fa02 (diff) | |
| download | embtoolkit-082dbb99d068e26c577831a1ab26816f39d798b7.tar.gz embtoolkit-082dbb99d068e26c577831a1ab26816f39d798b7.tar.bz2 embtoolkit-082dbb99d068e26c577831a1ab26816f39d798b7.tar.xz | |
Embtk generic macros: lower macros
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
Diffstat (limited to 'packages/x11')
40 files changed, 175 insertions, 175 deletions
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) |