Convert the rest of the ocaml types and functions to use context.

[oota-llvm.git] / Makefile

diff --git a/Makefile b/Makefile
index fb82be8c3f41312d14edd5893fd0b0c4b5b44cfc..e750889ae45c6a55af0a92dde175ebbb09d66799 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -55,7 +55,8 @@ ifeq ($(MAKECMDGOALS),tools-only)
 endif
 
 ifeq ($(MAKECMDGOALS),install-clang)
-  DIRS := tools/clang/Driver tools/clang/lib/Headers tools/clang/tools/ccc
+  DIRS := tools/clang/tools/driver tools/clang/tools/clang-cc \
+       tools/clang/lib/Headers tools/clang/docs
   OPTIONAL_DIRS :=
   NO_INSTALL = 1
 endif
@@ -70,10 +71,9 @@ ifeq ($(MAKECMDGOALS),unittests)
   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)
-  DIRS := $(filter-out utils, $(DIRS))
   OPTIONAL_DIRS := $(filter bindings, $(OPTIONAL_DIRS))
 endif
 
@@ -134,6 +134,8 @@ install-libs: install
 #------------------------------------------------------------------------
 FilesToConfig := \
   include/llvm/Config/config.h \
+  include/llvm/Config/Targets.def \
+       include/llvm/Config/AsmPrinters.def \
   include/llvm/Support/DataTypes.h \
   include/llvm/ADT/iterator.h
 FilesToConfigPATH  := $(addprefix $(LLVM_OBJ_ROOT)/,$(FilesToConfig))
@@ -186,7 +188,7 @@ SVN = svn
 SVN-UPDATE-OPTIONS =
 AWK = awk
 SUB-SVN-DIRS = $(AWK) '/\?\ \ \ \ \ \ / {print $$2}'   \
-               | LANG=C xargs $(SVN) info 2>/dev/null \
+               | LC_ALL=C xargs $(SVN) info 2>/dev/null \
                | $(AWK) '/Path:\ / {print $$2}'
 
 update: