From 18c52e5839e2466995e75ed592b7e5fe8ca4a75c Mon Sep 17 00:00:00 2001
From: "Janet B. Anderson" <jba@aps.anl.gov>
Date: Wed, 14 Aug 1996 20:47:46 +0000
Subject: [PATCH] CVS:Now allows archname in targets.
 --------------------i--------------------------------------------------

---
 config/RULES_ARCHS | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/config/RULES_ARCHS b/config/RULES_ARCHS
index 5d2112895..325bc53c8 100644
--- a/config/RULES_ARCHS
+++ b/config/RULES_ARCHS
@@ -18,25 +18,35 @@ archPart = $(word 2, $(subst $(DIVIDER), ,$@))
 #
 # hostActionArchTargets
 #
-ifeq (Makefile.$(BUILD_TYPE), $(wildcard Makefile.$(BUILD_TYPE)))
 hostArchs = $(HOST_ARCH) $(filter-out $(HOST_ARCH),$(CROSS_COMPILER_HOST_ARCHS))
-hostDirs = $(addprefix O.,$(hostArchs))
 hostActionArchTargets = $(foreach x, $(ACTIONS),\
 		$(foreach arch,$(hostArchs), $(x)$(DIVIDER)$(arch)))
+ifeq (Makefile.$(BUILD_TYPE), $(wildcard Makefile.$(BUILD_TYPE)))
+hostDirs = $(addprefix O.,$(hostArchs))
 $(hostActionArchTargets) : $(hostDirs)
 	$(MAKE) -C O.$(archPart) -f ../Makefile.$(BUILD_TYPE) T_A=$(archPart) $(actionPart)
+$(hostArchs) : % : O.% 
+	$(MAKE) -C O.$@ -f ../Makefile.$(BUILD_TYPE) T_A=$@ 
+else
+$(hostActionArchTargets) :
+$(hostArchs) :
 endif
 
 #
 # crossActionArchTargets
 #
-ifeq (Makefile.Vx, $(wildcard Makefile.Vx))
 crossArchs = $(CROSS_COMPILER_TARGET_ARCHS)
-crossDirs = $(addprefix O.,$(crossArchs))
 crossActionArchTargets = $(foreach x, $(ACTIONS), \
 	$(foreach arch, $(CROSS_COMPILER_TARGET_ARCHS), $(x)$(DIVIDER)$(arch)))
+ifeq (Makefile.Vx, $(wildcard Makefile.Vx))
+crossDirs = $(addprefix O.,$(crossArchs))
 $(crossActionArchTargets) : $(crossDirs)
 	$(MAKE) -C O.$(archPart) -f ../Makefile.Vx T_A=$(archPart) $(actionPart)
+$(crossArchs) : % : O.%
+	$(MAKE) -C O.$@ -f ../Makefile.Vx T_A=$@
+else
+$(crossActionArchTargets) :
+$(crossArchs) : 
 endif
 
 $(hostDirs) : 
@@ -65,11 +75,6 @@ $(CrossActionTargets) : %$(DIVIDER)cross : $(addprefix %$(DIVIDER), $(crossArchs
 host : $(hostArchs)
 cross : $(crossArchs)
 
-$(hostArchs) : % : O.% 
-	$(MAKE) -C O.$@ -f ../Makefile.$(BUILD_TYPE) T_A=$@ 
-$(crossArchs) : % : O.%
-	$(MAKE) -C O.$@ -f ../Makefile.Vx T_A=$@
-
 #
 # special clean rule
 #