From f3664e0a4f261f4dcc3d6a6e8ce2b23188b7eee5 Mon Sep 17 00:00:00 2001 From: Reid Spencer Date: Mon, 27 Dec 2004 08:50:27 +0000 Subject: [PATCH] Make it possible to reconfigure a project as well as just LLVM main dir. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@19164 91177308-0d34-0410-b5e6-96231b3b80d8 --- Makefile.rules | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile.rules b/Makefile.rules index 64aa0a02b21..0a064428819 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -63,8 +63,9 @@ $(UserTargets):: SrcMakefiles := $(filter %Makefile %Makefile.tests,\ $(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 +ConfigureScript := $(BUILD_SRC_ROOT)/configure +ConfigStatusScript := $(BUILD_OBJ_ROOT)/config.status +LConfigStatusScript:= $(LLVM_OBJ_ROOT)/config.status MakefileConfigIn := $(LLVM_SRC_ROOT)/Makefile.config.in MakefileConfig := $(LLVM_OBJ_ROOT)/Makefile.config PreConditions := $(ConfigStatusScript) $(MakefileConfig) $(ObjMakefiles) @@ -129,9 +130,9 @@ $(ConfigStatusScript): $(ConfigureScript) #------------------------------------------------------------------------ # Make sure the configuration makefile is up to date #------------------------------------------------------------------------ -$(MakefileConfig): $(MakefileConfigIn) $(ConfigStatusScript) +$(MakefileConfig): $(MakefileConfigIn) $(LConfigStatusScript) $(Echo) Regenerating $@ - $(Verb) cd $(LLVM_OBJ_ROOT) ; $(ConfigStatusScript) Makefile.config + $(Verb) cd $(LLVM_OBJ_ROOT) ; $(LConfigStatusScript) Makefile.config #------------------------------------------------------------------------ # If the Makefile in the source tree has been updated, copy it over into the