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 | bc4511c0744586572e31168154fc2d6a009298ac (patch) | |
tree | fb19ea0c8fb4597c70bee08c623bf4814cbe35b3 /llvm/projects/sample | |
parent | 0d1a26ddc2c3b8814e43b3225526097087329858 (diff) | |
download | bcm5719-llvm-bc4511c0744586572e31168154fc2d6a009298ac.tar.gz bcm5719-llvm-bc4511c0744586572e31168154fc2d6a009298ac.zip |
Checkin of autoconf-style object root.
Modified Makefiles to use the new Makefile setup in LLVM.
llvm-svn: 8380
Diffstat (limited to 'llvm/projects/sample')
-rw-r--r-- | llvm/projects/sample/Makefile | 2 | ||||
-rw-r--r-- | llvm/projects/sample/Makefile.common | 21 |
2 files changed, 18 insertions, 5 deletions
diff --git a/llvm/projects/sample/Makefile b/llvm/projects/sample/Makefile index 7b25c355350..1fe32c795e9 100644 --- a/llvm/projects/sample/Makefile +++ b/llvm/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/llvm/projects/sample/Makefile.common b/llvm/projects/sample/Makefile.common index 9b34d875272..7fa7185ddd7 100644 --- a/llvm/projects/sample/Makefile.common +++ b/llvm/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 |