fixup dependencies

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

7 files changed, 38 insertions, 117 deletions

diff --git a/rules/gail.make b/rules/gail.make
index dc8466e25..99b2666e6 100644
--- a/rules/gail.make
+++ b/rules/gail.make
@@ -32,9 +32,7 @@ GAIL_DIR	= $(BUILDDIR)/$(GAIL)
 
 gail_get: $(STATEDIR)/gail.get
 
-gail_get_deps = $(GAIL_SOURCE)
-
-$(STATEDIR)/gail.get: $(gail_get_deps)
+$(STATEDIR)/gail.get: $(GAIL_SOURCE)
 	@$(call targetinfo, $@)
 	@$(call touch, $@)
 
@@ -48,9 +46,7 @@ $(GAIL_SOURCE):
 
 gail_extract: $(STATEDIR)/gail.extract
 
-gail_extract_deps = $(STATEDIR)/gail.get
-
-$(STATEDIR)/gail.extract: $(gail_extract_deps)
+$(STATEDIR)/gail.extract: $(gail_extract_deps_default)
 	@$(call targetinfo, $@)
 	@$(call clean, $(GAIL_DIR))
 	@$(call extract, $(GAIL_SOURCE))
@@ -62,24 +58,15 @@ $(STATEDIR)/gail.extract: $(gail_extract_deps)
 
 gail_prepare: $(STATEDIR)/gail.prepare
 
-#
-# dependencies
-#
-gail_prepare_deps = \
-	$(STATEDIR)/gail.extract \
-	$(STATEDIR)/virtual-xchain.install \
-	$(STATEDIR)/libgnomecanvas.install
-
 GAIL_PATH	=  PATH=$(CROSS_PATH)
 GAIL_ENV 	=  $(CROSS_ENV)
-GAIL_ENV	+= PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig
 
 #
 # autoconf
 #
 GAIL_AUTOCONF =  $(CROSS_AUTOCONF_USR)
 
-$(STATEDIR)/gail.prepare: $(gail_prepare_deps)
+$(STATEDIR)/gail.prepare: $(gail_prepare_deps_default)
 	@$(call targetinfo, $@)
 	@$(call clean, $(GAIL_DIR)/config.cache)
 	cd $(GAIL_DIR) && \
@@ -93,9 +80,7 @@ $(STATEDIR)/gail.prepare: $(gail_prepare_deps)
 
 gail_compile: $(STATEDIR)/gail.compile
 
-gail_compile_deps = $(STATEDIR)/gail.prepare
-
-$(STATEDIR)/gail.compile: $(gail_compile_deps)
+$(STATEDIR)/gail.compile: $(gail_compile_deps_default)
 	@$(call targetinfo, $@)
 	cd $(GAIL_DIR) && \
 	$(GAIL_PATH) make
@@ -118,10 +103,7 @@ $(STATEDIR)/gail.install: $(STATEDIR)/gail.compile
 
 gail_targetinstall: $(STATEDIR)/gail.targetinstall
 
