diff options
| author | John Criswell <criswell@uiuc.edu> | 2003-09-06 15:03:24 +0000 |
|---|---|---|
| committer | John Criswell <criswell@uiuc.edu> | 2003-09-06 15:03:24 +0000 |
| commit | a37fefd064c591969690933e113eab2dd6a60558 (patch) | |
| tree | 23afba71a75ec5e7c9af270d8940a37074a98f9c | |
| parent | 69077e28d75d8c434ec9e2fa789db4c1125c7f30 (diff) | |
| download | external_llvm-a37fefd064c591969690933e113eab2dd6a60558.zip external_llvm-a37fefd064c591969690933e113eab2dd6a60558.tar.gz external_llvm-a37fefd064c591969690933e113eab2dd6a60558.tar.bz2 | |
Checkin of autoconf-style object root.
Modified Makefiles to use the new Makefile setup in LLVM.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@8380 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | examples/ModuleMaker/Makefile.common | 21 | ||||
| -rw-r--r-- | projects/ModuleMaker/Makefile.common | 21 | ||||
| -rw-r--r-- | projects/SmallExamples/ModuleMaker/Makefile.common | 21 | ||||
| -rw-r--r-- | projects/sample/Makefile | 2 | ||||
| -rw-r--r-- | projects/sample/Makefile.common | 21 |
5 files changed, 69 insertions, 17 deletions
diff --git a/examples/ModuleMaker/Makefile.common b/examples/ModuleMaker/Makefile.common index 9b34d87..b90ad9f 100644 --- a/examples/ModuleMaker/Makefile.common +++ b/examples/ModuleMaker/Makefile.common @@ -1,10 +1,23 @@ # -# Set this variable to the top of the LLVM source tree. +# Configure the location of the LLVM object root. We know it is two +# directories up. The source tree location we do not know; let the LLVM +# Makefiles find it for us. # -LLVM_SRC_ROOT = $(LEVEL)/../.. +LLVM_OBJ_ROOT=$(LEVEL)/../.. # -# Include LLVM's Master Makefile. +# Grab the LLVM configuration file. # -include $(LLVM_SRC_ROOT)/Makefile.common +include $(LEVEL)/../../Makefile.config + +# +# Reconfigure the source directories +# +BUILD_SRC_ROOT:=$(LLVM_SRC_ROOT)/projects/ModuleMaker +BUILD_SRC_DIR := $(subst //,/,$(BUILD_SRC_ROOT)/$(patsubst $(BUILD_OBJ_ROOT)%,%,$(BUILD_OBJ_DIR))) + +# +# Include LLVM's build rules. +# +include $(LLVM_SRC_ROOT)/Makefile.rules diff --git a/projects/ModuleMaker/Makefile.common b/projects/ModuleMaker/Makefile.common index 9b34d87..b90ad9f 100644 --- a/projects/ModuleMaker/Makefile.common +++ b/projects/ModuleMaker/Makefile.common @@ -1,10 +1,23 @@ # -# Set this variable to the top of the LLVM source tree. +# Configure the location of the LLVM object root. We know it is two +# directories up. The source tree location we do not know; let the LLVM +# Makefiles find it for us. # -LLVM_SRC_ROOT = $(LEVEL)/../.. +LLVM_OBJ_ROOT=$(LEVEL)/../.. # -# Include LLVM's Master Makefile. +# Grab the LLVM configuration file. # -include $(LLVM_SRC_ROOT)/Makefile.common +include $(LEVEL)/../../Makefile.config + +# +# Reconfigure the source directories +# +BUILD_SRC_ROOT:=$(LLVM_SRC_ROOT)/projects/ModuleMaker +BUILD_SRC_DIR := $(subst //,/,$(BUILD_SRC_ROOT)/$(patsubst $(BUILD_OBJ_ROOT)%,%,$(BUILD_OBJ_DIR))) + +# +# Include LLVM's build rules. +# +include $(LLVM_SRC_ROOT)/Makefile.rules diff --git a/projects/SmallExamples/ModuleMaker/Makefile.common b/projects/SmallExamples/ModuleMaker/Makefile.common index 9b34d87..b90ad9f 100644 --- a/projects/SmallExamples/ModuleMaker/Makefile.common +++ b/projects/SmallExamples/ModuleMaker/Makefile.common @@ -1,10 +1,23 @@ # -# Set this variable to the top of the LLVM source tree. +# Configure the location of the LLVM object root. We know it is two +# directories up. The source tree location we do not know; let the LLVM +# Makefiles find it for us. # -LLVM_SRC_ROOT = $(LEVEL)/../.. +LLVM_OBJ_ROOT=$(LEVEL)/../.. # -# Include LLVM's Master Makefile. +# Grab the LLVM configuration file. # -include $(LLVM_SRC_ROOT)/Makefile.common +include $(LEVEL)/../../Makefile.config + +# +# Reconfigure the source directories +# +BUILD_SRC_ROOT:=$(LLVM_SRC_ROOT)/projects/ModuleMaker +BUILD_SRC_DIR := $(subst //,/,$(BUILD_SRC_ROOT)/$(patsubst $(BUILD_OBJ_ROOT)%,%,$(BUILD_OBJ_DIR))) + +# +# Include LLVM's build rules. +# +include $(LLVM_SRC_ROOT)/Makefile.rules diff --git a/projects/sample/Makefile b/projects/sample/Makefile index 7b25c35..1fe32c7 100644 --- a/projects/sample/Makefile +++ b/projects/sample/Makefile @@ -10,7 +10,7 @@ LEVEL = . # # Directories that needs to be built. # -#DIRS = lib tools +DIRS = lib tools # # Include the Master Makefile that knows how to build all. diff --git a/projects/sample/Makefile.common b/projects/sample/Makefile.common index 9b34d87..7fa7185 100644 --- a/projects/sample/Makefile.common +++ b/projects/sample/Makefile.common @@ -1,10 +1,23 @@ # -# Set this variable to the top of the LLVM source tree. +# Configure the location of the LLVM object root. We know it is two +# directories up. The source tree location we do not know; let the LLVM +# Makefiles find it for us. # -LLVM_SRC_ROOT = $(LEVEL)/../.. +LLVM_OBJ_ROOT=$(LEVEL)/../.. # -# Include LLVM's Master Makefile. +# Grab the LLVM configuration file. # -include $(LLVM_SRC_ROOT)/Makefile.common +include $(LEVEL)/../../Makefile.config + +# +# Reconfigure the source directories +# +BUILD_SRC_ROOT:=$(LLVM_SRC_ROOT)/projects/sample +BUILD_SRC_DIR := $(subst //,/,$(BUILD_SRC_ROOT)/$(patsubst $(BUILD_OBJ_ROOT)%,%,$(BUILD_OBJ_DIR))) + +# +# Include LLVM's build rules. +# +include $(LLVM_SRC_ROOT)/Makefile.rules |