Toolchain: massively convert to use generic macros and implicit rules

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

10 files changed, 20 insertions, 70 deletions

diff --git a/mk/binutils.mk b/mk/binutils.mk
index f98ef92..3bb703f 100644
--- a/mk/binutils.mk
+++ b/mk/binutils.mk
@@ -41,6 +41,3 @@ BINUTILS_PREFIX		:= $(TOOLS)
 
 binutils_install:
 	$(call embtk_install_hostpkg,binutils)
-
-download_binutils:
-	$(call embtk_download_pkg,binutils)
diff --git a/mk/ccache.mk b/mk/ccache.mk
index 502645f..688c9ba 100644
--- a/mk/ccache.mk
+++ b/mk/ccache.mk
@@ -48,6 +48,3 @@ CCACHE_PREFIX		:= $(CCACHE_HOST_DIR)
 
 ccache_install:
 	$(call embtk_install_hostpkg,ccache)
-
-download_ccache:
-	$(call embtk_download_pkg,ccache)
diff --git a/mk/fakeroot.mk b/mk/fakeroot.mk
index 185bc93..0130b79 100644
--- a/mk/fakeroot.mk
+++ b/mk/fakeroot.mk
@@ -25,10 +25,9 @@
 ################################################################################
 
 FAKEROOT_NAME		:= fakeroot
-FAKEROOT_VERSION	:= $(call embtk_get_pkgversion,FAKEROOT)
+FAKEROOT_VERSION	:= $(call embtk_get_pkgversion,fakeroot)
 FAKEROOT_SITE		:= http://ftp.debian.org/debian/pool/main/f/fakeroot
 FAKEROOT_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
-FAKEROOT_PATCH_SITE	:= ftp://ftp.embtoolkit.org/embtoolkit.org/fakeroot/$(FAKEROOT_VERSION)
 FAKEROOT_PACKAGE	:= fakeroot_$(FAKEROOT_VERSION).tar.gz
 FAKEROOT_SRC_DIR	:= $(TOOLS_BUILD)/fakeroot-$(FAKEROOT_VERSION)
 FAKEROOT_BUILD_DIR	:= $(TOOLS_BUILD)/fakeroot-build
@@ -39,7 +38,4 @@ FAKEROOT_ENV_FILE	:= $(EMBTK_ROOT)/.fakeroot.001
 export FAKEROOT_BIN FAKEROOT_ENV_FILE
 
 fakeroot_install:
-	$(call embtk_install_hostpkg,FAKEROOT)
-
-download_fakeroot:
-	$(call embtk_download_pkg,FAKEROOT)
+	$(call embtk_install_hostpkg,fakeroot)
diff --git a/mk/gcc.mk b/mk/gcc.mk
index 47a75a6..817c750 100644
--- a/mk/gcc.mk
+++ b/mk/gcc.mk
@@ -144,8 +144,3 @@ ifeq ($(CONFIG_EMBTK_64BITS_FS)$(CONFIG_EMBTK_CLIB_UCLIBC),yy)
 endif
 	$(Q)touch $@
 
-#
-# Common gcc targets
-#
-download_gcc download_gcc1 download_gcc2 download_gcc3:
-	$(call embtk_download_pkg,gcc)
diff --git a/mk/kernel-headers.mk b/mk/kernel-headers.mk
index 9ab2041..a0c869f 100644
--- a/mk/kernel-headers.mk
+++ b/mk/kernel-headers.mk
@@ -55,9 +55,6 @@ $(LINUX_BUILD_DIR)/.headers_installed: download_linux				\
 	INSTALL_HDR_PATH=$(HOSTTOOLS)/usr
 	$(Q)touch $@
 
-download_linux: 
-	$(call embtk_download_pkg,linux)
-
 $(LINUX_BUILD_DIR)/.decompressed:
 	$(call embtk_decompress_hostpkg,linux)
 
diff --git a/mk/libtool.mk b/mk/libtool.mk
index 0aa7943..c0c7323 100644
--- a/mk/libtool.mk
+++ b/mk/libtool.mk
@@ -24,10 +24,9 @@
 ################################################################################
 
 LIBTOOL_NAME		:= libtool
-LIBTOOL_VERSION		:= $(call embtk_get_pkgversion,LIBTOOL)
+LIBTOOL_VERSION		:= $(call embtk_get_pkgversion,libtool)
 LIBTOOL_SITE		:= http://ftp.gnu.org/gnu/libtool
 LIBTOOL_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
-LIBTOOL_PATCH_SITE	:= ftp://ftp.embtoolkit.org/embtoolkit.org/libtool/$(LIBTOOL_VERSION)
 LIBTOOL_PACKAGE		:= libtool-$(LIBTOOL_VERSION).tar.gz
 LIBTOOL_SRC_DIR		:= $(TOOLS_BUILD)/libtool-$(LIBTOOL_VERSION)
 LIBTOOL_BUILD_DIR	:= $(TOOLS_BUILD)/libtool-$(LIBTOOL_VERSION)
@@ -39,4 +38,4 @@ export LIBTOOL LIBTOOLIZE
 LIBTOOL_CONFIGURE_OPTS := --disable-ltdl-install
 
 libtool_install:
-	$(call embtk_install_hostpkg,LIBTOOL)
+	$(call embtk_install_hostpkg,libtool)
diff --git a/mk/m4.mk b/mk/m4.mk
index c4dd1ab..ffb59a2 100644
--- a/mk/m4.mk
+++ b/mk/m4.mk
@@ -24,10 +24,9 @@
 ################################################################################
 
 M4_NAME		:= m4
-M4_VERSION	:= $(call embtk_get_pkgversion,M4)
+M4_VERSION	:= $(call embtk_get_pkgversion,m4)
 M4_SITE		:= http://ftp.gnu.org/gnu/m4
 M4_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
-M4_PATCH_SITE	:= ftp://ftp.embtoolkit.org/embtoolkit.org/m4/$(M4_VERSION)
 M4_PACKAGE	:= m4-$(M4_VERSION).tar.bz2
 M4_SRC_DIR	:= $(TOOLS_BUILD)/m4-$(M4_VERSION)
 M4_BUILD_DIR	:= $(TOOLS_BUILD)/m4-$(M4_VERSION)
@@ -39,7 +38,4 @@ M4	:= $(M4_BIN)
 export M4
 
 m4_install:
-	$(call embtk_install_hostpkg,M4)
-
-download_m4:
-	$(call embtk_download_pkg,M4)
+	$(call embtk_install_hostpkg,m4)
diff --git a/mk/mtd-utils.mk b/mk/mtd-utils.mk
index 10dd73c..2cd38fa 100644
--- a/mk/mtd-utils.mk
+++ b/mk/mtd-utils.mk
@@ -53,9 +53,6 @@ MTDUTILS_MAKE_ENV	+= PATH=$(PATH):$(TOOLS)/bin CROSS=$(CROSS_COMPILE)
 mtdutils_install:
 	$(call embtk_makeinstall_pkg,mtdutils)
 
-mtdutils_clean:
-	$(call embtk_cleanup_pkg,mtdutils)
-
 #
 # mtd-utils for host development machine.
 #
@@ -65,7 +62,6 @@ MTDUTILS_HOST_SITE		:= $(MTDUTILS_SITE)
 MTDUTILS_HOST_SITE_MIRROR1	:= $(MTDUTILS_SITE_MIRROR1)
 MTDUTILS_SITE_MIRROR2		:= $(MTDUTILS_SITE_MIRROR2)
 MTDUTILS_HOST_SITE_MIRROR3	:= $(MTDUTILS_SITE_MIRROR3)
-MTDUTILS_HOST_PATCH_SITE	:= $(MTDUTILS_PATCH_SITE)
 MTDUTILS_HOST_PACKAGE		:= $(MTDUTILS_PACKAGE)
 MTDUTILS_HOST_SRC_DIR		:= $(TOOLS_BUILD)/mtd-utils-$(MTDUTILS_VERSION)
 MTDUTILS_HOST_BUILD_DIR		:= $(TOOLS_BUILD)/mtd-utils-$(MTDUTILS_VERSION)
