dependency cleanup

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

25 files changed, 88 insertions, 237 deletions

diff --git a/rules/apache.make b/rules/apache.make
index 9e5c739ac..de3fb32a1 100644
--- a/rules/apache.make
+++ b/rules/apache.make
@@ -33,9 +33,7 @@ APACHE_DIR		= $(BUILDDIR)/$(APACHE)
 
 apache_get: $(STATEDIR)/apache.get
 
-apache_get_deps = $(APACHE_SOURCE)
-
-$(STATEDIR)/apache.get: $(apache_get_deps)
+$(STATEDIR)/apache.get: $(APACHE_SOURCE)
 	@$(call targetinfo, $@)
 	@$(call get_patches, $(APACHE))
 	@$(call touch, $@)
@@ -50,9 +48,7 @@ $(APACHE_SOURCE):
 
 apache_extract: $(STATEDIR)/apache.extract
 
-apache_extract_deps = $(call deps_extract, APACHE)
-
-$(STATEDIR)/apache.extract: $(apache_extract_deps)
+$(STATEDIR)/apache.extract: $(apache_extract_deps_default)
 	@$(call targetinfo, $@)
 	@$(call clean, $(APACHE_DIR))
 	@$(call extract, $(APACHE_SOURCE))
@@ -65,11 +61,6 @@ $(STATEDIR)/apache.extract: $(apache_extract_deps)
 
 apache_prepare: $(STATEDIR)/apache.prepare
 
-#
-# dependencies
-#
-apache_prepare_deps = $(call deps_prepare, APACHE)
-
 APACHE_PATH = PATH=$(CROSS_PATH)
 APACHE_ENV = \
 	$(CROSS_ENV) \
@@ -94,7 +85,7 @@ APACHE_AUTOCONF = \
 	--disable-module=env \
 	--enable-module=so
 
-$(STATEDIR)/apache.prepare: $(apache_prepare_deps)
+$(STATEDIR)/apache.prepare: $(apache_prepare_deps_default)
 	@$(call targetinfo, $@)
 	@$(call clean, $(APACHE_DIR)/config.cache)
 	cd $(APACHE_DIR) && \
@@ -108,9 +99,7 @@ $(STATEDIR)/apache.prepare: $(apache_prepare_deps)
 
 apache_compile: $(STATEDIR)/apache.compile
 
-apache_compile_deps = $(call deps_compile, APACHE)
-
-$(STATEDIR)/apache.compile: $(apache_compile_deps)
+$(STATEDIR)/apache.compile: $(apache_compile_deps_default)
 	@$(call targetinfo, $@)
 	cd $(APACHE_DIR) && $(APACHE_ENV) $(APACHE_PATH) make
 	@$(call touch, $@)
@@ -121,9 +110,7 @@ $(STATEDIR)/apache.compile: $(apache_compile_deps)
 
 apache_install: $(STATEDIR)/apache.install
 
-apache_install_deps = $(call deps_install, APACHE)
-
-$(STATEDIR)/apache.install: $(apache_install_deps)
+$(STATEDIR)/apache.install: $(apache_install_deps_default)
 	@$(call targetinfo, $@)
 	@$(call install, APACHE)
 	@$(call touch, $@)
@@ -134,9 +121,7 @@ $(STATEDIR)/apache.install: $(apache_install_deps)
 
 apache_targetinstall: $(STATEDIR)/apache.targetinstall
 
