Revert "Adapt Makefile dependencies for the clang module format change in r230089."

llvm-svn: 230104

14 files changed, 33 insertions, 76 deletions

diff --git a/clang-tools-extra/clang-apply-replacements/tool/Makefile b/clang-tools-extra/clang-apply-replacements/tool/Makefile
index 7d0de340b3d..8c911720ebd 100644
--- a/clang-tools-extra/clang-apply-replacements/tool/Makefile
+++ b/clang-tools-extra/clang-apply-replacements/tool/Makefile
@@ -17,19 +17,12 @@ TOOL_NO_EXPORTS = 1
 
 SOURCES = ClangApplyReplacementsMain.cpp
 
-# Include this here so we can get the configuration of the targets that have
-# been configured for construction. We have to do this early so we can set up
-# LINK_COMPONENTS before including Makefile.rules
-include $(CLANG_LEVEL)/../../Makefile.config
-
-LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader bitwriter \
-                   instrumentation ipo support mc objcarcopts option
+LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader support mc mcparser option
 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 \
-           clangCodeGen.a
+	   clangAST.a clangASTMatchers.a clangEdit.a clangLex.a clangBasic.a
 
 include $(CLANG_LEVEL)/Makefile
 
diff --git a/clang-tools-extra/clang-modernize/tool/Makefile b/clang-tools-extra/clang-modernize/tool/Makefile
index 74f58eea1d5..efc361343ff 100644
--- a/clang-tools-extra/clang-modernize/tool/Makefile
+++ b/clang-tools-extra/clang-modernize/tool/Makefile
@@ -35,15 +35,12 @@ BUILT_SOURCES += $(ObjDir)/../PassByValue/.objdir
 SOURCES += $(addprefix ../ReplaceAutoPtr/,$(notdir $(wildcard $(PROJ_SRC_DIR)/../ReplaceAutoPtr/*.cpp)))
 BUILT_SOURCES += $(ObjDir)/../ReplaceAutoPtr/.objdir
 
-LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader bitwriter \
-                   instrumentation ipo support mc objcarcopts option
-
+LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader support mc mcparser option
 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 \
-           clangCodeGen.a
+	   clangAST.a clangASTMatchers.a clangEdit.a clangLex.a clangBasic.a
 
 include $(CLANG_LEVEL)/Makefile
 
diff --git a/clang-tools-extra/clang-query/tool/Makefile b/clang-tools-extra/clang-query/tool/Makefile
index f2b136004a6..f62b0b54131 100644
--- a/clang-tools-extra/clang-query/tool/Makefile
+++ b/clang-tools-extra/clang-query/tool/Makefile
@@ -17,13 +17,11 @@ TOOL_NO_EXPORTS = 1
 
 SOURCES = ClangQuery.cpp
 
-LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader bitwriter \
-                   instrumentation ipo support mc objcarcopts option
+LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader support mc mcparser option
 USEDLIBS = clangQuery.a clangDynamicASTMatchers.a clangFormat.a clangTooling.a \
 	   clangFrontend.a clangSerialization.a clangDriver.a clangRewriteFrontend.a \
 	   LLVMLineEditor.a clangRewrite.a clangParse.a clangSema.a clangAnalysis.a \
-	   clangAST.a clangASTMatchers.a clangEdit.a clangLex.a clangBasic.a \
-           clangCodeGen.a
+	   clangAST.a clangASTMatchers.a clangEdit.a clangLex.a clangBasic.a
 
 include $(CLANG_LEVEL)/Makefile
 
diff --git a/clang-tools-extra/clang-rename/tool/Makefile b/clang-tools-extra/clang-rename/tool/Makefile
index db933fd607f..b3d9555f37b 100644
--- a/clang-tools-extra/clang-rename/tool/Makefile
+++ b/clang-tools-extra/clang-rename/tool/Makefile
@@ -1,20 +1,13 @@
 CLANG_LEVEL := ../../../..
 TOOLNAME = clang-rename
 include $(CLANG_LEVEL)/../../Makefile.config
-# Include this here so we can get the configuration of the targets that have
-# been configured for construction. We have to do this early so we can set up
-# LINK_COMPONENTS before including Makefile.rules
-include $(CLANG_LEVEL)/../../Makefile.config
-
-LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader bitwriter \
-                   instrumentation ipo support mc objcarcopts option
+LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader support mc option
 USEDLIBS = clangRename.a clangFrontend.a clangSerialization.a clangDriver.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 \
-           clangCodeGen.a
+           clangRewrite.a clangEdit.a clangAST.a clangLex.a clangBasic.a
 
 include $(CLANG_LEVEL)/Makefile
 
diff --git a/clang-tools-extra/clang-tidy/tool/Makefile b/clang-tools-extra/clang-tidy/tool/Makefile
index da502775d0a..f2d83ebf229 100644
--- a/clang-tools-extra/clang-tidy/tool/Makefile
+++ b/clang-tools-extra/clang-tidy/tool/Makefile
@@ -15,8 +15,7 @@ TOOLNAME = clang-tidy
 TOOL_NO_EXPORTS = 1
 
 include $(CLANG_LEVEL)/../../Makefile.config
-LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader bitwriter \
-                   instrumentation ipo support mc objcarcopts option
+LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader support mc option
 USEDLIBS = clangTidy.a clangTidyLLVMModule.a clangTidyGoogleModule.a \
 	   clangTidyMiscModule.a clangTidyReadability.a clangTidyUtils.a \
 	   clangStaticAnalyzerFrontend.a clangStaticAnalyzerCheckers.a \
@@ -24,6 +23,6 @@ USEDLIBS = clangTidy.a clangTidyLLVMModule.a clangTidyGoogleModule.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 clangCodeGen.a
+	   clangEdit.a clangAST.a clangLex.a clangBasic.a
 
 include $(CLANG_LEVEL)/Makefile
diff --git a/clang-tools-extra/modularize/Makefile b/clang-tools-extra/modularize/Makefile
index e702c069043..f96540b751d 100644
--- a/clang-tools-extra/modularize/Makefile
+++ b/clang-tools-extra/modularize/Makefile
@@ -15,17 +15,10 @@ NO_INSTALL = 0
 # No plugins, optimize startup time.
 TOOL_NO_EXPORTS = 1
 
-# Include this here so we can get the configuration of the targets that have
-# been configured for construction. We have to do this early so we can set up
-# LINK_COMPONENTS before including Makefile.rules
-include $(CLANG_LEVEL)/../../Makefile.config
-
-LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser mcparser bitreader bitwriter \
-                   instrumentation ipo support transformutils mc objcarcopts option
-
+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 clangCodeGen.a
+           clangEdit.a clangAST.a clangLex.a clangBasic.a
 
 include $(CLANG_LEVEL)/Makefile
 
diff --git a/clang-tools-extra/pp-trace/Makefile b/clang-tools-extra/pp-trace/Makefile
index a4a277acc67..3467ecb31f4 100644
--- a/clang-tools-extra/pp-trace/Makefile
+++ b/clang-tools-extra/pp-trace/Makefile
@@ -14,16 +14,9 @@ TOOLNAME = pp-trace
 # No plugins, optimize startup time.
 TOOL_NO_EXPORTS = 1
 
-# Include this here so we can get the configuration of the targets that have
-# been configured for construction. We have to do this early so we can set up
-# LINK_COMPONENTS before including Makefile.rules
-include $(CLANG_LEVEL)/../../Makefile.config
-
-LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser mcparser bitreader bitwriter \
-                   instrumentation ipo support transformutils mc objcarcopts option
-
+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 clangCodeGen.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 d712f4b3e84..b4110c184b8 100644
--- a/clang-tools-extra/remove-cstr-calls/Makefile
+++ b/clang-tools-extra/remove-cstr-calls/Makefile
@@ -16,12 +16,10 @@ NO_INSTALL = 1
 TOOL_NO_EXPORTS = 1
 
 include $(CLANG_LEVEL)/../../Makefile.config
-LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader bitwriter \
-                   instrumentation ipo support mc objcarcopts option
+LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader support mc option
 USEDLIBS = clangTooling.a clangFrontend.a clangSerialization.a clangDriver.a \
            clangToolingCore.a clangRewriteFrontend.a clangRewrite.a \
            clangParse.a clangSema.a clangAnalysis.a \
-           clangAST.a clangASTMatchers.a clangEdit.a clangLex.a clangBasic.a \
-           clangCodeGen.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 05571f5bc20..8a461e4dc7c 100644
--- a/clang-tools-extra/tool-template/Makefile
+++ b/clang-tools-extra/tool-template/Makefile
@@ -15,16 +15,11 @@ NO_INSTALL = 1
 # No plugins, optimize startup time.
 TOOL_NO_EXPORTS = 1
 
-# Include this here so we can get the configuration of the targets that have
-# been configured for construction. We have to do this early so we can set up
-# LINK_COMPONENTS before including Makefile.rules
 include $(CLANG_LEVEL)/../../Makefile.config
-LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader bitwriter \
-                   instrumentation ipo support mc objcarcopts option
+LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader support mc option
 USEDLIBS = clangTooling.a clangFrontend.a clangSerialization.a clangDriver.a \
            clangRewriteFrontend.a clangToolingCore.a clangRewrite.a \
            clangParse.a clangSema.a clangAnalysis.a \
-           clangAST.a clangASTMatchers.a clangEdit.a clangLex.a clangBasic.a \
-           clangCodeGen.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 c583d0f83e1..61bbf8bd571 100644
--- a/clang-tools-extra/unittests/clang-apply-replacements/Makefile
+++ b/clang-tools-extra/unittests/clang-apply-replacements/Makefile
@@ -11,14 +11,13 @@ CLANG_LEVEL = ../../../..
 include $(CLANG_LEVEL)/../../Makefile.config
 
 TESTNAME = ClangApplyReplacementsTests
-LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser mcparser bitreader bitwriter \
-                   instrumentation ipo support transformutils mc objcarcopts option
+LINK_COMPONENTS := asmparser bitreader support mc mcparser option \
+		TransformUtils
 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 \
-           clangCodeGen.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 c55ff127cd6..6f7bb16d32c 100644
--- a/clang-tools-extra/unittests/clang-modernize/Makefile
+++ b/clang-tools-extra/unittests/clang-modernize/Makefile
@@ -11,14 +11,14 @@ CLANG_LEVEL = ../../../..
 include $(CLANG_LEVEL)/../../Makefile.config
 
 TESTNAME = ClangModernizeTests
-LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser mcparser bitreader bitwriter \
-                   instrumentation ipo support transformutils mc objcarcopts option
+LINK_COMPONENTS := asmparser bitreader support MC MCParser option \
+		TransformUtils
 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 clangCodeGen.a
+           clangBasic.a
 
 include $(CLANG_LEVEL)/Makefile
 MAKEFILE_UNITTEST_NO_INCLUDE_COMMON := 1
diff --git a/clang-tools-extra/unittests/clang-query/Makefile b/clang-tools-extra/unittests/clang-query/Makefile
index b9426df8104..2ef1353c0a4 100644
--- a/clang-tools-extra/unittests/clang-query/Makefile
+++ b/clang-tools-extra/unittests/clang-query/Makefile
@@ -11,12 +11,12 @@ CLANG_LEVEL = ../../../..
 include $(CLANG_LEVEL)/../../Makefile.config
 
 TESTNAME = ClangQuery
-LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser mcparser bitreader bitwriter \
-                   instrumentation ipo support transformutils mc objcarcopts option
+LINK_COMPONENTS := asmparser bitreader support MC MCParser option \
+		 TransformUtils
 USEDLIBS = clangQuery.a clangTooling.a clangFrontend.a clangSerialization.a \
 	   clangDriver.a clangParse.a clangSema.a clangEdit.a clangAnalysis.a \
 	   clangAST.a clangASTMatchers.a clangDynamicASTMatchers.a clangLex.a \
-	   clangBasic.a clangCodeGen.a
+	   clangBasic.a
 
 include $(CLANG_LEVEL)/Makefile
 MAKEFILE_UNITTEST_NO_INCLUDE_COMMON := 1
diff --git a/clang-tools-extra/unittests/clang-rename/Makefile b/clang-tools-extra/unittests/clang-rename/Makefile
index 2634799fd52..d597e47583f 100644
--- a/clang-tools-extra/unittests/clang-rename/Makefile
+++ b/clang-tools-extra/unittests/clang-rename/Makefile
@@ -11,14 +11,13 @@ CLANG_LEVEL = ../../../..
 include $(CLANG_LEVEL)/../../Makefile.config
 
 TESTNAME = ClangRenameTests
-LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser mcparser bitreader bitwriter \
-                   instrumentation ipo support transformutils mc objcarcopts option
+LINK_COMPONENTS := asmparser bitreader support MC MCParser option \
+		 TransformUtils
 USEDLIBS = clangRename.a clangFrontend.a clangSerialization.a clangDriver.a \
            clangTooling.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 \
-           clangCodeGen.a
+           clangRewrite.a clangEdit.a clangAST.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 de651319e34..82a3a27cb65 100644
--- a/clang-tools-extra/unittests/clang-tidy/Makefile
+++ b/clang-tools-extra/unittests/clang-tidy/Makefile
@@ -11,8 +11,8 @@ CLANG_LEVEL = ../../../..
 include $(CLANG_LEVEL)/../../Makefile.config
 
 TESTNAME = ClangTidy
-LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser mcparser bitreader bitwriter \
-                   instrumentation ipo support transformutils mc objcarcopts option
+LINK_COMPONENTS := asmparser bitreader support MC MCParser option \
+		 TransformUtils
 USEDLIBS = clangTidy.a clangTidyLLVMModule.a clangTidyGoogleModule.a \
 	   clangTidyMiscModule.a clangTidyReadability.a clangTidy.a \
 	   clangTidyUtils.a \
@@ -22,7 +22,7 @@ USEDLIBS = clangTidy.a clangTidyLLVMModule.a clangTidyGoogleModule.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 clangCodeGen.a
+	   clangASTMatchers.a clangEdit.a clangLex.a clangBasic.a
 
 include $(CLANG_LEVEL)/Makefile
 MAKEFILE_UNITTEST_NO_INCLUDE_COMMON := 1