From 64c45961ff47aca5aa08bb49f912f70c851302ba Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Tue, 29 Jul 2014 18:16:53 -0500
Subject: [PATCH] configure: Fix missing dependency files

Dependency files were not being created for sources that
were only listed in x_SRCS_class variables, because the
code that added those to the x_SRCS var was running after
we had already loaded the dependency files.
---
 configure/CONFIG_COMMON |  6 ++++--
 configure/RULES_BUILD   | 15 +++++++++------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/configure/CONFIG_COMMON b/configure/CONFIG_COMMON
index 194e05ae1..584175784 100644
--- a/configure/CONFIG_COMMON
+++ b/configure/CONFIG_COMMON
@@ -343,9 +343,11 @@ HDEPENDS.c = $(HDEPENDS_$(HDEPENDS_METHOD).c)
 HDEPENDS.cpp = $(HDEPENDS_$(HDEPENDS_METHOD).cpp)
 
 #--------------------------------------------------
-# depends definition
+# Dependency files
 
-TARGET_SRCS = $(foreach name, $(TESTPROD) $(PROD) $(TESTLIBRARY) $(LIBRARY) $(LOADABLE_LIBRARY), $($(name)_SRCS))
+TARGET_SRCS = $(foreach name, \
+    $(TESTPROD) $(PROD) $(TESTLIBRARY) $(LIBRARY) $(LOADABLE_LIBRARY), \
+    $($(name)_SRCS))
 SRC_FILES = $(LIB_SRCS) $(LIBSRCS) $(SRCS) $(USR_SRCS) $(PROD_SRCS) $(TARGET_SRCS)
 HDEPENDS_FILES = $(addsuffix $(DEP),$(notdir $(basename $(SRC_FILES))))
 
diff --git a/configure/RULES_BUILD b/configure/RULES_BUILD
index 66ab3fd7d..711da3434 100644
--- a/configure/RULES_BUILD
+++ b/configure/RULES_BUILD
@@ -81,18 +81,21 @@ endif
 
 -include $(CONFIG)/RULES.Db
 
-ifneq (,$(strip $(HDEPENDS_FILES)))
-$(filter-out $(wildcard *$(DEP)), $(HDEPENDS_FILES)): $(COMMON_INC)
--include $(HDEPENDS_FILES)
-endif
-
 #---------------------------------------------------------------
-# Included defines and rules for prod,testprod, and library targets
+# Include defines and rules for prod, library and test* targets
 
 #ifneq (,$(strip $(PROD) $(TESTPROD) $(LIBRARY) $(TESTLIBRARY) $(LOADABLE_LIBRARY) ))
 include $(CONFIG)/RULES_TARGET
 #endif
 
+#---------------------------------------------------------------
+# Read dependency files
+
+ifneq (,$(strip $(HDEPENDS_FILES)))
+$(filter-out $(wildcard *$(DEP)), $(HDEPENDS_FILES)): $(COMMON_INC)
+-include $(HDEPENDS_FILES)
+endif
+
 #---------------------------------------------------------------
 #   Products and Object libraries
 #