Fix Makefiles after r220867.

llvm-svn: 220868

10 files changed, 30 insertions, 24 deletions

diff --git a/clang-tools-extra/clang-apply-replacements/tool/Makefile b/clang-tools-extra/clang-apply-replacements/tool/Makefile
index 6947f8fad21..8c911720ebd 100644
--- a/clang-tools-extra/clang-apply-replacements/tool/Makefile
+++ b/clang-tools-extra/clang-apply-replacements/tool/Makefile
@@ -18,7 +18,8 @@ TOOL_NO_EXPORTS = 1
 SOURCES = ClangApplyReplacementsMain.cpp
 
 LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader support mc mcparser option
-USEDLIBS = clangApplyReplacements.a clangFormat.a clangTooling.a clangFrontend.a \
+USEDLIBS = clangApplyReplacements.a clangFormat.a \
+	   clangTooling.a clangToolingCore.a clangFrontend.a \
 	   clangSerialization.a clangDriver.a clangRewriteFrontend.a \
 	   clangRewrite.a clangParse.a clangSema.a clangAnalysis.a \
 	   clangAST.a clangASTMatchers.a clangEdit.a clangLex.a clangBasic.a
diff --git a/clang-tools-extra/clang-modernize/tool/Makefile b/clang-tools-extra/clang-modernize/tool/Makefile
index 2d3a6277de2..efc361343ff 100644
--- a/clang-tools-extra/clang-modernize/tool/Makefile
+++ b/clang-tools-extra/clang-modernize/tool/Makefile
@@ -36,7 +36,8 @@ SOURCES += $(addprefix ../ReplaceAutoPtr/,$(notdir $(wildcard $(PROJ_SRC_DIR)/..
 BUILT_SOURCES += $(ObjDir)/../ReplaceAutoPtr/.objdir
 
 LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader support mc mcparser option
-USEDLIBS = modernizeCore.a clangFormat.a clangTooling.a clangFrontend.a \
+USEDLIBS = modernizeCore.a clangFormat.a \
+	   clangTooling.a clangToolingCore.a clangFrontend.a \
 	   clangSerialization.a clangDriver.a clangRewriteFrontend.a \
 	   clangRewrite.a clangParse.a clangSema.a clangAnalysis.a \
 	   clangAST.a clangASTMatchers.a clangEdit.a clangLex.a clangBasic.a
diff --git a/clang-tools-extra/clang-rename/tool/Makefile b/clang-tools-extra/clang-rename/tool/Makefile
index 9c1fa99272b..b3d9555f37b 100644
--- a/clang-tools-extra/clang-rename/tool/Makefile
+++ b/clang-tools-extra/clang-rename/tool/Makefile
@@ -3,7 +3,8 @@ TOOLNAME = clang-rename
 include $(CLANG_LEVEL)/../../Makefile.config
 LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader support mc option
 USEDLIBS = clangRename.a clangFrontend.a clangSerialization.a clangDriver.a \
-           clangTooling.a clangParse.a clangSema.a clangIndex.a \
+           clangTooling.a clangToolingCore.a \
+	   clangParse.a clangSema.a clangIndex.a \
            clangStaticAnalyzerFrontend.a clangStaticAnalyzerCheckers.a \
            clangStaticAnalyzerCore.a clangAnalysis.a clangRewriteFrontend.a \
            clangRewrite.a clangEdit.a clangAST.a clangLex.a clangBasic.a
diff --git a/clang-tools-extra/clang-tidy/tool/Makefile b/clang-tools-extra/clang-tidy/tool/Makefile
index 29b05dc9b93..f2d83ebf229 100644
--- a/clang-tools-extra/clang-tidy/tool/Makefile
+++ b/clang-tools-extra/clang-tidy/tool/Makefile
@@ -20,9 +20,9 @@ USEDLIBS = clangTidy.a clangTidyLLVMModule.a clangTidyGoogleModule.a \
 	   clangTidyMiscModule.a clangTidyReadability.a clangTidyUtils.a \
 	   clangStaticAnalyzerFrontend.a clangStaticAnalyzerCheckers.a \
 	   clangStaticAnalyzerCore.a \
-	   clangFormat.a clangASTMatchers.a clangTooling.a clangFrontend.a \
-	   clangSerialization.a clangDriver.a clangParse.a clangSema.a \
-	   clangAnalysis.a clangRewriteFrontend.a clangRewrite.a \
+	   clangFormat.a clangASTMatchers.a clangTooling.a clangToolingCore.a \
+	   clangFrontend.a clangSerialization.a clangDriver.a clangParse.a \
+	   clangSema.a clangAnalysis.a clangRewriteFrontend.a clangRewrite.a \
 	   clangEdit.a clangAST.a clangLex.a clangBasic.a
 
 include $(CLANG_LEVEL)/Makefile
diff --git a/clang-tools-extra/module-map-checker/Makefile b/clang-tools-extra/module-map-checker/Makefile
index e549828eab2..264c52011e9 100644
--- a/clang-tools-extra/module-map-checker/Makefile
+++ b/clang-tools-extra/module-map-checker/Makefile
@@ -17,8 +17,8 @@ TOOL_NO_EXPORTS = 1
 
 LINK_COMPONENTS := mcparser bitreader support mc option TransformUtils
 USEDLIBS = clangFrontend.a clangSerialization.a clangDriver.a \
-           clangTooling.a clangParse.a clangSema.a clangAnalysis.a \
-           clangEdit.a clangAST.a clangLex.a clangBasic.a
+           clangTooling.a clangToolingCore.a clangParse.a clangSema.a \
+	   clangAnalysis.a clangEdit.a clangAST.a clangLex.a clangBasic.a
 
 include $(CLANG_LEVEL)/Makefile
 
diff --git a/clang-tools-extra/remove-cstr-calls/Makefile b/clang-tools-extra/remove-cstr-calls/Makefile
index 31621089176..b4110c184b8 100644
--- a/clang-tools-extra/remove-cstr-calls/Makefile
+++ b/clang-tools-extra/remove-cstr-calls/Makefile
@@ -18,8 +18,8 @@ TOOL_NO_EXPORTS = 1
 include $(CLANG_LEVEL)/../../Makefile.config
 LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader support mc option
 USEDLIBS = clangTooling.a clangFrontend.a clangSerialization.a clangDriver.a \
-					 clangRewriteFrontend.a clangRewrite.a \
-					 clangParse.a clangSema.a clangAnalysis.a \
-					 clangAST.a clangASTMatchers.a clangEdit.a clangLex.a clangBasic.a
+           clangToolingCore.a clangRewriteFrontend.a clangRewrite.a \
+           clangParse.a clangSema.a clangAnalysis.a \
+           clangAST.a clangASTMatchers.a clangEdit.a clangLex.a clangBasic.a
 
 include $(CLANG_LEVEL)/Makefile
diff --git a/clang-tools-extra/tool-template/Makefile b/clang-tools-extra/tool-template/Makefile
index fbc4e2f09b2..8a461e4dc7c 100644
--- a/clang-tools-extra/tool-template/Makefile
+++ b/clang-tools-extra/tool-template/Makefile
@@ -18,8 +18,8 @@ TOOL_NO_EXPORTS = 1
 include $(CLANG_LEVEL)/../../Makefile.config
 LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader support mc option
 USEDLIBS = clangTooling.a clangFrontend.a clangSerialization.a clangDriver.a \
-					 clangRewriteFrontend.a clangRewrite.a \
-					 clangParse.a clangSema.a clangAnalysis.a \
-					 clangAST.a clangASTMatchers.a clangEdit.a clangLex.a clangBasic.a
+           clangRewriteFrontend.a clangToolingCore.a clangRewrite.a \
+           clangParse.a clangSema.a clangAnalysis.a \
+           clangAST.a clangASTMatchers.a clangEdit.a clangLex.a clangBasic.a
 
 include $(CLANG_LEVEL)/Makefile
diff --git a/clang-tools-extra/unittests/clang-apply-replacements/Makefile b/clang-tools-extra/unittests/clang-apply-replacements/Makefile
index a92faa76181..61bbf8bd571 100644
--- a/clang-tools-extra/unittests/clang-apply-replacements/Makefile
+++ b/clang-tools-extra/unittests/clang-apply-replacements/Makefile
@@ -13,10 +13,11 @@ include $(CLANG_LEVEL)/../../Makefile.config
 TESTNAME = ClangApplyReplacementsTests
 LINK_COMPONENTS := asmparser bitreader support mc mcparser option \
 		TransformUtils
-USEDLIBS = clangApplyReplacements.a clangFormat.a clangTooling.a clangFrontend.a \
-		clangSerialization.a clangDriver.a clangRewriteFrontend.a \
-		clangRewrite.a clangParse.a clangSema.a clangAnalysis.a \
-		clangAST.a clangASTMatchers.a clangEdit.a clangLex.a clangBasic.a
+USEDLIBS = clangApplyReplacements.a clangFormat.a clangTooling.a \
+	   clangToolingCore.a clangFrontend.a \
+           clangSerialization.a clangDriver.a clangRewriteFrontend.a \
+           clangRewrite.a clangParse.a clangSema.a clangAnalysis.a \
+           clangAST.a clangASTMatchers.a clangEdit.a clangLex.a clangBasic.a
 
 include $(CLANG_LEVEL)/Makefile
 MAKEFILE_UNITTEST_NO_INCLUDE_COMMON := 1
diff --git a/clang-tools-extra/unittests/clang-modernize/Makefile b/clang-tools-extra/unittests/clang-modernize/Makefile
index 72ae2137223..6f7bb16d32c 100644
--- a/clang-tools-extra/unittests/clang-modernize/Makefile
+++ b/clang-tools-extra/unittests/clang-modernize/Makefile
@@ -13,11 +13,12 @@ include $(CLANG_LEVEL)/../../Makefile.config
 TESTNAME = ClangModernizeTests
 LINK_COMPONENTS := asmparser bitreader support MC MCParser option \
 		TransformUtils
-USEDLIBS = modernizeCore.a clangFormat.a clangApplyReplacements.a clangTooling.a clangFrontend.a \
-		clangSerialization.a clangDriver.a clangRewriteFrontend.a \
-		clangRewrite.a clangParse.a clangSema.a clangAnalysis.a \
-		clangAST.a clangASTMatchers.a clangEdit.a clangLex.a \
-		clangBasic.a
+USEDLIBS = modernizeCore.a clangFormat.a clangApplyReplacements.a \
+	   clangTooling.a clangToolingCore.a clangFrontend.a \
+           clangSerialization.a clangDriver.a clangRewriteFrontend.a \
+           clangRewrite.a clangParse.a clangSema.a clangAnalysis.a \
+           clangAST.a clangASTMatchers.a clangEdit.a clangLex.a \
+           clangBasic.a
 
 include $(CLANG_LEVEL)/Makefile
 MAKEFILE_UNITTEST_NO_INCLUDE_COMMON := 1
diff --git a/clang-tools-extra/unittests/clang-tidy/Makefile b/clang-tools-extra/unittests/clang-tidy/Makefile
index 627d813a547..82a3a27cb65 100644
--- a/clang-tools-extra/unittests/clang-tidy/Makefile
+++ b/clang-tools-extra/unittests/clang-tidy/Makefile
@@ -18,7 +18,8 @@ USEDLIBS = clangTidy.a clangTidyLLVMModule.a clangTidyGoogleModule.a \
 	   clangTidyUtils.a \
 	   clangStaticAnalyzerFrontend.a clangStaticAnalyzerCheckers.a \
 	   clangStaticAnalyzerCore.a \
-	   clangFormat.a clangTooling.a clangFrontend.a clangSerialization.a \
+	   clangFormat.a clangTooling.a clangToolingCore.a \
+	   clangFrontend.a clangSerialization.a \
 	   clangDriver.a clangRewriteFrontend.a clangRewrite.a \
 	   clangParse.a clangSema.a clangAnalysis.a clangAST.a \
 	   clangASTMatchers.a clangEdit.a clangLex.a clangBasic.a