From 44494951960950ff89483225d3cb63dead10d9dd Mon Sep 17 00:00:00 2001
From: Jeff Hill <johill@lanl.gov>
Date: Wed, 6 Nov 1996 19:41:44 +0000
Subject: [PATCH] o do the "inc" traget at the RULES_DIRS level for all arc
 targets and the install target o eliminated redundant "inc" build by creating
 buildInstall target

---
 config/RULES.Unix  |  4 +++-
 config/RULES.Vx    |  4 +++-
 config/RULES_ARCHS |  1 +
 config/RULES_DIRS  | 20 +++++++++++---------
 4 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/config/RULES.Unix b/config/RULES.Unix
index 0136a8a73..94e78b0c3 100644
--- a/config/RULES.Unix
+++ b/config/RULES.Unix
@@ -34,7 +34,9 @@ build:: pre_build $(LIBNAME) $(TARGETS) $(PROD)
 inc:: $(INSTALL_INCLUDE) $(INSTALL_INC) $(INSTALL_INCLUDE)/os \
 	$(INSTALL_OSINCLUDE) $(INSTALL_OSINC)
 
-install:: inc build $(INSTALL_LOCATION_LIB) \
+install:: inc buildInstall 
+
+buildInstall :: build $(INSTALL_LOCATION_LIB) \
 	$(INSTALL_LIBS) $(TARGETS) $(INSTALL_SCRIPTS) \
 	$(INSTALL_LOCATION_BIN) $(INSTALL_BIN) $(INSTALL_PROD) \
 	$(INSTALL_MAN) $(INSTALL_MANS) $(INSTALL_DOCS) $(INSTALL_TEMPLATES) \
diff --git a/config/RULES.Vx b/config/RULES.Vx
index 5299a76d1..8af44e2a2 100644
--- a/config/RULES.Vx
+++ b/config/RULES.Vx
@@ -40,7 +40,9 @@ build:: pre_build $(MENUS) $(RECTYPES) $(BPTS)\
 inc:: $(INSTALL_INCLUDE) $(INSTALL_INC) $(INSTALL_INCLUDE)/os \
 	$(INSTALL_OSINCLUDE) $(INSTALL_OSINC)
 
-install:: inc build $(INSTALL_INCREC)\
+install:: inc buildInstall 
+
+buildInstall :: build $(INSTALL_INCREC)\
 	 $(INSTALL_LOCATION_BIN) \
          $(INSTALL_LIBS) $(TARGETS) $(INSTALL_PROD) \
 	 $(INSTALL_MAN) $(INSTALL_MANS)\
diff --git a/config/RULES_ARCHS b/config/RULES_ARCHS
index 58238ea03..efb272ff4 100644
--- a/config/RULES_ARCHS
+++ b/config/RULES_ARCHS
@@ -10,6 +10,7 @@ all:: install
 ACTIONS += inc
 ACTIONS += build
 ACTIONS += install
+ACTIONS += buildInstall 
 ACTIONS += depends 
 ACTIONS += rebuild 
 
diff --git a/config/RULES_DIRS b/config/RULES_DIRS
index bdfa47bca..b1910bd79 100644
--- a/config/RULES_DIRS
+++ b/config/RULES_DIRS
@@ -4,37 +4,39 @@
  
 
 ARCHS += $(BUILD_ARCHS) host cross
-ACTIONS += clean inc install depends
+ACTIONS += clean inc depends buildInstall
  
 dirPart = $(word 1, $(subst $(DIVIDER), ,$@))
 actionArchPart = $(subst $(dirPart)$(DIVIDER), ,$@)
  
 dirActionArchTargets = $(foreach dir, $(DIRS), \
-                       $(foreach action, $(ACTIONS),\
+                       $(foreach action, $(ACTIONS) install,\
                        $(foreach arch, $(ARCHS), \
                        $(dir)$(DIVIDER)$(action)$(DIVIDER)$(arch))))
 dirArchTargets += $(foreach dir, $(DIRS), \
                   $(foreach arch, $(ARCHS),\
                   $(dir)$(DIVIDER)$(arch)))
 dirActionTargets += $(foreach dir, $(DIRS), \
-                    $(foreach action, $(ACTIONS),\
+                    $(foreach action, $(ACTIONS) install,\
                     $(dir)$(DIVIDER)$(action)))
-actionArchTargets = $(foreach action, $(ACTIONS),\
+actionArchTargets = $(foreach action, $(ACTIONS) install,\
                     $(foreach arch, $(ARCHS), \
                     $(action)$(DIVIDER)$(arch)))
 
-all:: inc install
+all install :: inc buildInstall 
 
-rebuild:: clean all
- 
 $(DIRS) $(dirActionTargets) $(dirArchTargets)$(dirActionArchTargets) ::
 	$(MAKE) -C $(dirPart) $(actionArchPart)
 
-$(ARCHS) $(ACTIONS) $(actionArchTargets) :%: \
+$(ARCHS) $(installArchTargets) :%: \
+	$(foreach dir, $(DIRS), $(dir)$(DIVIDER)inc) \
+	$(foreach dir, $(DIRS), $(dir)$(DIVIDER)%)
+
+$(ACTIONS) $(actionArchTargets) :%: \
 	$(foreach dir, $(DIRS), $(dir)$(DIVIDER)%)
  
 
-.PHONY : $(DIRS)
+.PHONY : $(DIRS) all install
 .PHONY : $(ARCHS) $(ACTIONS)
 .PHONY : $(dirActionTargets) $(dirArchTargets)
 .PHONY : $(dirActionArchTargets)