From a37fefd064c591969690933e113eab2dd6a60558 Mon Sep 17 00:00:00 2001 From: John Criswell Date: Sat, 6 Sep 2003 15:03:24 +0000 Subject: 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 --- projects/sample/Makefile | 2 +- projects/sample/Makefile.common | 21 +++++++++++++++++---- 2 files changed, 18 insertions(+), 5 deletions(-) (limited to 'projects/sample') diff --git a/projects/sample/Makefile b/projects/sample/Makefile index 7b25c355350..1fe32c795e9 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 9b34d875272..7fa7185ddd7 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 -- cgit v1.2.3