From 8a7b18bbf076d570ea0161cf95074d63efb2d679 Mon Sep 17 00:00:00 2001 From: "Janet B. Anderson" Date: Tue, 22 Jul 2008 16:10:52 +0000 Subject: [PATCH] Added dependancies for all combos of dirs actions and arches. --- configure/RULES_DIRS | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/configure/RULES_DIRS b/configure/RULES_DIRS index f516aa4e0..84ef16816 100644 --- a/configure/RULES_DIRS +++ b/configure/RULES_DIRS @@ -38,11 +38,27 @@ rebuild : clean install # Create directory dependancies lines for GNU make -j option # Only works with GNU make 3.80 or later (uses eval function) -define DEP_template +define DEP_template1 $(1): $$($(1)_DEPEND_DIRS) +endef +$(foreach dir, $(DIRS),$(eval $(call DEP_template1,$(dir)))) + +define DEP_template2 $(1)$$(DIVIDER)$(2) : $$(foreach ddir, $$($(1)_DEPEND_DIRS),$$(addsuffix $$(DIVIDER)$(2),$$(ddir))) endef -$(foreach action, $(ACTIONS), $(foreach dir, $(DIRS),$(eval $(call DEP_template,$(dir),$(action))))) +$(foreach action, $(ACTIONS), $(foreach dir, $(DIRS),$(eval $(call DEP_template2,$(dir),$(action))))) + +define DEP_template3 +$(1)$$(DIVIDER)$(2) : $$(foreach ddir, $$($(1)_DEPEND_DIRS),$$(addsuffix $$(DIVIDER)$(2),$$(ddir))) +endef +$(foreach arch, $(ARCHS), $(foreach dir, $(DIRS),$(eval $(call DEP_template3,$(dir),$(arch))))) + +define DEP_template4 +$(1)$$(DIVIDER)$(2)$$(DIVIDER)$(3) : $$(foreach ddir, $$($(1)_DEPEND_DIRS),$$(addsuffix $$(DIVIDER)$(2)$$(DIVIDER)$(3),$$(ddir))) +endef +$(foreach arch, $(ARCHS), $(foreach action, $(ACTIONS), $(foreach dir, $(DIRS), \ + $(eval $(call DEP_template4,$(dir),$(action),$(arch)))))) + $(DIRS) $(dirActionTargets) $(dirArchTargets) $(dirActionArchTargets) : $(MAKE) -C $(dirPart) $(actionArchPart)