* changed host-* tools to use the corresponding definitions from

	  the origina files. See e2fsprogs for reference.


git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@6162 33e552b5-05e3-0310-8538-816dae2090ed

18 files changed, 81 insertions, 144 deletions

diff --git a/rules/host-apache2.make b/rules/host-apache2.make
index fdb42e833..e403fa7f5 100644
--- a/rules/host-apache2.make
+++ b/rules/host-apache2.make
@@ -17,7 +17,8 @@ HOST_PACKAGES-$(PTXCONF_HOST_APACHE2) += host-apache2
 #
 # Paths and names
 #
-HOST_APACHE2_DIR	= $(HOST_BUILDDIR)/$(APACHE2)
+HOST_APACHE2		= $(APACHE2)
+HOST_APACHE2_DIR	= $(HOST_BUILDDIR)/$(HOST_APACHE2)
 
 
 # ----------------------------------------------------------------------------
diff --git a/rules/host-checkinstall.make b/rules/host-checkinstall.make
index 66969c20f..8426f763f 100644
--- a/rules/host-checkinstall.make
+++ b/rules/host-checkinstall.make
@@ -2,7 +2,7 @@
 # $Id$
 #
 # Copyright (C) 2005 by Robert Schwebel
-#          
+#
 # See CREDITS for details about who has contributed to this project.
 #
 # For further information about the PTXdist project and license conditions
@@ -17,21 +17,16 @@ HOST_PACKAGES-$(PTXCONF_HOST_IMAGE_DEB) += host-checkinstall
 #
 # Paths and names
 #
-HOST_CHECKINSTALL_VERSION	= 1.6.0
-HOST_CHECKINSTALL		= checkinstall-$(HOST_CHECKINSTALL_VERSION)
-HOST_CHECKINSTALL_SUFFIX	= tgz
-HOST_CHECKINSTALL_URL		= http://checkinstall.izto.org/files/source/$(HOST_CHECKINSTALL).$(HOST_CHECKINSTALL_SUFFIX)
-HOST_CHECKINSTALL_SOURCE	= $(SRCDIR)/$(HOST_CHECKINSTALL).$(HOST_CHECKINSTALL_SUFFIX)
+HOST_CHECKINSTALL		= $(CHECKINSTALL)
 HOST_CHECKINSTALL_DIR		= $(HOST_BUILDDIR)/$(HOST_CHECKINSTALL)
 
-
 # ----------------------------------------------------------------------------
 # Get
 # ----------------------------------------------------------------------------
 
 host-checkinstall_get: $(STATEDIR)/host-checkinstall.get
 
-$(STATEDIR)/host-checkinstall.get: $(host-checkinstall_get_deps_default)
+$(STATEDIR)/host-checkinstall.get: $(STATEDIR)/checkinstall.get
 	@$(call targetinfo, $@)
 	@$(call touch, $@)
 
@@ -48,8 +43,8 @@ host-checkinstall_extract: $(STATEDIR)/host-checkinstall.extract
 $(STATEDIR)/host-checkinstall.extract: $(host-checkinstall_extract_deps_default)
 	@$(call targetinfo, $@)
 	@$(call clean, $(HOST_CHECKINSTALL_DIR))
-	@$(call extract, HOST_CHECKINSTALL, $(HOST_BUILDDIR))
-	@$(call patchin, HOST_CHECKINSTALL, $(HOST_CHECKINSTALL_DIR))
+	@$(call extract, CHECKINSTALL, $(HOST_BUILDDIR))
+	@$(call patchin, CHECKINSTALL, $(HOST_CHECKINSTALL_DIR))
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
diff --git a/rules/host-e2fsprogs.make b/rules/host-e2fsprogs.make
index 8e466de07..67a804d24 100644
--- a/rules/host-e2fsprogs.make
+++ b/rules/host-e2fsprogs.make
@@ -17,12 +17,8 @@ HOST_PACKAGES-$(PTXCONF_HOST_E2FSPROGS) += host-e2fsprogs
 #
 # Paths and names
 #
-HOST_E2FSPROGS_VERSION	=  $(E2FSPROGS_VERSION)
-HOST_E2FSPROGS		:= e2fsprogs-$(HOST_E2FSPROGS_VERSION)
-HOST_E2FSPROGS_SUFFIX	:= tar.gz
-HOST_E2FSPROGS_URL	:= $(PTXCONF_SETUP_SFMIRROR)/e2fsprogs/$(HOST_E2FSPROGS).$(HOST_E2FSPROGS_SUFFIX)
-HOST_E2FSPROGS_SOURCE	:= $(SRCDIR)/$(HOST_E2FSPROGS).$(HOST_E2FSPROGS_SUFFIX)
-HOST_E2FSPROGS_DIR	:= $(HOST_BUILDDIR)/$(HOST_E2FSPROGS)
+HOST_E2FSPROGS		= $(E2FSPROGS)
+HOST_E2FSPROGS_DIR	= $(HOST_BUILDDIR)/$(HOST_E2FSPROGS)
 
 
 # ----------------------------------------------------------------------------