-gail_targetinstall_deps = $(STATEDIR)/gail.compile
-gail_targetinstall_deps = $(STATEDIR)/libgnomecanvas.targetinstall
-
-$(STATEDIR)/gail.targetinstall: $(gail_targetinstall_deps)
+$(STATEDIR)/gail.targetinstall: $(gail_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
 	@$(call install_init,default)
diff --git a/rules/gawk.make b/rules/gawk.make
index 386bea343..b452bab16 100644
--- a/rules/gawk.make
+++ b/rules/gawk.make
@@ -32,9 +32,7 @@ GAWK_DIR		= $(BUILDDIR)/$(GAWK)
 
 gawk_get: $(STATEDIR)/gawk.get
 
-gawk_get_deps = $(GAWK_SOURCE)
-
-$(STATEDIR)/gawk.get: $(gawk_get_deps)
+$(STATEDIR)/gawk.get: $(GAWK_SOURCE)
 	@$(call targetinfo, $@)
 	@$(call touch, $@)
 
@@ -48,9 +46,7 @@ $(GAWK_SOURCE):
 
 gawk_extract: $(STATEDIR)/gawk.extract
 
-gawk_extract_deps = $(STATEDIR)/gawk.get
-
-$(STATEDIR)/gawk.extract: $(gawk_extract_deps)
+$(STATEDIR)/gawk.extract: $(gawk_extract_deps_default)
 	@$(call targetinfo, $@)
 	@$(call clean, $(GAWK_DIR))
 	@$(call extract, $(GAWK_SOURCE))
@@ -63,13 +59,6 @@ $(STATEDIR)/gawk.extract: $(gawk_extract_deps)
 
 gawk_prepare: $(STATEDIR)/gawk.prepare
 
-#
-# dependencies
-#
-gawk_prepare_deps = \
-	$(STATEDIR)/gawk.extract \
-	$(STATEDIR)/virtual-xchain.install
-
 GAWK_PATH	=  PATH=$(CROSS_PATH)
 GAWK_ENV 	=  $(CROSS_ENV)
 
@@ -78,7 +67,7 @@ GAWK_ENV 	=  $(CROSS_ENV)
 #
 GAWK_AUTOCONF =  $(CROSS_AUTOCONF_USR)
 
-$(STATEDIR)/gawk.prepare: $(gawk_prepare_deps)
+$(STATEDIR)/gawk.prepare: $(gawk_prepare_deps_default)
 	@$(call targetinfo, $@)
 	@$(call clean, $(GAWK_DIR)/config.cache)
 	cd $(GAWK_DIR) && \
@@ -92,9 +81,7 @@ $(STATEDIR)/gawk.prepare: $(gawk_prepare_deps)
 
 gawk_compile: $(STATEDIR)/gawk.compile
 
-gawk_compile_deps = $(STATEDIR)/gawk.prepare
-
-$(STATEDIR)/gawk.compile: $(gawk_compile_deps)
+$(STATEDIR)/gawk.compile: $(gawk_compile_deps_default)
 	@$(call targetinfo, $@)
 	cd $(GAWK_DIR) && $(GAWK_ENV) $(GAWK_PATH) make $(GAWK_MAKEVARS)
 	@$(call touch, $@)
@@ -105,7 +92,7 @@ $(STATEDIR)/gawk.compile: $(gawk_compile_deps)
 
 gawk_install: $(STATEDIR)/gawk.install
 
-$(STATEDIR)/gawk.install: $(STATEDIR)/gawk.compile
+$(STATEDIR)/gawk.install: $(gawk_install_deps_default)
 	@$(call targetinfo, $@)
 	@$(call install, GAWK)
 	@$(call touch, $@)
@@ -116,9 +103,7 @@ $(STATEDIR)/gawk.install: $(STATEDIR)/gawk.compile
 
 gawk_targetinstall: $(STATEDIR)/gawk.targetinstall
 
-gawk_targetinstall_deps = $(STATEDIR)/gawk.compile
-
-$(STATEDIR)/gawk.targetinstall: $(gawk_targetinstall_deps)
+$(STATEDIR)/gawk.targetinstall: $(gawk_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 	# FIXME: RSC: ipkgize
 	@$(call touch, $@)
diff --git a/rules/gcclibs.make b/rules/gcclibs.make
index 897f6b143..f4e81c485 100644
--- a/rules/gcclibs.make
+++ b/rules/gcclibs.make
@@ -16,6 +16,7 @@
 #
 PACKAGES-$(PTXCONF_GCCLIBS_GCC_S) += gcclibs
 
+-include $(call package_depfile)
 
 # ----------------------------------------------------------------------------
 # Get
@@ -27,8 +28,6 @@ $(STATEDIR)/gcclibs.get:
 	@$(call targetinfo, $@)
 	@$(call touch, $@)
 
--include $(call package_depfile)
-
 # ----------------------------------------------------------------------------
 # Extract
 # ----------------------------------------------------------------------------
@@ -47,9 +46,7 @@ $(STATEDIR)/gcclibs.extract: $(gcclibs_extract_deps)
 
 gcclibs_prepare: $(STATEDIR)/gcclibs.prepare
 
-gcclibs_prepare_deps = $(STATEDIR)/gcclibs.extract
-
-$(STATEDIR)/gcclibs.prepare: $(gcclibs_prepare_deps)
+$(STATEDIR)/gcclibs.prepare: $(gcclibs_prepare_deps_default)
 	@$(call targetinfo, $@)
 	@$(call touch, $@)
 
@@ -59,9 +56,7 @@ $(STATEDIR)/gcclibs.prepare: $(gcclibs_prepare_deps)
 
 gcclibs_compile: $(STATEDIR)/gcclibs.compile
 
-gcclibs_compile_deps = $(STATEDIR)/gcclibs.prepare
-
-$(STATEDIR)/gcclibs.compile: $(gcclibs_compile_deps)
+$(STATEDIR)/gcclibs.compile: $(gcclibs_compile_deps_default)
 	@$(call targetinfo, $@)
 	@$(call touch, $@)
 
@@ -71,7 +66,7 @@ $(STATEDIR)/gcclibs.compile: $(gcclibs_compile_deps)
 
 gcclibs_install: $(STATEDIR)/gcclibs.install
 
-$(STATEDIR)/gcclibs.install: $(STATEDIR)/gcclibs.compile
+$(STATEDIR)/gcclibs.install: $(gcclibs_install_deps_default)
 	@$(call targetinfo, $@)
 	@$(call touch, $@)
 
@@ -81,9 +76,7 @@ $(STATEDIR)/gcclibs.install: $(STATEDIR)/gcclibs.compile
 
 gcclibs_targetinstall: $(STATEDIR)/gcclibs.targetinstall
 
-gcclibs_targetinstall_deps = $(STATEDIR)/gcclibs.compile
-
-$(STATEDIR)/gcclibs.targetinstall: $(gcclibs_targetinstall_deps)
+$(STATEDIR)/gcclibs.targetinstall: $(gcclibs_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
 	@$(call install_init,default)
diff --git a/rules/gdb-wrapper.make b/rules/gdb-wrapper.make
index 4b6acfbdf..1aa67e851 100644
--- a/rules/gdb-wrapper.make
+++ b/rules/gdb-wrapper.make
@@ -25,9 +25,7 @@ PACKAGES-$(PTXCONF_GDB_WRAPPER) += gdb-wrapper
 
 gdb-wrapper_get: $(STATEDIR)/gdb-wrapper.get
 
-gdb-wrapper_get_deps =
-
-$(STATEDIR)/gdb-wrapper.get: $(gdb-wrapper_get_deps)
+$(STATEDIR)/gdb-wrapper.get:
 	@$(call targetinfo, $@)
 	@$(call touch, $@)
 
@@ -37,7 +35,7 @@ $(STATEDIR)/gdb-wrapper.get: $(gdb-wrapper_get_deps)
 
 gdb-wrapper_extract: $(STATEDIR)/gdb-wrapper.extract
 
-$(STATEDIR)/gdb-wrapper.extract: $(STATEDIR)/gdb-wrapper.get
+$(STATEDIR)/gdb-wrapper.extract: $(gdb_wrapper_extract_deps_default)
 	@$(call targetinfo, $@)
 	@$(call touch, $@)
 
@@ -47,7 +45,7 @@ $(STATEDIR)/gdb-wrapper.extract: $(STATEDIR)/gdb-wrapper.get
 
 gdb-wrapper_prepare: $(STATEDIR)/gdb-wrapper.prepare
 
-$(STATEDIR)/gdb-wrapper.prepare: $(STATEDIR)/gdb-wrapper.extract
+$(STATEDIR)/gdb-wrapper.prepare: $(gdb_wrapper_prepare_deps_default)
 	@$(call targetinfo, $@)
 	@$(call touch, $@)
 
@@ -57,7 +55,7 @@ $(STATEDIR)/gdb-wrapper.prepare: $(STATEDIR)/gdb-wrapper.extract
 
 gdb-wrapper_compile: $(STATEDIR)/gdb-wrapper.compile
 
-$(STATEDIR)/gdb-wrapper.compile: $(STATEDIR)/gdb-wrapper.prepare 
+$(STATEDIR)/gdb-wrapper.compile: $(gdb_wrapper_compile_deps_default)
 	@$(call targetinfo, $@)
 	@$(call touch, $@)
 
@@ -67,7 +65,7 @@ $(STATEDIR)/gdb-wrapper.compile: $(STATEDIR)/gdb-wrapper.prepare
 
 gdb-wrapper_install: $(STATEDIR)/gdb-wrapper.install
 
-$(STATEDIR)/gdb-wrapper.install:
+$(STATEDIR)/gdb-wrapper.install: $(gdb_wrapper_install_deps_default)
 	@$(call targetinfo, $@)
 
 	# let gdb find the target libraries for remote cross debugging
@@ -99,7 +97,7 @@ $(STATEDIR)/gdb-wrapper.install:
 # Target-Install
 # ----------------------------------------------------------------------------
 
-gdb-wrapper_targetinstall: $(STATEDIR)/gdb-wrapper.targetinstall
+gdb-wrapper_targetinstall: $(gdb_wrapper_targetinstall_defaults)
 
 $(STATEDIR)/gdb-wrapper.targetinstall: $(STATEDIR)/gdb-wrapper.compile
 	@$(call targetinfo, $@)
diff --git a/rules/gdb.make b/rules/gdb.make
index 304a389e4..af1a655c7 100644
--- a/rules/gdb.make
+++ b/rules/gdb.make
@@ -34,9 +34,7 @@ GDB_BUILDDIR	= $(BUILDDIR)/$(GDB)-build
 
 gdb_get: $(STATEDIR)/gdb.get
 
-gdb_get_deps = $(GDB_SOURCE)
-
-$(STATEDIR)/gdb.get: $(gdb_get_deps)
+$(STATEDIR)/gdb.get: $(GDB_SOURCE)
 	@$(call targetinfo, $@)
 	@$(call get_patches, $(GDB))
 	@$(call touch, $@)
@@ -51,7 +49,7 @@ $(GDB_SOURCE):
 
 gdb_extract: $(STATEDIR)/gdb.extract
 
-$(STATEDIR)/gdb.extract: $(STATEDIR)/gdb.get
+$(STATEDIR)/gdb.extract: $(gdb_extract_deps_default)
 	@$(call targetinfo, $@)
 	@$(call clean, $(GDB_DIR))
 	@$(call extract, $(GDB_SOURCE))
@@ -64,19 +62,6 @@ $(STATEDIR)/gdb.extract: $(STATEDIR)/gdb.get
 
 gdb_prepare: $(STATEDIR)/gdb.prepare
 
-#
-# dependencies
-#
-gdb_prepare_deps =  $(STATEDIR)/virtual-xchain.install
-gdb_prepare_deps += $(STATEDIR)/gdb.extract
-
-ifdef PTXCONF_GDB_TERMCAP
-gdb_prepare_deps += $(STATEDIR)/termcap.install
-endif
-ifdef PTXCONF_GDB_NCURSES
-gdb_prepare_deps += $(STATEDIR)/ncurses.install
-endif
-
 GDB_PATH	=  PATH=$(CROSS_PATH)
 
 GDB_ENV_AC	= \
@@ -106,7 +91,7 @@ GDB_AUTOCONF = \
 	--target=$(call remove_quotes,$(PTXCONF_GNU_TARGET)) \
 	--enable-serial-configure
 
-$(STATEDIR)/gdb.prepare: $(gdb_prepare_deps)
+$(STATEDIR)/gdb.prepare: $(gdb_prepare_deps_default)
 	@$(call targetinfo, $@)
 	@$(call clean, $(GDB_BUILDDIR))
 	mkdir -p $(GDB_BUILDDIR)
@@ -121,7 +106,7 @@ $(STATEDIR)/gdb.prepare: $(gdb_prepare_deps)
 
 gdb_compile: $(STATEDIR)/gdb.compile
 
-$(STATEDIR)/gdb.compile: $(STATEDIR)/gdb.prepare 
+$(STATEDIR)/gdb.compile: $(gdb_compile_deps_default)
 	@$(call targetinfo, $@)
 	cd $(GDB_BUILDDIR) && $(GDB_PATH) $(GDB_ENV_AC) make
 	@$(call touch, $@)
@@ -142,10 +127,7 @@ $(STATEDIR)/gdb.install:
 
 gdb_targetinstall: $(STATEDIR)/gdb.targetinstall
 
-gdb_targetinstall_deps = \
-	$(STATEDIR)/gdb.compile
-
-$(STATEDIR)/gdb.targetinstall: $(gdb_targetinstall_deps)
+$(STATEDIR)/gdb.targetinstall: $(gdb_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
 	mkdir -p $(ROOTDIR)/usr/bin
diff --git a/rules/gdbserver.make b/rules/gdbserver.make
index fc9330301..a5d52a5f1 100644
--- a/rules/gdbserver.make
+++ b/rules/gdbserver.make
@@ -25,7 +25,7 @@ GDBSERVER_BUILDDIR	= $(BUILDDIR)/$(GDB)-server-build
 
 gdbserver_get: $(STATEDIR)/gdbserver.get
 
-$(STATEDIR)/gdbserver.get: $(gdb_get_deps)
+$(STATEDIR)/gdbserver.get:
 	@$(call targetinfo, $@)
 	@$(call touch, $@)
 
@@ -35,7 +35,7 @@ $(STATEDIR)/gdbserver.get: $(gdb_get_deps)
 
 gdbserver_extract: $(STATEDIR)/gdbserver.extract
 
-$(STATEDIR)/gdbserver.extract: $(STATEDIR)/gdb.extract
+$(STATEDIR)/gdbserver.extract: $(gdbserver_extract_deps_default)
 	@$(call targetinfo, $@)
 	@$(call touch, $@)
 
@@ -45,10 +45,6 @@ $(STATEDIR)/gdbserver.extract: $(STATEDIR)/gdb.extract
 
 gdbserver_prepare: $(STATEDIR)/gdbserver.prepare
 
-gdbserver_prepare_deps = \
-	$(STATEDIR)/virtual-xchain.install \
-	$(STATEDIR)/gdbserver.extract
-
 GDBSERVER_PATH		= $(GDB_PATH)
 GDBSERVER_ENV		= $(GDB_ENV)
 
@@ -61,7 +57,7 @@ endif
 #
 GDBSERVER_AUTOCONF	= $(GDB_AUTOCONF)
 
-$(STATEDIR)/gdbserver.prepare: $(gdbserver_prepare_deps)
+$(STATEDIR)/gdbserver.prepare: $(gdbserver_prepare_deps_default)
 	@$(call targetinfo, $@)
 	@$(call clean, $(GDBSERVER_BUILDDIR))
 	mkdir -p $(GDBSERVER_BUILDDIR)
@@ -78,7 +74,7 @@ $(STATEDIR)/gdbserver.prepare: $(gdbserver_prepare_deps)
 
 gdbserver_compile: $(STATEDIR)/gdbserver.compile
 
-$(STATEDIR)/gdbserver.compile: $(STATEDIR)/gdbserver.prepare 
+$(STATEDIR)/gdbserver.compile: $(gdbserver_prepare_deps_default)
 	@$(call targetinfo, $@)
 	$(GDBSERVER_PATH) make -C $(GDBSERVER_BUILDDIR)
 	@$(call touch, $@)
@@ -99,7 +95,7 @@ $(STATEDIR)/gdbserver.install:
 
 gdbserver_targetinstall: $(STATEDIR)/gdbserver.targetinstall
 
-$(STATEDIR)/gdbserver.targetinstall: $(STATEDIR)/gdbserver.compile
+$(STATEDIR)/gdbserver.targetinstall: $(gdbserver_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
 	@$(call install_init,default)
diff --git a/rules/gettext.make b/rules/gettext.make
index b87859741..5733412d6 100644
--- a/rules/gettext.make
+++ b/rules/gettext.make
@@ -35,9 +35,7 @@ GETTEXT_INST_DIR	= $(BUILDDIR)/$(GETTEXT)-install
 
 gettext_get: $(STATEDIR)/gettext.get
 
-gettext_get_deps = $(GETTEXT_SOURCE)
-
-$(STATEDIR)/gettext.get: $(gettext_get_deps)
+$(STATEDIR)/gettext.get: $(GETTEXT_SOURCE)
 	@$(call targetinfo, $@)
 	@$(call touch, $@)
 
@@ -51,9 +49,7 @@ $(GETTEXT_SOURCE):
 
 gettext_extract: $(STATEDIR)/gettext.extract
 
-gettext_extract_deps = $(STATEDIR)/gettext.get
-
-$(STATEDIR)/gettext.extract: $(gettext_extract_deps)
+$(STATEDIR)/gettext.extract: $(gettext_extract_deps_default)
 	@$(call targetinfo, $@)
 	@$(call clean, $(GETTEXT_DIR))
 	@$(call extract, $(GETTEXT_SOURCE))
@@ -66,13 +62,6 @@ $(STATEDIR)/gettext.extract: $(gettext_extract_deps)
 
 gettext_prepare: $(STATEDIR)/gettext.prepare
 
-#
-# dependencies
-#
-gettext_prepare_deps =  \
-	$(STATEDIR)/gettext.extract \
-	$(STATEDIR)/virtual-xchain.install
-
 GETTEXT_PATH	=  PATH=$(CROSS_PATH)
 GETTEXT_ENV 	=  $(CROSS_ENV) \
 	ac_cv_func_getline=yes \
@@ -87,7 +76,7 @@ GETTEXT_AUTOCONF =  $(CROSS_AUTOCONF_USR)
 # This is braindead but correct :-) No, it isn't!
 # GETTEXT_AUTOCONF	+= --disable-nls
 
-$(STATEDIR)/gettext.prepare: $(gettext_prepare_deps)
+$(STATEDIR)/gettext.prepare: $(gettext_prepare_deps_default)
 	@$(call targetinfo, $@)
 	cd $(GETTEXT_DIR) && \
 		$(GETTEXT_PATH) $(GETTEXT_ENV) \
@@ -100,7 +89,7 @@ $(STATEDIR)/gettext.prepare: $(gettext_prepare_deps)
 
 gettext_compile: $(STATEDIR)/gettext.compile
 
-gettext_compile_deps = $(STATEDIR)/gettext.prepare
+gettext_compile_deps = $(gettext_compile_deps_default)
 
 $(STATEDIR)/gettext.compile: $(gettext_compile_deps)
 	@$(call targetinfo, $@)
@@ -113,9 +102,7 @@ $(STATEDIR)/gettext.compile: $(gettext_compile_deps)
 
 gettext_install: $(STATEDIR)/gettext.install
 
-gettext_install_deps = $(STATEDIR)/gettext.compile
-
-$(STATEDIR)/gettext.install: $(gettext_install_deps)
+$(STATEDIR)/gettext.install: (gettext_install_deps_default)
 	@$(call targetinfo, $@)
 	# FIXME
 	#@$(call install, GETTEXT)
@@ -134,9 +121,7 @@ $(STATEDIR)/gettext.install: $(gettext_install_deps)
 
 gettext_targetinstall: $(STATEDIR)/gettext.targetinstall
 
-gettext_targetinstall_deps = $(STATEDIR)/gettext.install
-
-$(STATEDIR)/gettext.targetinstall: $(gettext_targetinstall_deps)
+$(STATEDIR)/gettext.targetinstall: $(gettext_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
 	@$(call install_init,default)