@@ -80,12 +76,3 @@ MTDUTILS_HOST_MAKE_ENV	+= BUILDDIR=$(MTDUTILS_HOST_BUILD_DIR)
 
 mtdutils_host_install:
 	$(call embtk_makeinstall_hostpkg,mtdutils_host)
-
-mtdutils_host_clean:
-	$(call embtk_generic_msg,"Cleaning mtd-utils on host ...")
-
-#
-# Common for host and target.
-#
-download_mtdutils download_mtdutils_host:
-	$(call embtk_download_pkg,mtdutils)
diff --git a/mk/pkgconfig.mk b/mk/pkgconfig.mk
index 3ab70de..de38ce7 100644
--- a/mk/pkgconfig.mk
+++ b/mk/pkgconfig.mk
@@ -24,10 +24,9 @@
 ################################################################################
 
 PKGCONFIG_NAME		:= pkg-config
-PKGCONFIG_VERSION	:= $(call embtk_get_pkgversion,PKGCONFIG)
+PKGCONFIG_VERSION	:= $(call embtk_get_pkgversion,pkgconfig)
 PKGCONFIG_SITE		:= http://pkgconfig.freedesktop.org/releases
 PKGCONFIG_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
-PKGCONFIG_PATCH_SITE	:= ftp://ftp.embtoolkit.org/embtoolkit.org/pkgconfig/$(PKGCONFIG_VERSION)
 PKGCONFIG_PACKAGE	:= pkg-config-$(PKGCONFIG_VERSION).tar.gz
 PKGCONFIG_SRC_DIR	:= $(TOOLS_BUILD)/pkg-config-$(PKGCONFIG_VERSION)
 PKGCONFIG_BUILD_DIR	:= $(TOOLS_BUILD)/pkg-config-$(PKGCONFIG_VERSION)
@@ -44,7 +43,4 @@ PKGCONFIG_PREFIX	:= /usr
 PKGCONFIG_DESTDIR	:= $(HOSTTOOLS)
 
 pkgconfig_install:
-	$(call embtk_install_hostpkg,PKGCONFIG)
-
-download_pkgconfig:
-	$(call embtk_download_pkg,PKGCONFIG)
+	$(call embtk_install_hostpkg,pkgconfig)
diff --git a/mk/strace.mk b/mk/strace.mk
index ca9a34d..0f537b1 100644
--- a/mk/strace.mk
+++ b/mk/strace.mk
@@ -23,26 +23,16 @@
 # \date         August 2009
 ################################################################################
 
-STRACE_NAME := strace
-STRACE_VERSION:= $(call embtk_get_pkgversion,STRACE)
-STRACE_SITE:=http://downloads.sourceforge.net/project/strace/strace/$(STRACE_VERSION)
-STRACE_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
-STRACE_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/strace/$(STRACE_VERSION)
-STRACE_PACKAGE := strace-$(STRACE_VERSION).tar.bz2
-STRACE_SRC_DIR := $(PACKAGES_BUILD)/strace-$(STRACE_VERSION)
-STRACE_BUILD_DIR := $(PACKAGES_BUILD)/strace
+STRACE_NAME		:= strace
+STRACE_VERSION		:= $(call embtk_get_pkgversion,strace)
+STRACE_SITE		:= http://downloads.sourceforge.net/project/strace/strace/$(STRACE_VERSION)
+STRACE_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
+STRACE_PACKAGE		:= strace-$(STRACE_VERSION).tar.bz2
+STRACE_SRC_DIR		:= $(PACKAGES_BUILD)/strace-$(STRACE_VERSION)
+STRACE_BUILD_DIR	:= $(PACKAGES_BUILD)/strace
 
-STRACE_BINS = strace strace-graph
-STRACE_SBINS =
-STRACE_INCLUDES =
-STRACE_LIBS =
-STRACE_PKGCONFIGS =
-
-strace_install:
-	$(call embtk_install_pkg,STRACE)
-
-download_strace:
-	$(call embtk_download_pkg,STRACE)
-
-strace_clean:
-	$(call embtk_cleanup_pkg,STRACE)
+STRACE_BINS		:= strace strace-graph
+STRACE_SBINS		:=
+STRACE_INCLUDES		:=
+STRACE_LIBS		:=
+STRACE_PKGCONFIGS	:=