From 9a173a46d92157ceaf53867b676bcd442b5d6dae Mon Sep 17 00:00:00 2001
From: "Janet B. Anderson" <jba@aps.anl.gov>
Date: Fri, 4 Oct 2002 14:53:00 +0000
Subject: [PATCH] Cleanup of rules.

---
 configure/RULES_ARCHS | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/configure/RULES_ARCHS b/configure/RULES_ARCHS
index baedb1068..629ebb6c3 100644
--- a/configure/RULES_ARCHS
+++ b/configure/RULES_ARCHS
@@ -15,7 +15,7 @@ all: install
 
 build install buildInstall: $(CHECK_RELEASE_$(CHECK_RELEASE))
 
-rebuild: clean all
+rebuild: clean install
 
 ACTIONS = inc
 ACTIONS += build
@@ -29,6 +29,8 @@ archPart = $(word 2, $(subst $(DIVIDER), ,$@))
 actionArchTargets = $(foreach x, $(ACTIONS),\
 		$(foreach arch,$(BUILD_ARCHS), $(x)$(DIVIDER)$(arch)))
 
+cleanArchTargets = $(foreach arch,$(BUILD_ARCHS), clean$(DIVIDER)$(arch)))
+
 buildDirs = $(addprefix O.,$(BUILD_ARCHS))
 
 $(actionArchTargets) : $(buildDirs) O.Common
@@ -54,15 +56,15 @@ checkRelease: $(wildcard $(TOP)/configure/RELEASE*)
 clean ::
 	$(RMDIR) $(addprefix O.,$(BUILD_ARCHS)) O.Common
 
-clean$(DIVIDER)% :: 
-	$(RMDIR) O.$*
+$(cleanArchTargets) ::
+	$(RMDIR) O.$(archPart)
 
 realclean :: 
 	$(RMDIR) O.*
 
-.PHONY : $(buildActionTargets)
-.PHONY : $(buildActionArchTargets)
-.PHONY : $(buildArchs)
+.PHONY : $(actionArchTargets)
+.PHONY : $(cleanArchTargets)
+.PHONY : $(BUILD_ARCHS)
 .PHONY : $(ACTIONS) clean realclean all
 .PHONY : checkRelease