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

4 files changed, 52 insertions, 13 deletions

diff --git a/projects/ModuleMaker/Makefile.common b/projects/ModuleMaker/Makefile.common
index 9b34d87527..b90ad9f926 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 9b34d87527..b90ad9f926 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 7b25c35535..1fe32c795e 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 9b34d87527..7fa7185ddd 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