@@ -31,7 +27,7 @@ HOST_E2FSPROGS_DIR	:= $(HOST_BUILDDIR)/$(HOST_E2FSPROGS)
 
 host-e2fsprogs_get:	$(STATEDIR)/host-e2fsprogs.get
 
-$(STATEDIR)/host-e2fsprogs.get:	$(host-e2fsprogs_get_deps_default)
+$(STATEDIR)/host-e2fsprogs.get:	$(STATEDIR)/e2fsprogs.get
 	@$(call targetinfo, $@)
 	@$(call touch, $@)
 
diff --git a/rules/host-flex254.make b/rules/host-flex254.make
index fa073612f..8d2822e29 100644
--- a/rules/host-flex254.make
+++ b/rules/host-flex254.make
@@ -2,7 +2,7 @@
 # $Id$
 #
 # Copyright (C) 2005 Ladislav Michl <ladis@linux-mips.org>
-#          
+#
 # See CREDITS for details about who has contributed to this project.
 #
 # For further information about the PTXdist project and license conditions
@@ -26,7 +26,7 @@ HOST_FLEX254_DIR	= $(HOST_BUILDDIR)/$(FLEX)
 
 host-flex254_get: $(STATEDIR)/host-flex254.get
 
-$(STATEDIR)/host-flex254.get: $(host-flex254_get_deps_default)
+$(STATEDIR)/host-flex254.get: $(STATE)/flex254.get
 	@$(call targetinfo, $@)
 	@$(call touch, $@)
 
diff --git a/rules/host-ipkg.make b/rules/host-ipkg.make
index 07ffc881b..6f972d165 100644
--- a/rules/host-ipkg.make
+++ b/rules/host-ipkg.make
@@ -2,7 +2,7 @@
 # $Id:$
 #
 # Copyright (C) 2005 by Robert Schwebel
-#          
+#
 # See CREDITS for details about who has contributed to this project.
 #
 # For further information about the PTXdist project and license conditions
@@ -18,13 +18,8 @@ HOST_PACKAGES-$(PTXCONF_HOST_IPKG) += host-ipkg
 # Paths and names
 #
 
-HOST_IPKG_VERSION	= 0.99.157
-HOST_IPKG		= ipkg-$(HOST_IPKG_VERSION)
-HOST_IPKG_SUFFIX	= tar.gz
-HOST_IPKG_URL		= http://handhelds.org/download/packages/ipkg/$(HOST_IPKG).$(HOST_IPKG_SUFFIX)
-HOST_IPKG_SOURCE	= $(SRCDIR)/$(HOST_IPKG).$(HOST_IPKG_SUFFIX)
-HOST_IPKG_DIR		= $(HOST_BUILDDIR)/$(HOST_IPKG)
-
+HOST_IPKG	= $(IPKG)
+HOST_IPKG_DIR	= $(HOST_BUILDDIR)/$(HOST_IPKG)
 
 # ----------------------------------------------------------------------------
 # Get
@@ -32,7 +27,7 @@ HOST_IPKG_DIR		= $(HOST_BUILDDIR)/$(HOST_IPKG)
 
 host-ipkg_get: $(STATEDIR)/host-ipkg.get
 
-$(STATEDIR)/host-ipkg.get: $(host-ipkg_get_deps_default)
+$(STATEDIR)/host-ipkg.get: $(STATEDIR)/ipkg.get
 	@$(call targetinfo, $@)
 	@$(call touch, $@)
 
@@ -42,11 +37,11 @@ $(STATEDIR)/host-ipkg.get: $(host-ipkg_get_deps_default)
 
 host-ipkg_extract: $(STATEDIR)/host-ipkg.extract
 
-$(STATEDIR)/host-ipkg.extract: $(host-ipkg_extract_deps_default)
+$(STATEDIR)/host-ipkg.extract: $(STATEDIR)/ipkg.get
 	@$(call targetinfo, $@)
 	@$(call clean, $(HOST_IPKG_DIR))
-	@$(call extract, HOST_IPKG, $(HOST_BUILDDIR))
-	@$(call patchin, HOST_IPKG, $(HOST_IPKG_DIR))
+	@$(call extract, IPKG, $(HOST_BUILDDIR))
+	@$(call patchin, IPKG, $(HOST_IPKG_DIR))
 
 	@$(call touch, $@)
 
diff --git a/rules/host-kaffe.make b/rules/host-kaffe.make
index ab456632b..5ea144557 100644
--- a/rules/host-kaffe.make
+++ b/rules/host-kaffe.make
@@ -19,12 +19,8 @@ HOST_PACKAGES-$(PTXCONF_HOST_KAFFE) += host-kaffe
 #
 # Paths and names
 #
-HOST_KAFFE_VERSION	:= 1.1.7
-HOST_KAFFE		:= kaffe-$(HOST_KAFFE_VERSION)
-HOST_KAFFE_SUFFIX	:= tar.bz2
-#HOST_KAFFE_URL		:= nfoiew/$(HOST_KAFFE).$(HOST_KAFFE_SUFFIX)
-HOST_KAFFE_SOURCE	:= $(SRCDIR)/$(HOST_KAFFE).$(HOST_KAFFE_SUFFIX)
-HOST_KAFFE_DIR		:= $(HOST_BUILDDIR)/$(HOST_KAFFE)
+HOST_KAFFE		= $(KAFFE)
+HOST_KAFFE_DIR		= $(HOST_BUILDDIR)/$(HOST_KAFFE)
 
 # ----------------------------------------------------------------------------
 # Get
@@ -35,7 +31,7 @@ host-kaffe_get: $(STATEDIR)/host-kaffe.get
 #
 # We are depending on the same packet than target's kaffe
 #
-$(STATEDIR)/host-kaffe.get: $(host-kaffe_get_deps_default) $(STATEDIR)/kaffe.get
+$(STATEDIR)/host-kaffe.get: $(STATEDIR)/kaffe.get
 	@$(call targetinfo, $@)
 	@$(call touch, $@)
 
@@ -48,8 +44,8 @@ host-kaffe_extract: $(STATEDIR)/host-kaffe.extract
 $(STATEDIR)/host-kaffe.extract: $(host-kaffe_extract_deps_default)
 	@$(call targetinfo, $@)
 	@$(call clean, $(HOST_KAFFE_DIR))
-	@$(call extract, HOST_KAFFE, $(HOST_BUILDDIR))
-	@$(call patchin, HOST_KAFFE, $(HOST_KAFFE_DIR))
+	@$(call extract, KAFFE, $(HOST_BUILDDIR))
+	@$(call patchin, KAFFE, $(HOST_KAFFE_DIR))
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
diff --git a/rules/host-mico.make b/rules/host-mico.make
index b927e6d5e..652a1f07d 100644
--- a/rules/host-mico.make
+++ b/rules/host-mico.make
@@ -17,21 +17,16 @@ HOST_PACKAGES-$(PTXCONF_HOST_MICO) += host-mico
 #
 # Paths and names
 #
-HOST_MICO_VERSION	= $(MICO_VERSION)
 HOST_MICO		= $(MICO)
-HOST_MICO_SUFFIX	= $(MICO_SUFFIX)
-HOST_MICO_URL		= $(MICO_URL)
-HOST_MICO_SOURCE	= $(SRCDIR)/$(HOST_MICO).$(HOST_MICO_SUFFIX)
 HOST_MICO_DIR		= $(HOST_BUILDDIR)/$(HOST_MICO)
 
-
 # ----------------------------------------------------------------------------
 # Get
 # ----------------------------------------------------------------------------
 
 host-mico_get: $(STATEDIR)/host-mico.get
 
-$(STATEDIR)/host-mico.get: $(host-mico_get_deps_default)
+$(STATEDIR)/host-mico.get: $(STATEDIR)/mico.get
 	@$(call targetinfo, $@)
 	@$(call touch, $@)
 
@@ -46,10 +41,10 @@ $(STATEDIR)/host-mico.extract: $(host-mico_extract_deps_default)
 	@$(call clean, $(HOST_MICO_DIR))
 	mkdir -p $(HOST_BUILDDIR)
 	tmpdir=`mktemp -d`; \
-	$(call extract, HOST_MICO, $$tmpdir) \
+	$(call extract, MICO, $$tmpdir) \
 	mv $$tmpdir/mico $(HOST_MICO_DIR); \
 	rm -fr $$tmpdir
-	@$(call patchin, HOST_MICO, $(HOST_MICO_DIR))
+	@$(call patchin, MICO, $(HOST_MICO_DIR))
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
diff --git a/rules/host-mknbi.make b/rules/host-mknbi.make
index b84f9b87d..d57bd9193 100644
--- a/rules/host-mknbi.make
+++ b/rules/host-mknbi.make
@@ -16,14 +16,8 @@ HOST_PACKAGES-$(PTXCONF_HOST_MKNBI) += host-mknbi
 #
 # Paths and names
 #
-HOST_MKNBI_VERSION		= 1.4.4
-HOST_MKNBI			= mknbi-$(HOST_MKNBI_VERSION)
-HOST_MKNBI_SUFFIX		= tar.gz
-HOST_MKNBI_URL		= $(PTXCONF_SETUP_SFMIRROR)/etherboot/$(HOST_MKNBI).$(HOST_MKNBI_SUFFIX)
-HOST_MKNBI_SOURCE		= $(SRCDIR)/$(HOST_MKNBI).$(HOST_MKNBI_SUFFIX)
-HOST_MKNBI_DIR		= $(HOST_BUILDDIR)/$(HOST_MKNBI)
-HOST_MKNBI_FLAGS 		= BUILD_ROOT=$(PTXCONF_PREFIX)
-
+HOST_MKNBI	= $(MKNBI)
+HOST_MKNBI_DIR	= $(HOST_BUILDDIR)/$(HOST_MKNBI)
 
 # ----------------------------------------------------------------------------
 # Get
@@ -31,14 +25,10 @@ HOST_MKNBI_FLAGS 		= BUILD_ROOT=$(PTXCONF_PREFIX)
 
 host-mknbi_get: $(STATEDIR)/host-mknbi.get
 
-$(STATEDIR)/host-mknbi.get: $(host-mknbi_get_deps_default)
+$(STATEDIR)/host-mknbi.get: $(STATEDIR)/mknbi.get
 	@$(call targetinfo, $@)
 	@$(call touch, $@)
 
-$(HOST_MKNBI_SOURCE):
-	@$(call targetinfo, $@)
-	@$(call get, HOST_MKNBI)
-
 # ----------------------------------------------------------------------------
 # Extract
 # ----------------------------------------------------------------------------
@@ -48,8 +38,8 @@ host-mknbi_extract: $(STATEDIR)/host-mknbi.extract
 $(STATEDIR)/host-mknbi.extract: $(host-mknbi_extract_deps_default)
 	@$(call targetinfo, $@)
 	@$(call clean, $(HOST_MKNBI_DIR))
-	@$(call extract, HOST_MKNBI, $(HOST_BUILDDIR))
-	@$(call patchin, HOST_MKNBI, $(HOST_MKNBI_DIR))
+	@$(call extract, MKNBI, $(HOST_BUILDDIR))
+	@$(call patchin, MKNBI, $(HOST_MKNBI_DIR))
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
diff --git a/rules/host-module-init-tools.make b/rules/host-module-init-tools.make
index 096963b23..30b7d33bd 100644
--- a/rules/host-module-init-tools.make
+++ b/rules/host-module-init-tools.make
@@ -2,7 +2,7 @@
 # $Id: kernel.make 2486 2005-04-19 12:18:08Z mkl $
 #
 # Copyright (C) 2005 Ladislav Michl <ladis@linux-mips.org>
-#          
+#
 # See CREDITS for details about who has contributed to this project.
 #
 # For further information about the PTXdist project and license conditions
@@ -17,9 +17,8 @@ HOST_PACKAGES-$(PTXCONF_HOST_MODULE_INIT_TOOLS) += host-module-init-tools
 #
 # Paths and names
 #
-HOST_MODULE_INIT_TOOLS_DIR		= $(HOST_BUILDDIR)/$(MODULE_INIT_TOOLS)
-
-
+HOST_MODULE_INIT_TOOLS		= $(MODULE_INIT_TOOLS)
+HOST_MODULE_INIT_TOOLS_DIR	= $(HOST_BUILDDIR)/$(HOST_MODULE_INIT_TOOLS)
 
 # ----------------------------------------------------------------------------
 # Get
@@ -28,11 +27,11 @@ HOST_MODULE_INIT_TOOLS_DIR		= $(HOST_BUILDDIR)/$(MODULE_INIT_TOOLS)
 host-module-init-tools_get: $(STATEDIR)/host-module-init-tools.get
 
 #
-# FIXME: This Package is probably totally broken - this dependency definition 
-#        is only a quick-fix to make it compile again. Please review this 
+# FIXME: This Package is probably totally broken - this dependency definition
+#        is only a quick-fix to make it compile again. Please review this
 #        makefile and make it a real cross- (?) or host- (?) package
 #
-host-module-init-tools_get_deps = $(host-module-init-tools_get_deps_default) $(STATEDIR)/module-init-tools.get
+host-module-init-tools_get_deps = $(STATEDIR)/module-init-tools.get
 
 $(STATEDIR)/host-module-init-tools.get: $(host-module-init-tools_get_deps)
 	@$(call targetinfo, $@)
