From 91234ff57a4080a0ac484e0cf87a4241b84d58a7 Mon Sep 17 00:00:00 2001 From: Reid Spencer Date: Wed, 17 Nov 2004 19:08:44 +0000 Subject: [PATCH] Fix PR458: * Don't include Makefile.rules in set of preconditions, it never has to be copied to objdir. * Enable the "update makefile first before executing targets" feature in gnu make by *not* using a full path to the Makefile in the rule. llvm-svn: 17920 --- llvm/Makefile.rules | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/llvm/Makefile.rules b/llvm/Makefile.rules index 3f817e334039..93b77886db0c 100644 --- a/llvm/Makefile.rules +++ b/llvm/Makefile.rules @@ -59,8 +59,8 @@ $(UserTargets):: # PRECONDITIONS: that which must be built/checked first ################################################################################ -SrcMakefiles := $(filter %Makefile %Makefile.rules %Makefile.tests \ - %Makefile.JIT,$(wildcard $(BUILD_SRC_DIR)/Makefile*)) +SrcMakefiles := $(filter %Makefile %Makefile.tests %Makefile.JIT,\ + $(wildcard $(BUILD_SRC_DIR)/Makefile*)) ObjMakefiles := $(subst $(BUILD_SRC_DIR),$(BUILD_OBJ_DIR),$(SrcMakefiles)) ConfigureScript := $(LLVM_SRC_ROOT)/configure ConfigStatusScript := $(LLVM_OBJ_ROOT)/config.status @@ -104,7 +104,7 @@ $(MakefileConfig): $(MakefileConfigIn) $(ConfigStatusScript) #------------------------------------------------------------------------ ifneq ($(BUILD_OBJ_DIR),$(BUILD_SRC_DIR)) -$(BUILD_OBJ_DIR)/Makefile : $(BUILD_SRC_DIR)/Makefile +Makefile: $(BUILD_SRC_DIR)/Makefile $(Echo) "Updating Makefile" $(Verb) $(MKDIR) $(@D) $(Verb) cp -f $< $@