summaryrefslogtreecommitdiffstats
path: root/Makefile.rules
diff options
context:
space:
mode:
authorReid Spencer <rspencer@reidspencer.com>2005-08-25 04:59:49 +0000
committerReid Spencer <rspencer@reidspencer.com>2005-08-25 04:59:49 +0000
commitca739c685b963b103ae2d201e038ac37e7af4b29 (patch)
tree142422dd7aefaadccc5624e55c383e129d17e667 /Makefile.rules
parent2fe76e58eb734a09ec08ea006a32700572ffc0ca (diff)
downloadexternal_llvm-ca739c685b963b103ae2d201e038ac37e7af4b29.zip
external_llvm-ca739c685b963b103ae2d201e038ac37e7af4b29.tar.gz
external_llvm-ca739c685b963b103ae2d201e038ac37e7af4b29.tar.bz2
For 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. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@23039 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'Makefile.rules')
-rw-r--r--Makefile.rules22
1 files changed, 1 insertions, 21 deletions
diff --git a/Makefile.rules b/Makefile.rules
index 9bc8d5b..6566098 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -28,13 +28,6 @@ TopLevelTargets := check dist dist-check dist-clean tags dist-gzip dist-bzip2 \
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 @@ ifneq ($(MakefileConfigIn),)
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): $(ConfigureScript)
$(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),)