Change 'make install' to install tblgen, for better support of out-of-tree targets,

patch by Mikael Lepistö!

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@71226 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/Makefile b/Makefile
index 058eabcf4242d08be838c90999027e7f12e9c2b6..123595dc55ec212d5782bdf4a6415792b77700b8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -71,10 +71,9 @@ ifeq ($(MAKECMDGOALS),unittests)
   OPTIONAL_DIRS :=
 endif
 
   OPTIONAL_DIRS :=
 endif
 

-# Don't install utils, examples, or projects they are only used to
-# build LLVM.
+# Use NO_INSTALL define of the Makefile of each directory for deciding
+# if the directory is installed or not

 ifeq ($(MAKECMDGOALS),install)
 ifeq ($(MAKECMDGOALS),install)

-  DIRS := $(filter-out utils, $(DIRS))

   OPTIONAL_DIRS := $(filter bindings, $(OPTIONAL_DIRS))
 endif
 
   OPTIONAL_DIRS := $(filter bindings, $(OPTIONAL_DIRS))
 endif
 

diff --git a/utils/TableGen/Makefile b/utils/TableGen/Makefile
index ba0e157ec385b1e22155ec9bdda7c5cd8d4f647b..7ea88de05591d953245b493c00c595e5b376d8b1 100644 (file)
--- a/utils/TableGen/Makefile
+++ b/utils/TableGen/Makefile
@@ -9,7 +9,6 @@
 
 LEVEL = ../..
 TOOLNAME = tblgen
 
 LEVEL = ../..
 TOOLNAME = tblgen

-NO_INSTALL = 1;

 USEDLIBS = LLVMSupport.a LLVMSystem.a
 REQUIRES_EH := 1
 REQUIRES_RTTI := 1
 USEDLIBS = LLVMSupport.a LLVMSystem.a
 REQUIRES_EH := 1
 REQUIRES_RTTI := 1

diff --git a/utils/unittest/googletest/Makefile b/utils/unittest/googletest/Makefile
index 6e262413cc493dad6d180603d149ebe7b09b9b97..d709878449a65c661079bf1750cb60f1ede432aa 100644 (file)
--- a/utils/unittest/googletest/Makefile
+++ b/utils/unittest/googletest/Makefile
@@ -22,4 +22,6 @@ ifeq ($(OS),MingW)
   CPP.Flags += -DGTEST_OS_WINDOWS=1
 endif
 
   CPP.Flags += -DGTEST_OS_WINDOWS=1
 endif
 

+NO_INSTALL = 1
+

 include $(LEVEL)/Makefile.common
 include $(LEVEL)/Makefile.common