-apache_tarbetinstall_deps = $(call deps_targetinstall, APACHE)
-
-$(STATEDIR)/apache.targetinstall: $(apache_targetinstall_deps)
+$(STATEDIR)/apache.targetinstall: $(apache_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
 	@$(call install_init,default)
diff --git a/rules/apache2.make b/rules/apache2.make
index bb69571b3..4bf37d549 100644
--- a/rules/apache2.make
+++ b/rules/apache2.make
@@ -32,9 +32,7 @@ APACHE2_DIR	= $(BUILDDIR)/$(APACHE2)
 
 apache2_get: $(STATEDIR)/apache2.get
 
-apache2_get_deps := $(APACHE2_SOURCE) 
-
-$(STATEDIR)/apache2.get: $(apache2_get_deps)
+$(STATEDIR)/apache2.get: $(APACHE2_SOURCE)
 	@$(call targetinfo, $@)
 	@$(call touch, $@)
 
@@ -48,9 +46,7 @@ $(APACHE2_SOURCE):
 
 apache2_extract: $(STATEDIR)/apache2.extract
 
-apache2_extract_deps := $(apache2_extract_deps_default)
-
-$(STATEDIR)/apache2.extract: $(apache2_extract_deps)
+$(STATEDIR)/apache2.extract: $(apache2_extract_deps_default)
 	@$(call targetinfo, $@)
 	@$(call clean, $(APACHE2_DIR))
 	@$(call extract, $(APACHE2_SOURCE))
@@ -63,8 +59,6 @@ $(STATEDIR)/apache2.extract: $(apache2_extract_deps)
 
 apache2_prepare: $(STATEDIR)/apache2.prepare
 
-apache2_prepare_deps := $(apache2_prepare_deps_default)
-
 APACHE2_PATH	=  PATH=$(CROSS_PATH)
 APACHE2_ENV 	=  $(CROSS_ENV)
 APACHE2_ENV	+= PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig
@@ -80,7 +74,7 @@ APACHE2_ENV	+= ac_cv_func_setpgrp_void=yes
 #
 APACHE2_AUTOCONF =  $(CROSS_AUTOCONF_USR)
 
-$(STATEDIR)/apache2.prepare: $(apache2_prepare_deps)
+$(STATEDIR)/apache2.prepare: $(apache2_prepare_deps_default)
 	@$(call targetinfo, $@)
 	@$(call clean, $(APACHE2_DIR)/config.cache)
 	cd $(APACHE2_DIR) && \
@@ -103,10 +97,7 @@ $(STATEDIR)/apache2.prepare: $(apache2_prepare_deps)
 
 apache2_compile: $(STATEDIR)/apache2.compile
 
-apache2_compile_deps := $(apache2_compile_deps_default)
-apache2_compile_deps += $(STATEDIR)/host-apache2.compile
-
-$(STATEDIR)/apache2.compile: $(apache2_compile_deps)
+$(STATEDIR)/apache2.compile: $(apache2_compile_deps_default)
 	@$(call targetinfo, $@)
 
 	#
@@ -137,9 +128,7 @@ $(STATEDIR)/apache2.compile: $(apache2_compile_deps)
 
 apache2_install: $(STATEDIR)/apache2.install
 
-apache2_install_deps := $(apache2_install_deps_default)
-
-$(STATEDIR)/apache2.install: $(apache2_install_deps)
+$(STATEDIR)/apache2.install: $(apache2_install_deps_default)
 	@$(call targetinfo, $@)
 	@$(call install, APACHE2)
 	@$(call touch, $@)
@@ -150,9 +139,7 @@ $(STATEDIR)/apache2.install: $(apache2_install_deps)
 
 apache2_targetinstall: $(STATEDIR)/apache2.targetinstall
 
-apache2_targetinstall_deps := $(apache2_targetinstall_deps_default)
-
-$(STATEDIR)/apache2.targetinstall: $(apache2_targetinstall_deps)
+$(STATEDIR)/apache2.targetinstall: $(apache2_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
 	@$(call install_init,default)
diff --git a/rules/at-spi.make b/rules/at-spi.make
index bffdaf958..e39cde36a 100644
--- a/rules/at-spi.make
+++ b/rules/at-spi.make
@@ -32,9 +32,7 @@ AT-SPI_DIR	= $(BUILDDIR)/$(AT-SPI)
 
 at-spi_get: $(STATEDIR)/at-spi.get
 
-at-spi_get_deps = $(AT-SPI_SOURCE)
-
-$(STATEDIR)/at-spi.get: $(at-spi_get_deps)
+$(STATEDIR)/at-spi.get: $(AT-SPI_SOURCE)
 	@$(call targetinfo, $@)
 	@$(call touch, $@)
 
@@ -48,9 +46,7 @@ $(AT-SPI_SOURCE):
 
 at-spi_extract: $(STATEDIR)/at-spi.extract
 
-at-spi_extract_deps = $(call deps_extract, AT-SPI)
-
-$(STATEDIR)/at-spi.extract: $(at-spi_extract_deps)
+$(STATEDIR)/at-spi.extract: $(at-spi_extract_deps_deps)
 	@$(call targetinfo, $@)
 	@$(call clean, $(AT-SPI_DIR))
 	@$(call extract, $(AT-SPI_SOURCE))
@@ -63,11 +59,6 @@ $(STATEDIR)/at-spi.extract: $(at-spi_extract_deps)
 
 at-spi_prepare: $(STATEDIR)/at-spi.prepare
 
-#
-# dependencies
-#
-at-spi_prepare_deps = $(call deps_prepare, AT-SPI)
-
 AT-SPI_PATH	=  PATH=$(CROSS_PATH)
 AT-SPI_ENV 	=  $(CROSS_ENV)
 #AT-SPI_ENV	+=
@@ -77,7 +68,7 @@ AT-SPI_ENV 	=  $(CROSS_ENV)
 #
 AT-SPI_AUTOCONF =  $(CROSS_AUTOCONF_USR)
 
-$(STATEDIR)/at-spi.prepare: $(at-spi_prepare_deps)
+$(STATEDIR)/at-spi.prepare: $(at-spi_prepare_deps_default)
 	@$(call targetinfo, $@)
 	@$(call clean, $(AT-SPI_DIR)/config.cache)
 	cd $(AT-SPI_DIR) && \
@@ -91,9 +82,7 @@ $(STATEDIR)/at-spi.prepare: $(at-spi_prepare_deps)
 
 at-spi_compile: $(STATEDIR)/at-spi.compile
 
-at-spi_compile_deps = $(call deps_compile, AT-SPI)
-
-$(STATEDIR)/at-spi.compile: $(at-spi_compile_deps)
+$(STATEDIR)/at-spi.compile: $(at-spi_compile_deps_default)
 	@$(call targetinfo, $@)
 	cd $(AT-SPI_DIR) && $(AT-SPI_PATH) make 
 	@$(call touch, $@)
@@ -104,9 +93,7 @@ $(STATEDIR)/at-spi.compile: $(at-spi_compile_deps)
 
 at-spi_install: $(STATEDIR)/at-spi.install
 
-at-spi_install_deps = $(call deps_install, AT-SPI)
-
-$(STATEDIR)/at-spi.install: $(at-spi_install_deps)
+$(STATEDIR)/at-spi.install: $(at-spi_install_deps_default)
 	@$(call targetinfo, $@)
 	@$(call install, AT-SPI)
 	@$(call touch, $@)
@@ -117,9 +104,7 @@ $(STATEDIR)/at-spi.install: $(at-spi_install_deps)
 
 at-spi_targetinstall: $(STATEDIR)/at-spi.targetinstall
 
-at-spi_targetinstall_deps = $(call deps_targetinstall, AT-SPI)
-
-$(STATEDIR)/at-spi.targetinstall: $(at-spi_targetinstall_deps)
+$(STATEDIR)/at-spi.targetinstall: $(at-spi_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 	# FIXME: something to add to the target for at-spi? 
 	@$(call touch, $@)
diff --git a/rules/atk124.make b/rules/atk124.make
index 86e078be7..57bdace52 100644
--- a/rules/atk124.make
+++ b/rules/atk124.make
@@ -34,9 +34,7 @@ ATK_LIB_VERSION	= 501.3
 
 atk_get: $(STATEDIR)/atk.get
 
-atk_get_deps	=  $(ATK_SOURCE)
-
-$(STATEDIR)/atk.get: $(atk_get_deps)
+$(STATEDIR)/atk.get: $(ATK_SOURCE)
 	@$(call targetinfo, $@)
 	@$(call touch, $@)
 
@@ -50,9 +48,7 @@ $(ATK_SOURCE):
 
 atk_extract: $(STATEDIR)/atk.extract
 
-atk_extract_deps = $(call deps_extract, ATK)
-
-$(STATEDIR)/atk.extract: $(atk_extract_deps)
+$(STATEDIR)/atk.extract: $(atk_extract_deps_default)
 	@$(call targetinfo, $@)
 	@$(call clean, $(ATK_DIR))
 	@$(call extract, $(ATK_SOURCE))
@@ -65,11 +61,6 @@ $(STATEDIR)/atk.extract: $(atk_extract_deps)
 
 atk_prepare: $(STATEDIR)/atk.prepare
 
-#
-# dependencies
-#
-atk_prepare_deps = $(call deps_prepare, ATK)
-
 ATK_PATH	=  PATH=$(CROSS_PATH)
 ATK_ENV 	=  $(CROSS_ENV)
 ATK_ENV		+= PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig/
@@ -79,7 +70,7 @@ ATK_ENV		+= PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig/
 #
 ATK_AUTOCONF	= $(CROSS_AUTOCONF_USR)
 
-$(STATEDIR)/atk.prepare: $(atk_prepare_deps)
+$(STATEDIR)/atk.prepare: $(atk_prepare_deps_default)
 	@$(call targetinfo, $@)
 	@$(call clean, $(ATK_BUILDDIR))
 	cd $(ATK_DIR) && \
@@ -93,9 +84,7 @@ $(STATEDIR)/atk.prepare: $(atk_prepare_deps)
 
 atk_compile: $(STATEDIR)/atk.compile
 
-atk_compile_deps = $(call deps_compile, ATK)
-
-$(STATEDIR)/atk.compile: $(atk_compile_deps)
+$(STATEDIR)/atk.compile: $(atk_compile_deps_default)
 	@$(call targetinfo, $@)
 	$(ATK_PATH) make -C $(ATK_DIR) 
 	@$(call touch, $@)
@@ -106,9 +95,7 @@ $(STATEDIR)/atk.compile: $(atk_compile_deps)
 
 atk_install: $(STATEDIR)/atk.install
 
-atk_install_deps = $(call deps_install, ATK)
-
-$(STATEDIR)/atk.install: $(atk_install_deps)
+$(STATEDIR)/atk.install: $(atk_install_deps_default)
 	@$(call targetinfo, $@)
 	@$(call install, ATK)
 	@$(call touch, $@)
@@ -119,9 +106,7 @@ $(STATEDIR)/atk.install: $(atk_install_deps)
 
 atk_targetinstall: $(STATEDIR)/atk.targetinstall
 
-atk_targetinstall_deps = $(call deps_targetinstall, ATK)
-
-$(STATEDIR)/atk.targetinstall: $(atk_targetinstall_deps)
+$(STATEDIR)/atk.targetinstall: $(atk_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
 	@$(call install_init,default)
diff --git a/rules/bash.make b/rules/bash.make
index 303765973..d439cf358 100644
--- a/rules/bash.make
+++ b/rules/bash.make
@@ -30,18 +30,10 @@ BASH_DIR		= $(BUILDDIR)/$(BASH)
 
 bash_get: $(STATEDIR)/bash.get
 
-bash_get_deps = \
-	$(BASH_SOURCE) \
-	$(STATEDIR)/bash-patches.get
-
-$(STATEDIR)/bash.get: $(bash_get_deps)
+$(STATEDIR)/bash.get: $(BASH_SOURCE)
 	@$(call targetinfo, $@)
 	@$(call touch, $@)
 
-$(STATEDIR)/bash-patches.get:
-	@$(call get_patches, $(BASH))
-	@$(call touch, $@)
-
 $(BASH_SOURCE):
 	@$(call targetinfo, $@)
 	@$(call get, $(BASH_URL))
@@ -52,9 +44,7 @@ $(BASH_SOURCE):
 
 bash_extract: $(STATEDIR)/bash.extract
 
-bash_extract_deps = $(call deps_extract, BASH)
-
-$(STATEDIR)/bash.extract: $(STATEDIR)/bash.get
+$(STATEDIR)/bash.extract: $(bash_extract_deps_default)
 	@$(call targetinfo, $@)
 	@$(call clean $(BASH_DIR))
 	@$(call extract, $(BASH_SOURCE))
@@ -67,8 +57,6 @@ $(STATEDIR)/bash.extract: $(STATEDIR)/bash.get
 
 bash_prepare: $(STATEDIR)/bash.prepare
 
-bash_prepare_deps = $(call deps_prepare, BASH)
-
 BASH_AUTOCONF	= $(CROSS_AUTOCONF_ROOT)
 BASH_AUTOCONF	+= --disable-sanity-checks
 BASH_PATH	=  PATH=$(CROSS_PATH)
@@ -198,7 +186,7 @@ BASH_AUTOCONF	+= --disable-static-link
 endif
 
 
-$(STATEDIR)/bash.prepare: $(bash_prepare_deps)
+$(STATEDIR)/bash.prepare: $(bash_prepare_deps_default)
 	@$(call targetinfo, $@)
 	cd $(BASH_DIR) && \
 		$(BASH_PATH) $(BASH_ENV) \
@@ -211,9 +199,7 @@ $(STATEDIR)/bash.prepare: $(bash_prepare_deps)
 
 bash_compile: $(STATEDIR)/bash.compile
 
-bash_compile_deps = $(call deps_compile, BASH)
-
-$(STATEDIR)/bash.compile: $(STATEDIR)/bash.prepare 
+$(STATEDIR)/bash.compile: $(bash_compile_deps_default) 
 	@$(call targetinfo, $@)
 	cd $(BASH_DIR) && $(BASH_PATH) make
 	@$(call touch, $@)
@@ -224,9 +210,7 @@ $(STATEDIR)/bash.compile: $(STATEDIR)/bash.prepare
 
 bash_install: $(STATEDIR)/bash.install
 
-bash_install_deps = $(call deps_install, BASH)
-
-$(STATEDIR)/bash.install: $(STATEDIR)/bash.compile
+$(STATEDIR)/bash.install: $(bash_install_deps_default)
 	@$(call targetinfo, $@)
 	#@$(call install, BASH)
 	@$(call touch, $@)
@@ -237,9 +221,7 @@ $(STATEDIR)/bash.install: $(STATEDIR)/bash.compile
 
 bash_targetinstall: $(STATEDIR)/bash.targetinstall
 
-bash_targetinstall_deps = $(call deps_targetinstall, BASH)
-
-$(STATEDIR)/bash.targetinstall: $(STATEDIR)/bash.compile
+$(STATEDIR)/bash.targetinstall: $(bash_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
 	@$(call install_init,default)
diff --git a/rules/betaftpd.make b/rules/betaftpd.make
index b7391834d..9e49c3bcf 100644
--- a/rules/betaftpd.make
+++ b/rules/betaftpd.make
@@ -32,9 +32,7 @@ BETAFTPD_DIR		= $(BUILDDIR)/$(BETAFTPD)
 
 betaftpd_get: $(STATEDIR)/betaftpd.get
 
-betaftpd_get_deps = $(BETAFTPD_SOURCE)
-
-$(STATEDIR)/betaftpd.get: $(betaftpd_get_deps)
+$(STATEDIR)/betaftpd.get: $(BETAFTPD_SOURCE)
 	@$(call targetinfo, $@)
 	@$(call get_patches, $(BETAFTPD))
 	@$(call touch, $@)
@@ -49,9 +47,7 @@ $(BETAFTPD_SOURCE):
 
 betaftpd_extract: $(STATEDIR)/betaftpd.extract
 
-betaftpd_extract_deps = $(call deps_extract, BETAFTPD)
-
-$(STATEDIR)/betaftpd.extract: $(betaftpd_extract_deps)
+$(STATEDIR)/betaftpd.extract: $(betaftpd_extract_deps_default)
 	@$(call targetinfo, $@)
 	@$(call clean, $(BETAFTPD_DIR))
 	@$(call extract, $(BETAFTPD_SOURCE))
@@ -64,11 +60,6 @@ $(STATEDIR)/betaftpd.extract: $(betaftpd_extract_deps)
 
 betaftpd_prepare: $(STATEDIR)/betaftpd.prepare
 
-#
-# dependencies
-#
-betaftpd_prepare_deps = $(call deps_prepare, BETAFTPD)
-
 BETAFTPD_PATH	=  PATH=$(CROSS_PATH)
 BETAFTPD_ENV 	=  $(CROSS_ENV)
 BETAFTPD_ENV	+= CFLAGS='$(CROSS_CPPFLAGS) $(CROSS_CFLAGS)'
@@ -78,7 +69,7 @@ BETAFTPD_ENV	+= CFLAGS='$(CROSS_CPPFLAGS) $(CROSS_CFLAGS)'
 #
 BETAFTPD_AUTOCONF =  $(CROSS_AUTOCONF_USR)
 
-$(STATEDIR)/betaftpd.prepare: $(betaftpd_prepare_deps)
+$(STATEDIR)/betaftpd.prepare: $(betaftpd_prepare_deps_default)
 	@$(call targetinfo, $@)
 	@$(call clean, $(BETAFTPD_DIR)/config.cache)
 	cd $(BETAFTPD_DIR) && \
@@ -92,9 +83,7 @@ $(STATEDIR)/betaftpd.prepare: $(betaftpd_prepare_deps)
 
 betaftpd_compile: $(STATEDIR)/betaftpd.compile
 
-betaftpd_compile_deps = $(call deps_compile, BETAFTPD)
-
-$(STATEDIR)/betaftpd.compile: $(betaftpd_compile_deps)
+$(STATEDIR)/betaftpd.compile: $(betaftpd_compile_deps_default)
 	@$(call targetinfo, $@)
 	cd $(BETAFTPD_DIR) && \
 		$(BETAFTPD_ENV) $(BETAFTPD_PATH) make $(BETAFTPD_MAKEVARS)
@@ -106,9 +95,7 @@ $(STATEDIR)/betaftpd.compile: $(betaftpd_compile_deps)
 
 betaftpd_install: $(STATEDIR)/betaftpd.install
 
-betaftpd_install_deps = $(call deps_install, BETAFTPD)
-
-$(STATEDIR)/betaftpd.install: $(betaftpd_install_deps)
+$(STATEDIR)/betaftpd.install: $(betaftpd_install_deps_default)
 	@$(call targetinfo, $@)
 	# RSC: FIXME: is it correct that we only install and do not targetinstall? 
 	@$(call install, BETAFTPD)
@@ -120,9 +107,7 @@ $(STATEDIR)/betaftpd.install: $(betaftpd_install_deps)
 
 betaftpd_targetinstall: $(STATEDIR)/betaftpd.targetinstall
 
-betaftpd_targetinstall_deps = $(call deps_targetinstall, BETAFTPD)
-
-$(STATEDIR)/betaftpd.targetinstall: $(betaftpd_targetinstall_deps)
+$(STATEDIR)/betaftpd.targetinstall: $(betaftpd_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 	@$(call touch, $@)
 
diff --git a/rules/bind.in b/rules/bind.in
index 9bbf4d945..283cc79ad 100644
--- a/rules/bind.in
+++ b/rules/bind.in
@@ -13,6 +13,7 @@ config BIND_CRYPTO
 	bool
 	prompt "enable DNSSEC"
 	depends BIND && OPENSSL
+	select OPENSSL
 
 config BIND_IPV6
 	bool
diff --git a/rules/bind.make b/rules/bind.make
index 0991ac7e1..2f7690854 100644
--- a/rules/bind.make
+++ b/rules/bind.make
@@ -32,9 +32,7 @@ BIND_DIR	= $(BUILDDIR)/$(BIND)
 
 bind_get: $(STATEDIR)/bind.get
 
-bind_get_deps = $(BIND_SOURCE)
-
-$(STATEDIR)/bind.get: $(bind_get_deps)
+$(STATEDIR)/bind.get: $(BIND_SOURCE)
 	@$(call targetinfo, $@)
 	@$(call touch, $@)
 
@@ -48,9 +46,7 @@ $(BIND_SOURCE):
 
 bind_extract: $(STATEDIR)/bind.extract
 
-bind_extract_deps = $(call deps_extract, BIND)
-
-$(STATEDIR)/bind.extract: $(bind_extract_deps)
+$(STATEDIR)/bind.extract: $(bind_extract_deps_default)
 	@$(call targetinfo, $@)
 	@$(call clean, $(BIND_DIR))
 	@$(call extract, $(BIND_SOURCE))
@@ -63,11 +59,6 @@ $(STATEDIR)/bind.extract: $(bind_extract_deps)
 
 bind_prepare: $(STATEDIR)/bind.prepare
 
-#
-# dependencies
-#
-bind_prepare_deps = $(call deps_prepare, BIND)
-
 BIND_PATH	=  PATH=$(CROSS_PATH)
 BIND_ENV 	=  $(CROSS_ENV)
 #BIND_ENV	+=
@@ -84,7 +75,6 @@ endif
 
 ifdef PTXCONF_BIND_CRYPTO
 BIND_AUTOCONF += --with-openssl=$(OPENSSL_DIR)
-bind_prepare_deps += $(STATEDIR)/openssl.install
 else
 BIND_AUTOCONF += --without-openssl
 endif
@@ -95,7 +85,7 @@ else
 BIND_AUTOCONF += --disable-ipv6
 endif
 
-$(STATEDIR)/bind.prepare: $(bind_prepare_deps)
+$(STATEDIR)/bind.prepare: $(bind_prepare_deps_default)
 	@$(call targetinfo, $@)
 	@$(call clean, $(BIND_DIR)/config.cache)
 	cd $(BIND_DIR) && \
@@ -109,9 +99,7 @@ $(STATEDIR)/bind.prepare: $(bind_prepare_deps)
 
 bind_compile: $(STATEDIR)/bind.compile
 
-bind_compile_deps = $(call deps_compile, BIND)
-
-$(STATEDIR)/bind.compile: $(bind_compile_deps)
+$(STATEDIR)/bind.compile: $(bind_compile_deps_default)
 	@$(call targetinfo, $@)
 	cd $(BIND_DIR) && \
 		$(BIND_PATH) $(BIND_ENV) make $(BIND_MAKEVARS)
@@ -123,9 +111,7 @@ $(STATEDIR)/bind.compile: $(bind_compile_deps)
 
 bind_install: $(STATEDIR)/bind.install
 
-bind_install_deps = $(call deps_install, BIND)
-
-$(STATEDIR)/bind.install: $(bind_install_deps)
+$(STATEDIR)/bind.install: $(bind_install_deps_default)
 	@$(call targetinfo, $@)
 	# FIXME: RSC: is it right that we only install and do not targetinstall? 
 	@$(call install, BIND)
@@ -137,9 +123,7 @@ $(STATEDIR)/bind.install: $(bind_install_deps)
 
 bind_targetinstall: $(STATEDIR)/bind.targetinstall
 
-bind_targetinstall_deps = $(call deps_targetinstall, BIND)
-
-$(STATEDIR)/bind.targetinstall: $(bind_targetinstall_deps)
+$(STATEDIR)/bind.targetinstall: $(bind_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 	@$(call touch, $@)
 
diff --git a/rules/bing.make b/rules/bing.make
index b12ccbfdd..bc65c271f 100644
--- a/rules/bing.make
+++ b/rules/bing.make
@@ -32,9 +32,7 @@ BING_DIR		= $(BUILDDIR)/$(BING)
 
 bing_get: $(STATEDIR)/bing.get
 
-bing_get_deps = $(BING_SOURCE)
-
-$(STATEDIR)/bing.get: $(bing_get_deps)
+$(STATEDIR)/bing.get: $(BING_SOURCE)
 	@$(call targetinfo, $@)
 	@$(call get_patches, $(BING))
 	@$(call touch, $@)
@@ -49,9 +47,7 @@ $(BING_SOURCE):
 
 bing_extract: $(STATEDIR)/bing.extract
 
-bing_extract_deps := $(bing_extract_deps_default)
-
-$(STATEDIR)/bing.extract: $(bing_extract_deps)
+$(STATEDIR)/bing.extract: $(bing_extract_deps_default)
 	@$(call targetinfo, $@)
 	@$(call clean, $(BING_DIR))
 	@$(call extract, $(BING_SOURCE))
@@ -64,15 +60,10 @@ $(STATEDIR)/bing.extract: $(bing_extract_deps)
 
 bing_prepare: $(STATEDIR)/bing.prepare
 
-#
-# dependencies
-#
-bing_prepare_deps := $(bing_prepare_deps_default)
-
 BING_PATH	=  PATH=$(CROSS_PATH)
 BING_ENV 	=  $(CROSS_ENV)
 
-$(STATEDIR)/bing.prepare: $(bing_prepare_deps)
+$(STATEDIR)/bing.prepare: $(bing_prepare_deps_default)
 	@$(call targetinfo, $@)
 	@$(call touch, $@)
 
@@ -82,9 +73,7 @@ $(STATEDIR)/bing.prepare: $(bing_prepare_deps)
 
 bing_compile: $(STATEDIR)/bing.compile
 
-bing_compile_deps := $(bing_compile_deps_default)
-
-$(STATEDIR)/bing.compile: $(bing_compile_deps)
+$(STATEDIR)/bing.compile: $(bing_compile_deps_default)
 	@$(call targetinfo, $@)
 	cd $(BING_DIR) && $(BING_ENV) $(BING_PATH) make bing
 	@$(call touch, $@)
@@ -95,9 +84,7 @@ $(STATEDIR)/bing.compile: $(bing_compile_deps)
 
 bing_install: $(STATEDIR)/bing.install
 
-bing_install_deps := $(bing_install_deps_default)
-
-$(STATEDIR)/bing.install: $(bing_install_deps)
+$(STATEDIR)/bing.install: $(bing_install_deps_default)
 	@$(call targetinfo, $@)
 	# FIXME
 	#@$(call install, BING)
@@ -109,9 +96,7 @@ $(STATEDIR)/bing.install: $(bing_install_deps)
 
 bing_targetinstall: $(STATEDIR)/bing.targetinstall
 
-bing_targetinstall_deps := $(bing_targetinstall_deps_default)
-
-$(STATEDIR)/bing.targetinstall: $(bing_targetinstall_deps)
+$(STATEDIR)/bing.targetinstall: $(bing_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
 	@$(call install_init,default)
diff --git a/rules/binutils.make b/rules/binutils.make
index ec2dcc8d3..4274f7377 100644
--- a/rules/binutils.make
+++ b/rules/binutils.make
@@ -29,19 +29,10 @@ BINUTILS_BUILDDIR	= $(BINUTILS_DIR)-build
 
 binutils_get: $(STATEDIR)/binutils.get
 
-binutils_get_deps = \
-	$(BINUTILS_SOURCE) \
-	$(STATEDIR)/binutils-patches.get
-
-$(STATEDIR)/binutils.get: $(binutils_get_deps)
+$(STATEDIR)/binutils.get: $(BINUTILS_SOURCE)
 	@$(call targetinfo, $@)
 	@$(call touch, $@)
 
-$(STATEDIR)/binutils-patches.get:
-	@$(call targetinfo, $@)
-	@$(call get_patches, $(BINUTILS))
-	@$(call touch, $@)
-
 $(BINUTILS_SOURCE):
 	@$(call targetinfo, $@)
 	@$(call get, $(BINUTILS_URL))
@@ -52,7 +43,7 @@ $(BINUTILS_SOURCE):
 
 binutils_extract: $(STATEDIR)/binutils.extract
 
-$(STATEDIR)/binutils.extract: $(STATEDIR)/binutils.get
+$(STATEDIR)/binutils.extract: $(binutils_extract_deps_default)
 	@$(call targetinfo, $@)
 	@$(call clean, $(BINUTILS_DIR))
 	@$(call extract, $(BINUTILS_SOURCE))
@@ -65,10 +56,6 @@ $(STATEDIR)/binutils.extract: $(STATEDIR)/binutils.get
 
 binutils_prepare: $(STATEDIR)/binutils.prepare
 
-binutils_prepare_deps = \
-	$(STATEDIR)/virtual-xchain.install \
-	$(STATEDIR)/binutils.extract
-
 BINUTILS_AUTOCONF =  $(CROSS_AUTOCONF_USR)
 BINUTILS_AUTOCONF += \
 	--target=$(PTXCONF_GNU_TARGET) \
@@ -82,7 +69,7 @@ BINUTILS_AUTOCONF += \
 BINUTILS_ENV	= $(CROSS_ENV)
 BINUTILS_PATH	= PATH=$(CROSS_PATH)
 
-$(STATEDIR)/binutils.prepare: $(binutils_prepare_deps)
+$(STATEDIR)/binutils.prepare: $(binutils_prepare_deps_default)
 	@$(call targetinfo, $@)
 	@$(call clean, $(BINUTILS_BUILDDIR))
 	mkdir -p $(BINUTILS_BUILDDIR)
@@ -96,7 +83,7 @@ $(STATEDIR)/binutils.prepare: $(binutils_prepare_deps)
 
 binutils_compile: $(STATEDIR)/binutils.compile
 
-$(STATEDIR)/binutils.compile: $(STATEDIR)/binutils.prepare 
+$(STATEDIR)/binutils.compile: $(binutils_compile_deps_default)
 	@$(call targetinfo, $@)
 #
 # the libiberty part is compiled for the host system
@@ -124,7 +111,7 @@ $(STATEDIR)/binutils.compile: $(STATEDIR)/binutils.prepare
 
 binutils_install: $(STATEDIR)/binutils.install
 
-$(STATEDIR)/binutils.install: $(STATEDIR)/binutils.compile
+$(STATEDIR)/binutils.install: $(binutils_install_deps_default)
 	@$(call targetinfo, $@)
 	# FIXME: 
 	#@$(call install, BINUTILS)
@@ -138,7 +125,7 @@ $(STATEDIR)/binutils.install: $(STATEDIR)/binutils.compile
 
 binutils_targetinstall: $(STATEDIR)/binutils.targetinstall
 
-$(STATEDIR)/binutils.targetinstall: $(STATEDIR)/binutils.install
+$(STATEDIR)/binutils.targetinstall: $(binutils_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
 	@$(call install_init,default)
diff --git a/rules/blackbox.make b/rules/blackbox.make
index cd89741ee..1fc256974 100644
--- a/rules/blackbox.make
+++ b/rules/blackbox.make
@@ -32,9 +32,7 @@ BLACKBOX_DIR		= $(BUILDDIR)/$(BLACKBOX)
 
 blackbox_get: $(STATEDIR)/blackbox.get
 
-blackbox_get_deps = $(BLACKBOX_SOURCE)
-
-$(STATEDIR)/blackbox.get: $(blackbox_get_deps)
+$(STATEDIR)/blackbox.get: $(BLACKBOX_SOURCE)
 	@$(call targetinfo, $@)
 	@$(call touch, $@)
 
@@ -48,9 +46,7 @@ $(BLACKBOX_SOURCE):
 
 blackbox_extract: $(STATEDIR)/blackbox.extract
 
-blackbox_extract_deps = $(call deps_extract, BLACKBOX)
-
-$(STATEDIR)/blackbox.extract: $(blackbox_extract_deps)
+$(STATEDIR)/blackbox.extract: $(blackbox_extract_deps_default)
 	@$(call targetinfo, $@)
 	@$(call clean, $(BLACKBOX_DIR))
 	@$(call extract, $(BLACKBOX_SOURCE))
@@ -62,14 +58,8 @@ $(STATEDIR)/blackbox.extract: $(blackbox_extract_deps)
 
 blackbox_prepare: $(STATEDIR)/blackbox.prepare
 
-#
-# dependencies
-#
-blackbox_prepare_deps = $(call deps_prepare, BLACKBOX)
-
 BLACKBOX_PATH	=  PATH=$(CROSS_PATH)
 BLACKBOX_ENV 	=  $(CROSS_ENV)
-#BLACKBOX_ENV	+=
 
 #
 # autoconf
@@ -97,9 +87,7 @@ $(STATEDIR)/blackbox.prepare: $(blackbox_prepare_deps)
 
 blackbox_compile: $(STATEDIR)/blackbox.compile
 
-blackbox_compile_deps = $(call deps_compile, BLACKBOX)
-
-$(STATEDIR)/blackbox.compile: $(blackbox_compile_deps)
+$(STATEDIR)/blackbox.compile: $(blackbox_compile_deps_default)
 	@$(call targetinfo, $@)
 	$(BLACKBOX_PATH) make -C $(BLACKBOX_DIR)
 	@$(call touch, $@)
@@ -110,9 +98,7 @@ $(STATEDIR)/blackbox.compile: $(blackbox_compile_deps)
 
 blackbox_install: $(STATEDIR)/blackbox.install
 
-blackbox_install_deps = $(call deps_install, BLACKBOX)
-
-$(STATEDIR)/blackbox.install: $(blackbox_install_deps)
+$(STATEDIR)/blackbox.install: $(blackbox_install_deps_default)
 	@$(call targetinfo, $@)
 	@$(call install, BLACKBOX)
 	@$(call touch, $@)
@@ -123,9 +109,7 @@ $(STATEDIR)/blackbox.install: $(blackbox_install_deps)
 
 blackbox_targetinstall: $(STATEDIR)/blackbox.targetinstall
 
-blackbox_targetinstall_deps = $(call deps_targetinstall, BLACKBOX)
-
-$(STATEDIR)/blackbox.targetinstall: $(blackbox_targetinstall_deps)
+$(STATEDIR)/blackbox.targetinstall: $(blackbox_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
 	@$(call install_init,default)
diff --git a/rules/fbtest.dep b/rules/fbtest.dep
index b790be13c..c8dd1c778 100644
--- a/rules/fbtest.dep
+++ b/rules/fbtest.dep
@@ -3,7 +3,7 @@
 # Package: fbtest
 # 
 fbtest_extract_deps_default = $(STATEDIR)/fbtest.get
-fbtest_prepare_deps_default = $(STATEDIR)/fbtest.extract $(STATEDIR)/virtual-xchain.install
+fbtest_prepare_deps_default = $(STATEDIR)/fbtest.extract $(STATEDIR)/libnetpbm.install $(STATEDIR)/virtual-xchain.install
 fbtest_compile_deps_default = $(STATEDIR)/fbtest.prepare
 fbtest_install_deps_default = $(STATEDIR)/fbtest.compile
-fbtest_targetinstall_deps_default =  $(STATEDIR)/fbtest.compile
+fbtest_targetinstall_deps_default =  $(STATEDIR)/libnetpbm.targetinstall $(STATEDIR)/fbtest.compile
diff --git a/rules/flash.dep b/rules/flash.dep
index a4f9b0597..2d9d1f4e4 100644
--- a/rules/flash.dep
+++ b/rules/flash.dep
@@ -3,7 +3,7 @@
 # Package: flash
 # 
 flash_extract_deps_default = $(STATEDIR)/flash.get
-flash_prepare_deps_default = $(STATEDIR)/flash.extract $(STATEDIR)/virtual-xchain.install
+flash_prepare_deps_default = $(STATEDIR)/flash.extract $(STATEDIR)/ncurses.install $(STATEDIR)/virtual-xchain.install
 flash_compile_deps_default = $(STATEDIR)/flash.prepare
 flash_install_deps_default = $(STATEDIR)/flash.compile
-flash_targetinstall_deps_default =  $(STATEDIR)/flash.compile
+flash_targetinstall_deps_default =  $(STATEDIR)/ncurses.targetinstall $(STATEDIR)/flash.compile
diff --git a/rules/gnuplot.dep b/rules/gnuplot.dep
index d69b91c3d..3e076a96d 100644
--- a/rules/gnuplot.dep
+++ b/rules/gnuplot.dep
@@ -3,7 +3,7 @@
 # Package: gnuplot
 # 
 gnuplot_extract_deps_default = $(STATEDIR)/gnuplot.get
-gnuplot_prepare_deps_default = $(STATEDIR)/gnuplot.extract $(STATEDIR)/virtual-xchain.install
+gnuplot_prepare_deps_default = $(STATEDIR)/gnuplot.extract $(STATEDIR)/zlib.install $(STATEDIR)/virtual-xchain.install
 gnuplot_compile_deps_default = $(STATEDIR)/gnuplot.prepare
 gnuplot_install_deps_default = $(STATEDIR)/gnuplot.compile
-gnuplot_targetinstall_deps_default =  $(STATEDIR)/gnuplot.compile
+gnuplot_targetinstall_deps_default =  $(STATEDIR)/zlib.targetinstall $(STATEDIR)/gnuplot.compile
diff --git a/rules/grub.in b/rules/grub.in
index c3c9ef6e4..63e68b455 100644
--- a/rules/grub.in
+++ b/rules/grub.in
@@ -73,4 +73,5 @@ config GRUB_RTL8139
 	prompt "Realtek  network driver"
 	depends on GRUB
 
-source "rules/bootdisk.in"
+# FIXME
+# source "rules/bootdisk.in"
diff --git a/rules/hexedit.dep b/rules/hexedit.dep
index 0bd73a6bf..31d607041 100644
--- a/rules/hexedit.dep
+++ b/rules/hexedit.dep
@@ -3,7 +3,7 @@
 # Package: hexedit
 # 
 hexedit_extract_deps_default = $(STATEDIR)/hexedit.get
-hexedit_prepare_deps_default = $(STATEDIR)/hexedit.extract $(STATEDIR)/virtual-xchain.install
+hexedit_prepare_deps_default = $(STATEDIR)/hexedit.extract $(STATEDIR)/ncurses.install $(STATEDIR)/virtual-xchain.install
 hexedit_compile_deps_default = $(STATEDIR)/hexedit.prepare
 hexedit_install_deps_default = $(STATEDIR)/hexedit.compile
-hexedit_targetinstall_deps_default =  $(STATEDIR)/hexedit.compile
+hexedit_targetinstall_deps_default =  $(STATEDIR)/ncurses.targetinstall $(STATEDIR)/hexedit.compile
diff --git a/rules/libgsloop.dep b/rules/libgsloop.dep
index 0440e8c10..4b2bc54b4 100644
--- a/rules/libgsloop.dep
+++ b/rules/libgsloop.dep
@@ -3,7 +3,7 @@
 # Package: libgsloop
 # 
 libgsloop_extract_deps_default = $(STATEDIR)/libgsloop.get
-libgsloop_prepare_deps_default = $(STATEDIR)/libgsloop.extract $(STATEDIR)/virtual-xchain.install
+libgsloop_prepare_deps_default = $(STATEDIR)/libgsloop.extract $(STATEDIR)/librn.install $(STATEDIR)/virtual-xchain.install
 libgsloop_compile_deps_default = $(STATEDIR)/libgsloop.prepare
 libgsloop_install_deps_default = $(STATEDIR)/libgsloop.compile
-libgsloop_targetinstall_deps_default =  $(STATEDIR)/libgsloop.compile
+libgsloop_targetinstall_deps_default =  $(STATEDIR)/librn.targetinstall $(STATEDIR)/libgsloop.compile
diff --git a/rules/libpv.dep b/rules/libpv.dep
index 3da72ec69..d770d8935 100644
--- a/rules/libpv.dep
+++ b/rules/libpv.dep
@@ -3,7 +3,7 @@
 # Package: libpv
 # 
 libpv_extract_deps_default = $(STATEDIR)/libpv.get
-libpv_prepare_deps_default = $(STATEDIR)/libpv.extract $(STATEDIR)/virtual-xchain.install
+libpv_prepare_deps_default = $(STATEDIR)/libpv.extract $(STATEDIR)/liblist.install $(STATEDIR)/libxmlconfig.install $(STATEDIR)/virtual-xchain.install
 libpv_compile_deps_default = $(STATEDIR)/libpv.prepare
 libpv_install_deps_default = $(STATEDIR)/libpv.compile
-libpv_targetinstall_deps_default =  $(STATEDIR)/libpv.compile
+libpv_targetinstall_deps_default =  $(STATEDIR)/liblist.targetinstall $(STATEDIR)/libxmlconfig.targetinstall $(STATEDIR)/libpv.compile
diff --git a/rules/libxmlconfig.dep b/rules/libxmlconfig.dep
index a10bae67f..753d09d8b 100644
--- a/rules/libxmlconfig.dep
+++ b/rules/libxmlconfig.dep
@@ -3,7 +3,7 @@
 # Package: libxmlconfig
 # 
 libxmlconfig_extract_deps_default = $(STATEDIR)/libxmlconfig.get
-libxmlconfig_prepare_deps_default = $(STATEDIR)/libxmlconfig.extract $(STATEDIR)/virtual-xchain.install
+libxmlconfig_prepare_deps_default = $(STATEDIR)/libxmlconfig.extract $(STATEDIR)/libxml2.install $(STATEDIR)/virtual-xchain.install
 libxmlconfig_compile_deps_default = $(STATEDIR)/libxmlconfig.prepare
 libxmlconfig_install_deps_default = $(STATEDIR)/libxmlconfig.compile
-libxmlconfig_targetinstall_deps_default =  $(STATEDIR)/libxmlconfig.compile
+libxmlconfig_targetinstall_deps_default =  $(STATEDIR)/libxml2.targetinstall $(STATEDIR)/libxmlconfig.compile
diff --git a/rules/libxslt.dep b/rules/libxslt.dep
index effd762d2..f080ffdd3 100644
--- a/rules/libxslt.dep
+++ b/rules/libxslt.dep
@@ -3,7 +3,7 @@
 # Package: libxslt
 # 
 libxslt_extract_deps_default = $(STATEDIR)/libxslt.get
-libxslt_prepare_deps_default = $(STATEDIR)/libxslt.extract $(STATEDIR)/virtual-xchain.install
+libxslt_prepare_deps_default = $(STATEDIR)/libxslt.extract $(STATEDIR)/libxml2.install $(STATEDIR)/virtual-xchain.install
 libxslt_compile_deps_default = $(STATEDIR)/libxslt.prepare
 libxslt_install_deps_default = $(STATEDIR)/libxslt.compile
-libxslt_targetinstall_deps_default =  $(STATEDIR)/libxslt.compile
+libxslt_targetinstall_deps_default =  $(STATEDIR)/libxml2.targetinstall $(STATEDIR)/libxslt.compile
diff --git a/rules/memedit.dep b/rules/memedit.dep
index 79dd9c9df..c631037da 100644
--- a/rules/memedit.dep
+++ b/rules/memedit.dep
@@ -3,7 +3,7 @@
 # Package: memedit
 # 
 memedit_extract_deps_default = $(STATEDIR)/memedit.get
-memedit_prepare_deps_default = $(STATEDIR)/memedit.extract $(STATEDIR)/virtual-xchain.install
+memedit_prepare_deps_default = $(STATEDIR)/memedit.extract $(STATEDIR)/readline.install $(STATEDIR)/virtual-xchain.install
 memedit_compile_deps_default = $(STATEDIR)/memedit.prepare
 memedit_install_deps_default = $(STATEDIR)/memedit.compile
-memedit_targetinstall_deps_default =  $(STATEDIR)/memedit.compile
+memedit_targetinstall_deps_default =  $(STATEDIR)/readline.targetinstall $(STATEDIR)/memedit.compile
diff --git a/rules/pnet.dep b/rules/pnet.dep
index 8b5b345bb..79e901c3b 100644
--- a/rules/pnet.dep
+++ b/rules/pnet.dep
@@ -3,7 +3,7 @@
 # Package: pnet
 # 
 pnet_extract_deps_default = $(STATEDIR)/pnet.get
-pnet_prepare_deps_default = $(STATEDIR)/pnet.extract $(STATEDIR)/virtual-xchain.install
+pnet_prepare_deps_default = $(STATEDIR)/pnet.extract $(STATEDIR)/treecc.install $(STATEDIR)/virtual-xchain.install
 pnet_compile_deps_default = $(STATEDIR)/pnet.prepare
 pnet_install_deps_default = $(STATEDIR)/pnet.compile
-pnet_targetinstall_deps_default =  $(STATEDIR)/pnet.compile
+pnet_targetinstall_deps_default =  $(STATEDIR)/treecc.targetinstall $(STATEDIR)/pnet.compile
diff --git a/rules/pnetlib.dep b/rules/pnetlib.dep
index 9f7af3428..4408eb728 100644
--- a/rules/pnetlib.dep
+++ b/rules/pnetlib.dep
@@ -3,7 +3,7 @@
 # Package: pnetlib
 # 
 pnetlib_extract_deps_default = $(STATEDIR)/pnetlib.get
-pnetlib_prepare_deps_default = $(STATEDIR)/pnetlib.extract $(STATEDIR)/virtual-xchain.install
+pnetlib_prepare_deps_default = $(STATEDIR)/pnetlib.extract $(STATEDIR)/pnet.install $(STATEDIR)/virtual-xchain.install
 pnetlib_compile_deps_default = $(STATEDIR)/pnetlib.prepare
 pnetlib_install_deps_default = $(STATEDIR)/pnetlib.compile
-pnetlib_targetinstall_deps_default =  $(STATEDIR)/pnetlib.compile
+pnetlib_targetinstall_deps_default =  $(STATEDIR)/pnet.targetinstall $(STATEDIR)/pnetlib.compile
diff --git a/rules/pop3spam.dep b/rules/pop3spam.dep
index c4ca121bb..cb3e5a234 100644
--- a/rules/pop3spam.dep
+++ b/rules/pop3spam.dep
@@ -3,7 +3,7 @@
 # Package: pop3spam
 # 
 pop3spam_extract_deps_default = $(STATEDIR)/pop3spam.get
-pop3spam_prepare_deps_default = $(STATEDIR)/pop3spam.extract $(STATEDIR)/virtual-xchain.install
+pop3spam_prepare_deps_default = $(STATEDIR)/pop3spam.extract $(STATEDIR)/pcre.install $(STATEDIR)/virtual-xchain.install
 pop3spam_compile_deps_default = $(STATEDIR)/pop3spam.prepare
 pop3spam_install_deps_default = $(STATEDIR)/pop3spam.compile
-pop3spam_targetinstall_deps_default =  $(STATEDIR)/pop3spam.compile
+pop3spam_targetinstall_deps_default =  $(STATEDIR)/pcre.targetinstall $(STATEDIR)/pop3spam.compile
diff --git a/rules/readline.dep b/rules/readline.dep
index b40903d49..714875c5f 100644
--- a/rules/readline.dep
+++ b/rules/readline.dep
@@ -3,7 +3,7 @@
 # Package: readline
 # 
 readline_extract_deps_default = $(STATEDIR)/readline.get
-readline_prepare_deps_default = $(STATEDIR)/readline.extract $(STATEDIR)/virtual-xchain.install
+readline_prepare_deps_default = $(STATEDIR)/readline.extract $(STATEDIR)/ncurses.install $(STATEDIR)/gcclibs.install $(STATEDIR)/virtual-xchain.install
 readline_compile_deps_default = $(STATEDIR)/readline.prepare
 readline_install_deps_default = $(STATEDIR)/readline.compile
-readline_targetinstall_deps_default =  $(STATEDIR)/readline.compile
+readline_targetinstall_deps_default =  $(STATEDIR)/ncurses.targetinstall $(STATEDIR)/gcclibs.targetinstall $(STATEDIR)/readline.compile