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

---
 configure/RULES_DIRS |  4 ++--
 configure/RULES_JAVA | 13 +++++++------
 configure/RULES_TOP  | 10 +++++++---
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/configure/RULES_DIRS b/configure/RULES_DIRS
index 5f1f9a8cf..5add76321 100644
--- a/configure/RULES_DIRS
+++ b/configure/RULES_DIRS
@@ -33,9 +33,9 @@ actionArchTargets = $(foreach action, $(ACTIONS),\
                     $(foreach arch, $(ARCHS), \
                     $(action)$(DIVIDER)$(arch)))
 
-all : buildInstall
+all : install
 
-rebuild : clean all
+rebuild : clean install
 
 $(DIRS) $(dirActionTargets) $(dirArchTargets) $(dirActionArchTargets) :
 	$(MAKE) -C $(dirPart) $(actionArchPart)
diff --git a/configure/RULES_JAVA b/configure/RULES_JAVA
index 671b7e8fa..66ab20789 100644
--- a/configure/RULES_JAVA
+++ b/configure/RULES_JAVA
@@ -73,20 +73,20 @@ endif
 
 all:    install
 
+install: buildInstall
+
+buildInstall : build
+
+rebuild: clean install
+
 inc:  $(JAVA_DIRECTORY_TARGETS) $(INSTALL_CLASSES) $(COMMON_JAVAINC)
 
 build: inc
 
 build:  $(COMMON_TESTCLASSES) $(COMMON_JAR)
 
-buildInstall : build
-
 buildInstall : $(INSTALL_JAR)
 
-install: buildInstall
-
-rebuild: clean install
-
 #This clean works only from O.* dirs.
 clean:: 
 	@$(RMDIR) $(INSTALL_CLASSES)
@@ -120,3 +120,4 @@ $(INSTALL_JAVA)/%.jar: $(COMMON_DIR)/%.jar
 	@echo "Installing java jar file $@"
 	@$(INSTALL) -d -m 644 $< $(@D)
 
+.PHONY: all install buildInstall rebuild clean build inc
diff --git a/configure/RULES_TOP b/configure/RULES_TOP
index a37983998..4478765ba 100644
--- a/configure/RULES_TOP
+++ b/configure/RULES_TOP
@@ -13,8 +13,11 @@
 
 include $(CONFIG)/RULES_DIRS
 
-uninstall$(DIVIDER)%: uninstallDirs
-	@$(RMDIR) $(INSTALL_LOCATION_BIN)/$* $(INSTALL_LOCATION_LIB)/$* 
+uninstallArchTargets = $(foreach arch,$(BUILD_ARCHS), uninstall$(DIVIDER)$(arch))
+archPart = $(word 2, $(subst $(DIVIDER), ,$@))
+
+$(uninstallArchTargets): uninstallDirs
+	@$(RMDIR) $(INSTALL_LOCATION_BIN)/$(archPart) $(INSTALL_LOCATION_LIB)/$(archPart) 
 
 cleandirs:
 	@echo " " #stops "nothing to be done for cleandirs" message
@@ -67,5 +70,6 @@ help:
 	@echo "Indiv. object targets are supported by O.<arch> level Makefile .e.g"
 	@echo "     xxxRecord.o"
 
-.PHONY : uninstall help cleandirs distclean uninstallDirs realuninstall realclean distclean
+.PHONY : $(uninstallArchTargets)
+.PHONY : uninstall help cleandirs distclean uninstallDirs realuninstall