11 files changed, 22 insertions, 22 deletions
diff --git a/clang/lib/Analysis/CMakeLists.txt b/clang/lib/Analysis/CMakeLists.txt
index 850e9b46810..a2cfcfc4fa1 100644
--- a/clang/lib/Analysis/CMakeLists.txt
+++ b/clang/lib/Analysis/CMakeLists.txt
@@ -1,5 +1,7 @@
 set(LLVM_NO_RTTI 1)
 
+set(LLVM_USED_LIBS clangBasic clangAST clangIndex)
+
 add_clang_library(clangAnalysis
   AnalysisContext.cpp
   CFG.cpp
diff --git a/clang/lib/Checker/CMakeLists.txt b/clang/lib/Checker/CMakeLists.txt
index 5b54f0d12d5..76da8d815af 100644
--- a/clang/lib/Checker/CMakeLists.txt
+++ b/clang/lib/Checker/CMakeLists.txt
@@ -1,5 +1,7 @@
 set(LLVM_NO_RTTI 1)
 
+set(LLVM_USED_LIBS clangBasic clangLex clangAST clangFrontend clangRewrite)
+
 add_clang_library(clangChecker
   AdjustedReturnValueChecker.cpp
   AggExprVisitor.cpp
diff --git a/clang/lib/CodeGen/CMakeLists.txt b/clang/lib/CodeGen/CMakeLists.txt
index b5a23291f8a..1767a7d47be 100644
--- a/clang/lib/CodeGen/CMakeLists.txt
+++ b/clang/lib/CodeGen/CMakeLists.txt
@@ -1,5 +1,7 @@
 set(LLVM_NO_RTTI 1)
 
+set(LLVM_USED_LIBS clangBasic clangAST clangFrontend)
+
 add_clang_library(clangCodeGen
   BackendUtil.cpp
   CGBlocks.cpp
diff --git a/clang/lib/Driver/CMakeLists.txt b/clang/lib/Driver/CMakeLists.txt
index 00d076bb7eb..9d41b55981b 100644
--- a/clang/lib/Driver/CMakeLists.txt
+++ b/clang/lib/Driver/CMakeLists.txt
@@ -1,5 +1,7 @@
 set(LLVM_NO_RTTI 1)
 
+set(LLVM_USED_LIBS clangBasic clangAST clangParse)
+
 add_clang_library(clangDriver
   Action.cpp
   Arg.cpp
diff --git a/clang/lib/Frontend/CMakeLists.txt b/clang/lib/Frontend/CMakeLists.txt
index 756d17c0d43..ca8fbcf5f90 100644
--- a/clang/lib/Frontend/CMakeLists.txt
+++ b/clang/lib/Frontend/CMakeLists.txt
@@ -1,14 +1,9 @@
 set(LLVM_NO_RTTI 1)
 
 set( LLVM_USED_LIBS
-  clangSerialization
-  clangCodeGen
+  clangDriver
   clangParse
   clangSema
-  clangChecker
-  clangAnalysis
-  clangIndex
-  clangRewrite
   clangAST
   clangLex
   clangBasic
diff --git a/clang/lib/FrontendTool/CMakeLists.txt b/clang/lib/FrontendTool/CMakeLists.txt
index 26c9fc7b510..09d9e3419dc 100644
--- a/clang/lib/FrontendTool/CMakeLists.txt
+++ b/clang/lib/FrontendTool/CMakeLists.txt
@@ -1,5 +1,8 @@
 set(LLVM_NO_RTTI 1)
 
+set(LLVM_USED_LIBS clangDriver clangFrontend clangRewrite clangCodeGen 
+    clangChecker)
+
 add_clang_library(clangFrontendTool
   ExecuteCompilerInvocation.cpp
   )
diff --git a/clang/lib/Index/CMakeLists.txt b/clang/lib/Index/CMakeLists.txt
index ec39dffeba6..bbe9b567acf 100644
--- a/clang/lib/Index/CMakeLists.txt
+++ b/clang/lib/Index/CMakeLists.txt
@@ -1,5 +1,7 @@
 set(LLVM_NO_RTTI 1)
 
+set(LLVM_USED_LIBS clangBasic clangLex clangAST)
+
 set( LLVM_USED_LIBS
   clangSerialization
   clangFrontend
@@ -27,3 +29,6 @@ add_clang_library(clangIndex
   Program.cpp
   SelectorMap.cpp
   )
+
+add_dependencies(clangIndex ClangAttrClasses ClangAttrList
+                 ClangDeclNodes ClangStmtNodes)
diff --git a/clang/lib/Rewrite/CMakeLists.txt b/clang/lib/Rewrite/CMakeLists.txt
index 3be27025fdb..853a9c0b122 100644
--- a/clang/lib/Rewrite/CMakeLists.txt
+++ b/clang/lib/Rewrite/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(LLVM_NO_RTTI 1)
 
-set(LLVM_USED_LIBS clangBasic)
+set(LLVM_USED_LIBS clangBasic clangAST clangParse clangFrontend)
 
 add_clang_library(clangRewrite
   DeltaTree.cpp
diff --git a/clang/lib/Serialization/CMakeLists.txt b/clang/lib/Serialization/CMakeLists.txt
index d863c179bed..a3782180b32 100644
--- a/clang/lib/Serialization/CMakeLists.txt
+++ b/clang/lib/Serialization/CMakeLists.txt
@@ -1,5 +1,7 @@
 set(LLVM_NO_RTTI 1)
 
+set(LLVM_USED_LIBS clangFrontend)
+
 add_clang_library(clangSerialization
   GeneratePCH.cpp
   ASTCommon.cpp
diff --git a/clang/tools/c-index-test/CMakeLists.txt b/clang/tools/c-index-test/CMakeLists.txt
index 5cf2cd6ebf3..0cda6c4a31b 100644
--- a/clang/tools/c-index-test/CMakeLists.txt
+++ b/clang/tools/c-index-test/CMakeLists.txt
@@ -1,18 +1,6 @@
 set(LLVM_NO_RTTI 1)
 
-set( LLVM_USED_LIBS
-  libclang
-  clangIndex
-  clangFrontend
-  clangDriver
-  clangSerialization
-  clangParse
-  clangSema
-  clangAnalysis
-  clangAST
-  clangLex
-  clangBasic
-  )
+set(LLVM_USED_LIBS libclang)
 
 set( LLVM_LINK_COMPONENTS
   bitreader
diff --git a/clang/tools/libclang/CMakeLists.txt b/clang/tools/libclang/CMakeLists.txt
index 29ef574fff6..9a2a2a63cfd 100644
--- a/clang/tools/libclang/CMakeLists.txt
+++ b/clang/tools/libclang/CMakeLists.txt
@@ -6,9 +6,8 @@ set(LLVM_USED_LIBS
   clangFrontend
   clangDriver
   clangSerialization
-  clangParse
+  clangIndex
   clangSema
-  clangAnalysis
   clangAST
   clangLex
   clangBasic)