X-Git-Url: http://plrg.eecs.uci.edu/git/?p=oota-llvm.git;a=blobdiff_plain;f=Makefile.rules;h=47c5f7b5dea610ebc64e205b164e8b1f245390a5;hp=5c004b32478b1ccb17ef0c55d3a1106ad8fc0f27;hb=9534acbf774cd7918c1f412ec2aac1834eea24d5;hpb=36bc6424f2fef97ef8a2b7150e3fb9147c5901c8

diff --git a/Makefile.rules b/Makefile.rules
index 5c004b32478..47c5f7b5dea 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -32,9 +32,6 @@
 #
 # 6. LLVM_SRC_ROOT - If specified, points to the top of the LLVM source tree.
 #
-# 7. LLVM_OBJ_ROOT - If specified, points to the top directory where LLVM
-#    object files are placed.
-#
 # 8. BUILD_SRC_DIR - The directory which contains the current set of Makefiles
 #    and usually the source code too (unless SourceDir is set).
 #
@@ -46,15 +43,18 @@
 #     placed.
 #
 # For building,
-# 	LLVM, LLVM_SRC_ROOT = BUILD_SRC_ROOT, and
-# 	LLVM_OBJ_ROOT = BUILD_OBJ_ROOT.
+# 	LLVM, LLVM_SRC_ROOT = BUILD_SRC_ROOT
 #
 #===-----------------------------------------------------------------------====
 
 #
 # Configuration file to set paths specific to local installation of LLVM
 # 
+ifdef LLVM_SRC_ROOT
+include $(LLVM_SRC_ROOT)/Makefile.config
+else
 include $(LEVEL)/Makefile.config
+endif
 
 ###########################################################################
 # Directory Configuration
@@ -127,7 +127,7 @@ endif
 # Set the LLVM object directory.
 #
 ifndef LLVM_OBJ_ROOT
-LLVM_OBJ_ROOT := $(BUILD_OBJ_ROOT)
+LLVM_OBJ_ROOT := $(shell cd $(BUILD_OBJ_DIR); cd $(LLVM_SRC_ROOT); pwd)
 endif
 
 ###########################################################################
@@ -161,13 +161,13 @@ bytecode::
 
 # Print out the directories used for building
 prdirs::
-	echo "Home Offset      : " $(HOME_OBJ_ROOT)
-	echo "Build Source Root: " $(BUILD_SRC_ROOT)
-	echo "Build Source Dir : " $(BUILD_SRC_DIR)
-	echo "Build Object Root: " $(BUILD_OBJ_ROOT)
-	echo "Build Object Dir : " $(BUILD_OBJ_DIR)
-	echo "LLVM  Source Root: " $(LLVM_SRC_ROOT)
-	echo "LLVM  Object Root: " $(LLVM_OBJ_ROOT)
+	@echo "Home Offset      : " $(HOME_OBJ_ROOT)
+	@echo "Build Source Root: " $(BUILD_SRC_ROOT)
+	@echo "Build Source Dir : " $(BUILD_SRC_DIR)
+	@echo "Build Object Root: " $(BUILD_OBJ_ROOT)
+	@echo "Build Object Dir : " $(BUILD_OBJ_DIR)
+	@echo "LLVM  Source Root: " $(LLVM_SRC_ROOT)
+	@echo "LLVM  Object Root: " $(LLVM_OBJ_ROOT)
 
 ###########################################################################
 # Suffixes and implicit rules: