Packages: massively convert to use generic macros and implicit rules

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

8 files changed, 35 insertions, 134 deletions

diff --git a/packages/misc/expat/expat.mk b/packages/misc/expat/expat.mk
index 51468d2..ecbe098 100644
--- a/packages/misc/expat/expat.mk
+++ b/packages/misc/expat/expat.mk
@@ -23,28 +23,16 @@
 # \date         July 2010
 ################################################################################
 
-EXPAT_NAME := 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)
-EXPAT_PACKAGE := expat-$(EXPAT_VERSION).tar.gz
-EXPAT_SRC_DIR := $(PACKAGES_BUILD)/expat-$(EXPAT_VERSION)
-EXPAT_BUILD_DIR := $(PACKAGES_BUILD)/expat-$(EXPAT_VERSION)
+EXPAT_NAME		:= 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_PACKAGE		:= expat-$(EXPAT_VERSION).tar.gz
+EXPAT_SRC_DIR		:= $(PACKAGES_BUILD)/expat-$(EXPAT_VERSION)
+EXPAT_BUILD_DIR		:= $(PACKAGES_BUILD)/expat-$(EXPAT_VERSION)
 
-EXPAT_BINS = xmlwf
-EXPAT_SBINS =
-EXPAT_INCLUDES = expat_external.h expat.h
-EXPAT_LIBS = libexpat.*
-EXPAT_PKGCONFIGS =
-
-EXPAT_DEPS =
-
-expat_install:
-	$(call embtk_install_pkg,EXPAT)
-
-download_expat:
-	$(call embtk_download_pkg,EXPAT)
-
-expat_clean:
-	$(call embtk_cleanup_pkg,EXPAT)
+EXPAT_BINS		= xmlwf
+EXPAT_SBINS		=
+EXPAT_INCLUDES		= expat_external.h expat.h
+EXPAT_LIBS		= libexpat.*
+EXPAT_PKGCONFIGS	=
diff --git a/packages/misc/gettext/gettext.mk b/packages/misc/gettext/gettext.mk
index a189895..5ccdac6 100644
--- a/packages/misc/gettext/gettext.mk
+++ b/packages/misc/gettext/gettext.mk
@@ -27,7 +27,6 @@ GETTEXT_NAME		:= 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)
 GETTEXT_PACKAGE		:= gettext-$(GETTEXT_VERSION).tar.gz
 GETTEXT_SRC_DIR		:= $(PACKAGES_BUILD)/gettext-$(GETTEXT_VERSION)
 GETTEXT_BUILD_DIR	:= $(PACKAGES_BUILD)/gettext-$(GETTEXT_VERSION)
@@ -53,13 +52,11 @@ GETTEXT_CONFIGURE_OPTS	:= --enable-relocatable --with-included-gettext	\
 
 GETTEXT_DEPS = ncurses_install libxml2_install
 
-gettext_install:
-	$(call embtk_install_pkg,gettext)
-	@test -e $(GETTEXT_BUILD_DIR)/.patchlibtool || \
-	$(MAKE) $(GETTEXT_BUILD_DIR)/.patchlibtool
 
-gettext_clean:
-	$(call embtk_cleanup_pkg,gettext)
+define embtk_postinstall_gettext
+	$(Q)test -e $(GETTEXT_BUILD_DIR)/.patchlibtool || \
+	$(MAKE) $(GETTEXT_BUILD_DIR)/.patchlibtool
+endef
 
 #FIXME: this should be fixed in gettext project
 $(GETTEXT_BUILD_DIR)/.patchlibtool:
@@ -89,9 +86,3 @@ GETTEXT_HOST_CONFIGURE_OPTS	:= --disable-java --disable-native-java	\
 	--disable-openmp --with-included-gettext --with-included-glib	\
 	--with-included-libcroco --with-included-libxml
 
-gettext_host_install:
-	$(call embtk_install_hostpkg,gettext_host)
-
-# common tagets
-download_gettext download_gettext_host:
-	$(call embtk_download_pkg,gettext)
diff --git a/packages/misc/glib/glib.mk b/packages/misc/glib/glib.mk
index 58f5555..8e1b002 100644
--- a/packages/misc/glib/glib.mk
+++ b/packages/misc/glib/glib.mk
@@ -47,15 +47,14 @@ GLIB_CONFIGURE_ENV	:= glib_cv_stack_grows=no			\
 			ac_cv_func_posix_getpwuid_r=yes			\
 			ac_cv_func_nonposix_getpwuid_r=no		\
 			ac_cv_func_posix_getgrgid_r=yes
-
 GLIB_CONFIGURE_OPTS	:= --disable-fam
 
 GLIB_DEPS		:= zlib_install gettext_install glib_host_install
 
-glib_install:
-	$(call embtk_install_pkg,glib)
-	@test -e $(GLIB_BUILD_DIR)/.patchlibtool || \
+define embtk_postinstall_glib
+	$(Q)test -e $(GLIB_BUILD_DIR)/.patchlibtool || \
 	$(MAKE) $(GLIB_BUILD_DIR)/.patchlibtool
