[llvm-commits] CVS: llvm/Makefile.rules Makefile

[Reid Spencer]

Changes in directory llvm:

Makefile.rules updated: 1.322 -> 1.323
Makefile updated: 1.50 -> 1.51
---
Log message:

For PR614: http://llvm.cs.uiuc.edu/PR614 :
Move the implementation of the fix from Makefile.rules to Makefile. This
ensures that it is only checked on a top-level rebuild, and not in every
single subdirectory. This removes some annoying messages from the build and
numerous executions of config.status if the .in file changes but not 
substantively enough to cause the .h file to be modified by config.status.


---
Diffs of the changes:  (+19 -21)

 Makefile       |   18 ++++++++++++++++++
 Makefile.rules |   22 +---------------------
 2 files changed, 19 insertions(+), 21 deletions(-)


Index: llvm/Makefile.rules
diff -u llvm/Makefile.rules:1.322 llvm/Makefile.rules:1.323
--- llvm/Makefile.rules:1.322	Wed Aug 24 23:44:18 2005
+++ llvm/Makefile.rules	Wed Aug 24 23:59:49 2005
@@ -28,13 +28,6 @@
 UserTargets      := $(RecursiveTargets) $(LocalTargets) $(TopLevelTargets)
 InternalTargets  := preconditions distdir dist-hook
 
-FilesToConfig := \
-  include/llvm/Config/config.h \
-  include/llvm/Support/DataTypes.h \
-  include/llvm/ADT/hash_map \
-  include/llvm/ADT/hash_set \
-  include/llvm/ADT/iterator
-
 ################################################################################
 # INITIALIZATION: Basic things the makefile needs
 ################################################################################
@@ -84,10 +77,7 @@
 PreConditions      += $(MakefileConfig)
 endif
 
-FilesToConfigPATH  := $(addprefix $(LLVM_OBJ_ROOT)/,$(FilesToConfig))
-PreConditions      += $(FilesToConfigPATH)
-
-preconditions : $(PreConditions)
+preconditions: $(PreConditions)
 
 #------------------------------------------------------------------------
 # Make sure the BUILT_SOURCES are built first
@@ -145,16 +135,6 @@
 	  $(ConfigStatusScript)
 
 #------------------------------------------------------------------------
-# If we're buildilng LLVM, then make sure the generated headers are Up2Dt
-#------------------------------------------------------------------------
-ifeq ($(LLVM_OBJ_ROOT),$(PROJ_OBJ_ROOT))
-.PRECIOUS: $(FilesToConfigPATH)
-$(FilesToConfigPATH) : $(LLVM_OBJ_ROOT)/% : $(LLVM_SRC_ROOT)/%.in 
-	$(Echo) Regenerating $*
-	$(Verb) cd $(LLVM_OBJ_ROOT) && $(ConfigStatusScript) $*
-endif
-
-#------------------------------------------------------------------------
 # Make sure the configuration makefile is up to date
 #------------------------------------------------------------------------
 ifneq ($(MakefileConfigIn),)


Index: llvm/Makefile
diff -u llvm/Makefile:1.50 llvm/Makefile:1.51
--- llvm/Makefile:1.50	Sat May 28 19:49:24 2005
+++ llvm/Makefile	Wed Aug 24 23:59:49 2005
@@ -51,3 +51,21 @@
 
 tools-only: all
 libs-only: all
+
+#------------------------------------------------------------------------
+# Make sure the generated headers are up-to-date. This must be kept in
+# sync with the AC_CONFIG_HEADER invocations in autoconf/configure.ac
+#------------------------------------------------------------------------
+FilesToConfig := \
+  include/llvm/Config/config.h \
+  include/llvm/Support/DataTypes.h \
+  include/llvm/ADT/hash_map \
+  include/llvm/ADT/hash_set \
+  include/llvm/ADT/iterator
+FilesToConfigPATH  := $(addprefix $(LLVM_OBJ_ROOT)/,$(FilesToConfig))
+
+all-local:: $(FilesToConfigPATH)
+$(FilesToConfigPATH) : $(LLVM_OBJ_ROOT)/% : $(LLVM_SRC_ROOT)/%.in 
+	$(Echo) Regenerating $*
+	$(Verb) cd $(LLVM_OBJ_ROOT) && $(ConfigStatusScript) $*
+.PRECIOUS: $(FilesToConfigPATH)