[llvm-commits] [llvm] r145157 - /llvm/trunk/Makefile

[Bob Wilson]

Author: bwilson
Date: Sat Nov 26 18:26:22 2011
New Revision: 145157

URL: http://llvm.org/viewvc/llvm-project?rev=145157&view=rev
Log:
Merge the install-clang-c target into install-clang.  <rdar://problem/10217046>

Modified:
    llvm/trunk/Makefile

Modified: llvm/trunk/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/Makefile?rev=145157&r1=145156&r2=145157&view=diff
==============================================================================
--- llvm/trunk/Makefile (original)
+++ llvm/trunk/Makefile Sat Nov 26 18:26:22 2011
@@ -68,20 +68,14 @@
 
 ifeq ($(MAKECMDGOALS),install-clang)
   DIRS := tools/clang/tools/driver tools/clang/lib/Headers \
+          tools/clang/tools/libclang tools/clang/tools/c-index-test \
+          tools/clang/include/clang-c \
           tools/clang/runtime tools/clang/docs \
           tools/lto runtime
   OPTIONAL_DIRS :=
   NO_INSTALL = 1
 endif
 
-ifeq ($(MAKECMDGOALS),install-clang-c)
-  DIRS := tools/clang/tools/driver tools/clang/lib/Headers \
-          tools/clang/tools/libclang tools/clang/tools/c-index-test \
-	  tools/clang/include/clang-c
-  OPTIONAL_DIRS :=
-  NO_INSTALL = 1
-endif
-
 ifeq ($(MAKECMDGOALS),clang-only)
   DIRS := $(filter-out tools docs unittests, $(DIRS)) \
           tools/clang tools/lto
@@ -169,7 +163,6 @@
 tools-only: all
 libs-only: all
 install-clang: install
-install-clang-c: install
 install-libs: install
 
 # If SHOW_DIAGNOSTICS is enabled, clear the diagnostics file first.