+endef
 
 #FIXME: this should be fixed in glib2 project
 $(GLIB_BUILD_DIR)/.patchlibtool:
@@ -81,9 +80,6 @@ $(GLIB_BUILD_DIR)/.patchlibtool:
 	mv libgthread-2.0.la.new $(SYSROOT)/usr/$(LIBDIR)/libgthread-2.0.la
 	@touch $@
 
-glib_clean:
-	$(call embtk_cleanup_pkg,glib)
-
 #
 # glib for host
 #
@@ -103,11 +99,3 @@ GLIB_HOST_SET_RPATH		:= y
 GLIB_HOST_CONFIGURE_OPTS	:= --disable-fam
 GLIB_HOST_DEPS			:= gettext_host_install
 
-glib_host_install:
-	$(call embtk_install_hostpkg,glib_host)
-
-#
-# Common for target and host
-#
-download_glib download_glib_host:
-	$(call embtk_download_pkg,glib)
diff --git a/packages/misc/gperf/gperf.mk b/packages/misc/gperf/gperf.mk
index 2d98b3f..9c68cbd 100644
--- a/packages/misc/gperf/gperf.mk
+++ b/packages/misc/gperf/gperf.mk
@@ -24,10 +24,9 @@
 ################################################################################
 
 GPERF_NAME		:= gperf
-GPERF_VERSION		:= $(call embtk_get_pkgversion,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)
 GPERF_PACKAGE		:= gperf-$(GPERF_VERSION).tar.gz
 GPERF_SRC_DIR		:= $(PACKAGES_BUILD)/gperf-$(GPERF_VERSION)
 GPERF_BUILD_DIR		:= $(PACKAGES_BUILD)/gperf-$(GPERF_VERSION)
@@ -47,12 +46,6 @@ GPERF_CONFIGURE_OPTS	:=
 
 GPERF_DEPS :=
 
-gperf_install:
-	$(call embtk_install_pkg,GPERF)
-
-gperf_clean:
-	$(call embtk_cleanup_pkg,GPERF)
-
 #
 # gperf for for host
 #
@@ -62,16 +55,7 @@ GPERF_HOST_SITE		:= $(GPERF_SITE)
 GPERF_HOST_SITE_MIRROR1	:= $(GPERF_SITE_MIRROR1)
 GPERF_HOST_SITE_MIRROR2	:= $(GPERF_SITE_MIRROR2)
 GPERF_HOST_SITE_MIRROR3	:= $(GPERF_SITE_MIRROR3)
-GPERF_HOST_PATCH_SITE	:= $(GPERF_PATCH_SITE)
 GPERF_HOST_PACKAGE	:= $(GPERF_PACKAGE)
 GPERF_HOST_SRC_DIR	:= $(TOOLS_BUILD)/gperf-$(GPERF_VERSION)
 GPERF_HOST_BUILD_DIR	:= $(TOOLS_BUILD)/gperf-$(GPERF_VERSION)
 
-#
-# common targets
-#
-gperf_host_install:
-	$(call embtk_install_hostpkg,GPERF_HOST)
-
-download_gperf download_gperf_host:
-	$(call embtk_download_pkg,GPERF)
diff --git a/packages/misc/intltool/intltool.mk b/packages/misc/intltool/intltool.mk
index 6b54fdd..27e0b39 100644
--- a/packages/misc/intltool/intltool.mk
+++ b/packages/misc/intltool/intltool.mk
@@ -24,11 +24,10 @@
 ################################################################################
 
 INTLTOOL_NAME		:= intltool
-INTLTOOL_MAJOR_VERSION	:= $(call embtk_get_pkgversion,INTLTOOL_MAJOR)
-INTLTOOL_VERSION	:= $(call embtk_get_pkgversion,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)
 INTLTOOL_PACKAGE	:= intltool-$(INTLTOOL_VERSION).tar.bz2
 INTLTOOL_SRC_DIR	:= $(PACKAGES_BUILD)/intltool-$(INTLTOOL_VERSION)
 INTLTOOL_BUILD_DIR	:= $(PACKAGES_BUILD)/intltool-$(INTLTOOL_VERSION)
@@ -48,12 +47,6 @@ INTLTOOL_CONFIGURE_OPTS	:=
 
 INTLTOOL_DEPS :=
 
-intltool_install:
-	$(call embtk_install_pkg,INTLTOOL)
-
-intltool_clean:
-	$(call embtk_cleanup_pkg,INTLTOOL)
-
 #
 # intltool for host
 #
@@ -66,11 +59,3 @@ INTLTOOL_HOST_PACKAGE		:= $(INTLTOOL_PACKAGE)
 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)
-
-#
-# common targets
-#
-download_intltool download_intltool_host:
-	$(call embtk_download_pkg,INTLTOOL)
diff --git a/packages/misc/libxml/libxml.mk b/packages/misc/libxml/libxml.mk
index f8a38de..640ab15 100644
--- a/packages/misc/libxml/libxml.mk
+++ b/packages/misc/libxml/libxml.mk
@@ -24,10 +24,9 @@
 ################################################################################
 
 LIBXML2_NAME		:= libxml2
-LIBXML2_VERSION		:= $(call embtk_get_pkgversion,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)
 LIBXML2_PACKAGE		:= libxml2-$(LIBXML2_VERSION).tar.gz
 LIBXML2_SRC_DIR		:= $(PACKAGES_BUILD)/libxml2-$(LIBXML2_VERSION)
 LIBXML2_BUILD_DIR	:= $(PACKAGES_BUILD)/libxml2-$(LIBXML2_VERSION)
@@ -40,11 +39,3 @@ LIBXML2_PKGCONFIGS	= libxml*.pc
 
 LIBXML2_CONFIGURE_OPTS	:= --without-python
 
-libxml2_install:
-	$(call embtk_install_pkg,LIBXML2)
-
-download_libxml2:
-	$(call embtk_download_pkg,LIBXML2)
-
-libxml2_clean:
-	$(call embtk_cleanup_pkg,LIBXML2)
diff --git a/packages/misc/ncurses/ncurses.mk b/packages/misc/ncurses/ncurses.mk
index e65507b..eb961cf 100644
--- a/packages/misc/ncurses/ncurses.mk
+++ b/packages/misc/ncurses/ncurses.mk
@@ -23,14 +23,13 @@
 # \date         January 2010
 ################################################################################
 
-NCURSES_NAME := 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
-NCURSES_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/ncurses/$(NCURSES_VERSION)
-NCURSES_SRC_DIR := $(PACKAGES_BUILD)/ncurses-$(NCURSES_VERSION)
-NCURSES_BUILD_DIR := $(PACKAGES_BUILD)/ncurses-$(NCURSES_VERSION)
+NCURSES_NAME		:= 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
+NCURSES_SRC_DIR		:= $(PACKAGES_BUILD)/ncurses-$(NCURSES_VERSION)
+NCURSES_BUILD_DIR	:= $(PACKAGES_BUILD)/ncurses-$(NCURSES_VERSION)
 
 NCURSES_BINS = captoinfo clear infocmp infotocap ncurses5-config reset tic toe \
 		tput tset
@@ -50,19 +49,7 @@ NCURSES_CONFIGURE_OPTS	:= --disable-rpath --without-cxx-binding	\
 			--enable-termcap --without-progs		\
 			--program-prefix=""
 
-ncurses_install:
-	$(call embtk_install_pkg,NCURSES)
-	$(Q)$(MAKE) $(NCURSES_BUILD_DIR)/.special
-
-download_ncurses:
-	$(call embtk_download_pkg,NCURSES)
-
-ncurses_clean:
-	$(call embtk_cleanup_pkg,NCURSES)
-
-.PHONY: $(NCURSES_BUILD_DIR)/.special ncurses_clean
-
-$(NCURSES_BUILD_DIR)/.special:
+define embtk_postinstall_ncurses
 	$(Q)mkdir -p $(ROOTFS)/usr/share
 	$(Q)-cp -R $(SYSROOT)/usr/share/tabset $(ROOTFS)/usr/share/
-	@touch $@
+endef
diff --git a/packages/misc/tslib/tslib.mk b/packages/misc/tslib/tslib.mk
index 970a89b..b8727ad 100644
--- a/packages/misc/tslib/tslib.mk
+++ b/packages/misc/tslib/tslib.mk
@@ -24,10 +24,9 @@
 ################################################################################
 
 TSLIB_NAME		:= tslib
-TSLIB_VERSION		:= $(call embtk_get_pkgversion,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)
 TSLIB_PACKAGE		:= tslib-$(TSLIB_VERSION).tar.bz2
 TSLIB_SRC_DIR		:= $(PACKAGES_BUILD)/tslib-$(TSLIB_VERSION)
 TSLIB_BUILD_DIR		:= $(PACKAGES_BUILD)/tslib-$(TSLIB_VERSION)
@@ -40,18 +39,6 @@ TSLIB_PKGCONFIGS	= tslib*.pc
 
 TSLIB_DEPS =
 
-tslib_install:
-	$(call embtk_install_pkg,TSLIB)
-	$(Q)$(MAKE) $(TSLIB_BUILD_DIR)/.special
-
-download_tslib:
-	$(call embtk_download_pkg,TSLIB)
-
-tslib_clean:
-	$(call embtk_cleanup_pkg,TSLIB)
-
-.PHONY: $(TSLIB_BUILD_DIR)/.special
-
-$(TSLIB_BUILD_DIR)/.special:
+define embtk_postinstall_tslib
 	$(Q)-cp -R $(SYSROOT)/usr/$(LIBDIR)/ts $(ROOTFS)/usr/$(LIBDIR)/
-	@touch $@
+endef