@@ -57,7 +56,7 @@ $(STATEDIR)/host-module-init-tools.extract: $(host-module-init-tools_extract_dep
 
 host-module-init-tools_prepare: $(STATEDIR)/host-module-init-tools.prepare
 
-HOST_MODULE_INIT_TOOLS_PATH	= PATH=$(CROSS_PATH) 
+HOST_MODULE_INIT_TOOLS_PATH	= PATH=$(CROSS_PATH)
 HOST_MODULE_INIT_TOOLS_ENV 	= $(HOSTCC_ENV)
 HOST_MODULE_INIT_TOOLS_MAKEVARS	= MAN5=''
 HOST_MODULE_INIT_TOOLS_AUTOCONF = $(HOST_AUTOCONF)
diff --git a/rules/host-modutils.make b/rules/host-modutils.make
index f3a3a98b7..056d5f755 100644
--- a/rules/host-modutils.make
+++ b/rules/host-modutils.make
@@ -2,7 +2,7 @@
 # $Id$
 #
 # Copyright (C) 2003 by Marc Kleine-Budde <kleine-budde@gmx.de>
-#          
+#
 # See CREDITS for details about who has contributed to this project.
 #
 # For further information about the PTXdist project and license conditions
@@ -17,11 +17,7 @@ HOST_PACKAGES-$(PTXCONF_HOST_MODUTILS) += host-modutils
 #
 # Paths and names
 #
-HOST_MODUTILS_VERSION	= 2.4.27
-HOST_MODUTILS		= modutils-$(HOST_MODUTILS_VERSION)
-HOST_MODUTILS_SUFFIX	= tar.bz2
-HOST_MODUTILS_URL	= http://www.kernel.org/pub/linux/utils/kernel/modutils/v2.4/$(HOST_MODUTILS).$(HOST_MODUTILS_SUFFIX)
-HOST_MODUTILS_SOURCE	= $(SRCDIR)/$(HOST_MODUTILS).$(HOST_MODUTILS_SUFFIX)
+HOST_MODUTILS		= $(MODUTILS)
 HOST_MODUTILS_DIR	= $(HOST_BUILDDIR)/$(HOST_MODUTILS)
 
 
@@ -31,14 +27,10 @@ HOST_MODUTILS_DIR	= $(HOST_BUILDDIR)/$(HOST_MODUTILS)
 
 host-modutils_get: $(STATEDIR)/host-modutils.get
 
-$(STATEDIR)/host-modutils.get: $(host-modutils_get_deps_default)
+$(STATEDIR)/host-modutils.get: $(STATEDIR)/modutils.get
 	@$(call targetinfo, $@)
 	@$(call touch, $@)
 
-$(HOST_MODUTILS_SOURCE):
-	@$(call targetinfo, $@)
-	@$(call get, HOST_MODUTILS)
-
 # ----------------------------------------------------------------------------
 # Extract
 # ----------------------------------------------------------------------------
@@ -48,8 +40,8 @@ host-modutils_extract: $(STATEDIR)/host-modutils.extract
 $(STATEDIR)/host-modutils.extract: $(host-modutils_extract_deps_default)
 	@$(call targetinfo, $@)
 	@$(call clean, $(HOST_MODUTILS_DIR))
-	@$(call extract, HOST_MODUTILS, $(HOST_BUILDDIR))
-	@$(call patchin, HOST_MODUTILS, $(HOST_MODUTILS_DIR))
+	@$(call extract, MODUTILS, $(HOST_BUILDDIR))
+	@$(call patchin, MODUTILS, $(HOST_MODUTILS_DIR))
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
diff --git a/rules/host-mtd.make b/rules/host-mtd.make
index db989ceac..9f8cec6a3 100644
--- a/rules/host-mtd.make
+++ b/rules/host-mtd.make
@@ -2,7 +2,7 @@
 # $Id$
 #
 # Copyright (C) 2003 by Pengutronix e.K., Hildesheim, Germany
-#          
+#
 # See CREDITS for details about who has contributed to this project.
 #
 # For further information about the PTXdist project and license conditions
@@ -18,7 +18,6 @@ HOST_PACKAGES-$(PTXCONF_HOST_MTD) += host-mtd
 # Paths and names
 #
 HOST_MTD	= $(MTD_UTILS)
-HOST_MTD_SOURCE	= $(MTD_UTILS_SOURCE)
 HOST_MTD_DIR	= $(HOST_BUILDDIR)/$(HOST_MTD)
 
 
@@ -28,7 +27,7 @@ HOST_MTD_DIR	= $(HOST_BUILDDIR)/$(HOST_MTD)
 
 host-mtd_get: $(STATEDIR)/host-mtd.get
 
-$(STATEDIR)/host-mtd.get: $(host-mtd_get_deps_default) $(STATEDIR)/mtd.get
+$(STATEDIR)/host-mtd.get: $(STATEDIR)/mtd.get
 	@$(call targetinfo, $@)
 	@$(call touch, $@)
 
@@ -41,7 +40,7 @@ host-mtd_extract: $(STATEDIR)/host-mtd.extract
 $(STATEDIR)/host-mtd.extract: $(host-mtd_extract_deps_default)
 	@$(call targetinfo, $@)
 	@$(call clean, $(HOST_MTD_DIR))
-	@$(call extract, HOST_MTD, $(HOST_BUILDDIR))
+	@$(call extract, MTD, $(HOST_BUILDDIR))
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
diff --git a/rules/host-pelts.make b/rules/host-pelts.make
index 5553bc079..32e256f63 100644
--- a/rules/host-pelts.make
+++ b/rules/host-pelts.make
@@ -2,7 +2,7 @@
 # $Id$
 #
 # Copyright (C) 2006 by Robert Schwebel
-#          
+#
 # See CREDITS for details about who has contributed to this project.
 #
 # For further information about the PTXdist project and license conditions
@@ -19,12 +19,8 @@ HOST_PACKAGES-$(PTXCONF_HOST_PELTS) += host-pelts
 #
 # Paths and names
 #
-HOST_PELTS_VERSION	:= 1.0.6
-HOST_PELTS		:= pelts-$(HOST_PELTS_VERSION)
-HOST_PELTS_SUFFIX	:= tar.bz2
-HOST_PELTS_URL		:= http://www.pengutronix.de/software/pelts/download/v1/$(HOST_PELTS).$(HOST_PELTS_SUFFIX)
-HOST_PELTS_SOURCE	:= $(SRCDIR)/$(HOST_PELTS).$(HOST_PELTS_SUFFIX)
-HOST_PELTS_DIR		:= $(HOST_BUILDDIR)/$(HOST_PELTS)
+HOST_PELTS		= $(PELTS)
+HOST_PELTS_DIR		= $(HOST_BUILDDIR)/$(HOST_PELTS)
 
 # ----------------------------------------------------------------------------
 # Get
@@ -32,14 +28,10 @@ HOST_PELTS_DIR		:= $(HOST_BUILDDIR)/$(HOST_PELTS)
 
 host-pelts_get: $(STATEDIR)/host-pelts.get
 
-$(STATEDIR)/host-pelts.get: $(host-pelts_get_deps_default)
+$(STATEDIR)/host-pelts.get: $(STATEDIR)/pelts.get
 	@$(call targetinfo, $@)
 	@$(call touch, $@)
 
-$(HOST_PELTS_SOURCE):
-	@$(call targetinfo, $@)
-	@$(call get, HOST_PELTS)
-
 # ----------------------------------------------------------------------------
 # Extract
 # ----------------------------------------------------------------------------
@@ -49,7 +41,7 @@ host-pelts_extract: $(STATEDIR)/host-pelts.extract
 $(STATEDIR)/host-pelts.extract: $(host-pelts_extract_deps_default)
 	@$(call targetinfo, $@)
 	@$(call clean, $(HOST_PELTS_DIR))
-	@$(call extract, HOST_PELTS, $(HOST_BUILDDIR))
+	@$(call extract, PELTS, $(HOST_BUILDDIR))
 	@$(call patchin, HOST_PELTS, $(HOST_PELTS_DIR))
 	@$(call touch, $@)
 
diff --git a/rules/host-python24.make b/rules/host-python24.make
index e2f686dbb..4be7a677e 100644
--- a/rules/host-python24.make
+++ b/rules/host-python24.make
@@ -2,7 +2,7 @@
 # $Id$
 #
 # Copyright (C) 2006 by Robert Schwebel
-#          
+#
 # See CREDITS for details about who has contributed to this project.
 #
 # For further information about the PTXdist project and license conditions
@@ -17,7 +17,8 @@ HOST_PACKAGES-$(PTXCONF_HOST_PYTHON24) += host-python24
 #
 # Paths and names
 #
-HOST_PYTHON24_DIR	= $(HOST_BUILDDIR)/$(PYTHON24)
+HOST_PYTHON24		= $(PYTHON24)
+HOST_PYTHON24_DIR	= $(HOST_BUILDDIR)/$(HOST_PYTHON24)
 
 
 # ----------------------------------------------------------------------------
diff --git a/rules/host-qte.make b/rules/host-qte.make
index e7091e455..78d389cbc 100644
--- a/rules/host-qte.make
+++ b/rules/host-qte.make
@@ -2,7 +2,7 @@
 # $Id$
 #
 # Copyright (C) 2005 by Sascha Hauer
-#          
+#
 # See CREDITS for details about who has contributed to this project.
 #
 # For further information about the PTXdist project and license conditions
@@ -17,13 +17,8 @@ HOST_PACKAGES-$(PTXCONF_HOST_QTE) += host-qte
 #
 # Paths and names
 #
-HOST_QTE_VERSION	= 3.3.4
-HOST_QTE		= qt-embedded-free-$(HOST_QTE_VERSION)
-HOST_QTE_SUFFIX		= tar.gz
-HOST_QTE_URL		= ftp://ftp.trolltech.com/qt/source/$(HOST_QTE).$(HOST_QTE_SUFFIX)
-HOST_QTE_SOURCE		= $(SRCDIR)/$(HOST_QTE).$(HOST_QTE_SUFFIX)
-HOST_QTE_DIR		= $(HOST_BUILDDIR)/$(HOST_QTE)
-
+HOST_QTE	= $(QTE)
+HOST_QTE_DIR	= $(HOST_BUILDDIR)/$(HOST_QTE)
 
 # ----------------------------------------------------------------------------
 # Get
@@ -31,7 +26,7 @@ HOST_QTE_DIR		= $(HOST_BUILDDIR)/$(HOST_QTE)
 
 host-qte_get: $(STATEDIR)/host-qte.get
 
-$(STATEDIR)/host-qte.get: $(host-qte_get_deps_default_default)
+$(STATEDIR)/host-qte.get: $(STATEDIR)/qte.get
 	@$(call targetinfo, $@)
 	@$(call touch, $@)
 
@@ -44,8 +39,8 @@ host-qte_extract: $(STATEDIR)/host-qte.extract
 $(STATEDIR)/host-qte.extract: $(host-qte_extract_deps_default)
 	@$(call targetinfo, $@)
 	@$(call clean, $(HOST_QTE_DIR))
-	@$(call extract, HOST_QTE, $(HOST_BUILDDIR))
-	@$(call patchin, HOST_QTE, $(HOST_QTE_DIR))
+	@$(call extract, QTE, $(HOST_BUILDDIR))
+	@$(call patchin, QTE, $(HOST_QTE_DIR))
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
@@ -83,7 +78,7 @@ HOST_QTE_CONF := -prefix=$(PTXCONF_PREFIX) \
 	-no-thread \
 	-no-cups \
 	-no-stl \
-	-no-qvfb 
+	-no-qvfb
 
 $(STATEDIR)/host-qte.prepare: $(host-qte_prepare_deps_default)
 	@$(call targetinfo, $@)
diff --git a/rules/host-slirp.make b/rules/host-slirp.make
index 2229e3df8..247b515fc 100644
--- a/rules/host-slirp.make
+++ b/rules/host-slirp.make
@@ -2,7 +2,7 @@
 # $Id$
 #
 # Copyright (C) 2005 by Robert Schwebel
-#          
+#
 # See CREDITS for details about who has contributed to this project.
 #
 # For further information about the PTXdist project and license conditions
@@ -17,12 +17,8 @@ HOST_PACKAGES-$(PTXCONF_HOST_SLIRP) += host-slirp
 #
 # Paths and names
 #
-HOST_SLIRP_VERSION	= 1.0.16
-HOST_SLIRP		= slirp-$(HOST_SLIRP_VERSION)
-HOST_SLIRP_SUFFIX	= tar.gz
-HOST_SLIRP_URL		= $(PTXCONF_SETUP_SFMIRROR)/slirp/$(HOST_SLIRP).$(HOST_SLIRP_SUFFIX)
-HOST_SLIRP_SOURCE	= $(SRCDIR)/$(HOST_SLIRP).$(HOST_SLIRP_SUFFIX)
-HOST_SLIRP_DIR		= $(HOST_BUILDDIR)/$(HOST_SLIRP)
+HOST_SLIRP	= $(SLIRP)
+HOST_SLIRP_DIR	= $(HOST_BUILDDIR)/$(HOST_SLIRP)
 
 
 # ----------------------------------------------------------------------------
@@ -31,14 +27,10 @@ HOST_SLIRP_DIR		= $(HOST_BUILDDIR)/$(HOST_SLIRP)
 
 host-slirp_get: $(STATEDIR)/host-slirp.get
 
-$(STATEDIR)/host-slirp.get: $(host-slirp_get_deps_default)
+$(STATEDIR)/host-slirp.get: $(STATEDIR)/slirp.get
 	@$(call targetinfo, $@)
 	@$(call touch, $@)
 
-$(HOST_SLIRP_SOURCE):
-	@$(call targetinfo, $@)
-	@$(call get, HOST_SLIRP)
-
 # ----------------------------------------------------------------------------
 # Extract
 # ----------------------------------------------------------------------------
@@ -48,8 +40,8 @@ host-slirp_extract: $(STATEDIR)/host-slirp.extract
 $(STATEDIR)/host-slirp.extract: $(host-slirp_extract_deps_default)
 	@$(call targetinfo, $@)
 	@$(call clean, $(HOST_SLIRP_DIR))
-	@$(call extract, HOST_SLIRP, $(HOST_BUILDDIR))
-	@$(call patchin, HOST_SLIRP, $(HOST_SLIRP_DIR))
+	@$(call extract, SLIRP, $(HOST_BUILDDIR))
+	@$(call patchin, SLIRP, $(HOST_SLIRP_DIR))
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
diff --git a/rules/host-termcap.make b/rules/host-termcap.make
index fa56ca8b1..1010716bb 100644
--- a/rules/host-termcap.make
+++ b/rules/host-termcap.make
@@ -2,7 +2,7 @@
 # $Id$
 #
 # Copyright (C) 2005 by Robert Schwebel
-#          
+#
 # See CREDITS for details about who has contributed to this project.
 #
 # For further information about the PTXdist project and license conditions
@@ -17,10 +17,7 @@ HOST_PACKAGES-$(PTXCONF_HOST_TERMCAP) += host-termcap
 #
 # Paths and names
 #
-HOST_TERMCAP_VERSION	= 1.3.1
-HOST_TERMCAP		= termcap-$(HOST_TERMCAP_VERSION)
-HOST_TERMCAP_SUFFIX	= tar.gz
-HOST_TERMCAP_URL	= $(PTXCONF_SETUP_GNUMIRROR)/termcap/$(TERMCAP).$(TERMCAP_SUFFIX)
+HOST_TERMCAP		= $(TERMCAP)
 HOST_TERMCAP_DIR	= $(HOST_BUILDDIR)/$(HOST_TERMCAP)
 
 
@@ -30,7 +27,7 @@ HOST_TERMCAP_DIR	= $(HOST_BUILDDIR)/$(HOST_TERMCAP)
 
 host-termcap_get: $(STATEDIR)/host-termcap.get
 
-$(STATEDIR)/host-termcap.get: $(host-termcap_get_deps_default)
+$(STATEDIR)/host-termcap.get: $(STATEDIR)/termcap.get
 	@$(call targetinfo, $@)
 	@$(call touch, $@)
 
@@ -44,7 +41,7 @@ $(STATEDIR)/host-termcap.extract: $(host-termcap_extract_deps_default)
 	@$(call targetinfo, $@)
 	@$(call clean, $(HOST_TERMCAP_DIR))
 	@$(call extract, TERMCAP, $(HOST_BUILDDIR))
-	@$(call patchin, HOST_TERMCAP, $(HOST_TERMCAP_DIR))
+	@$(call patchin, TERMCAP, $(HOST_TERMCAP_DIR))
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
diff --git a/rules/host-util-linux.make b/rules/host-util-linux.make
index 6d20089ef..20703bf8f 100644
--- a/rules/host-util-linux.make
+++ b/rules/host-util-linux.make
@@ -2,7 +2,7 @@
 # $Id$
 #
 # Copyright (C) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
-#          
+#
 # See CREDITS for details about who has contributed to this project.
 #
 # For further information about the PTXdist project and license conditions
@@ -15,7 +15,8 @@
 
 HOST_PACKAGES-$(PTXCONF_HOST_UTIL_LINUX) += host-util-linux
 
-HOST_UTIL_LINUX_DIR	= $(HOST_BUILDDIR)/$(UTIL_LINUX)
+HOST_UTIL_LINUX		= $(UTIL_LINUX)
+HOST_UTIL_LINUX_DIR	= $(HOST_BUILDDIR)/$(HOST_UTIL_LINUX)
 
 
 # ----------------------------------------------------------------------------
diff --git a/rules/host-zlib.make b/rules/host-zlib.make
index 2ad4ff24f..003a12229 100644
--- a/rules/host-zlib.make
+++ b/rules/host-zlib.make
@@ -2,7 +2,7 @@
 # $Id$
 #
 # Copyright (C) 2002 by Pengutronix e.K., Hildesheim, Germany
-# See CREDITS for details about who has contributed to this project. 
+# See CREDITS for details about who has contributed to this project.
 #
 # For further information about the PTXdist project and license conditions
 # see the README file.
@@ -12,9 +12,10 @@
 HOST_PACKAGES-$(PTXCONF_HOST_ZLIB) += host-zlib
 
 #
-# Paths and names 
+# Paths and names
 #
-HOST_ZLIB_BUILDDIR	= $(HOST_BUILDDIR)/$(ZLIB)
+HOST_ZLIB		= $(ZLIB)
+HOST_ZLIB_BUILDDIR	= $(HOST_BUILDDIR)/$(HOST_ZLIB)
 
 
 # ----------------------------------------------------------------------------
@@ -23,7 +24,7 @@ HOST_ZLIB_BUILDDIR	= $(HOST_BUILDDIR)/$(ZLIB)
 
 host-zlib_get: $(STATEDIR)/host-zlib.get
 
-$(STATEDIR)/host-zlib.get: $(host_zlib_get_deps_default)
+$(STATEDIR)/host-zlib.get: $(STATEDIR)/zlib.get
 	@$(call targetinfo, $@)
 	@$(call touch, $@)
 
@@ -65,7 +66,7 @@ $(STATEDIR)/host-zlib.prepare: $(host_zlib_prepare_deps_default)
 
 host-zlib_compile: $(STATEDIR)/host-zlib.compile
 
-$(STATEDIR)/host-zlib.compile: $(host_zlib_compile_deps_default) 
+$(STATEDIR)/host-zlib.compile: $(host_zlib_compile_deps_default)
 	@$(call targetinfo, $@)
 	cd $(HOST_ZLIB_BUILDDIR) && make $(HOST_ZLIB_MAKEVARS)
 	@$(call touch, $@)