aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Dunbar <daniel@zuster.org>2011-10-27 21:25:09 +0000
committerDaniel Dunbar <daniel@zuster.org>2011-10-27 21:25:09 +0000
commitb42d47605b01ab4f6d46c1ba3c7512b70a2ef387 (patch)
tree43c71611240a08977d51f5188504d39718947fdc
parent824a70a384988aebbe3b46254a3631e81a8f0690 (diff)
downloadexternal_llvm-b42d47605b01ab4f6d46c1ba3c7512b70a2ef387.zip
external_llvm-b42d47605b01ab4f6d46c1ba3c7512b70a2ef387.tar.gz
external_llvm-b42d47605b01ab4f6d46c1ba3c7512b70a2ef387.tar.bz2
projects/sample: Switch over to imported Makefile setup.
- This will require you to manually reconfigure the projects/sample project (by running projects/config/sample/config.status --recheck) if you haven't updated/built since the 1st part of this commit went in. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@143148 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--projects/sample/Makefile.common.in8
1 files changed, 6 insertions, 2 deletions
diff --git a/projects/sample/Makefile.common.in b/projects/sample/Makefile.common.in
index ac08a52..758423b 100644
--- a/projects/sample/Makefile.common.in
+++ b/projects/sample/Makefile.common.in
@@ -18,5 +18,9 @@ PROJ_OBJ_ROOT := $(subst //,/,@abs_top_builddir@)
# Set the root directory of this project's install prefix
PROJ_INSTALL_ROOT := @prefix@
-# Include LLVM's Master Makefile.
-include $(LLVM_SRC_ROOT)/Makefile.common
+# Configuration file to set paths specific to local installation of LLVM
+include $(PROJ_OBJ_ROOT)/Makefile.llvm.config
+
+# Include all of the build rules used for making LLVM
+include $(PROJ_SRC_ROOT)/Makefile.llvm.rules
+