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

llvm-svn: 230090
This commit is contained in:
Adrian Prantl 2015-02-20 23:35:07 +00:00
parent f2b0cd91eb
commit 6897e3e456
14 changed files with 76 additions and 33 deletions

View File

@ -17,12 +17,19 @@ TOOL_NO_EXPORTS = 1
SOURCES = ClangApplyReplacementsMain.cpp SOURCES = ClangApplyReplacementsMain.cpp
LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader support mc mcparser option # 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
USEDLIBS = clangApplyReplacements.a clangFormat.a \ USEDLIBS = clangApplyReplacements.a clangFormat.a \
clangTooling.a clangToolingCore.a clangFrontend.a \ clangTooling.a clangToolingCore.a clangFrontend.a \
clangSerialization.a clangDriver.a clangRewriteFrontend.a \ clangSerialization.a clangDriver.a clangRewriteFrontend.a \
clangRewrite.a clangParse.a clangSema.a clangAnalysis.a \ clangRewrite.a clangParse.a clangSema.a clangAnalysis.a \
clangAST.a clangASTMatchers.a clangEdit.a clangLex.a clangBasic.a clangAST.a clangASTMatchers.a clangEdit.a clangLex.a clangBasic.a \
clangCodeGen.a
include $(CLANG_LEVEL)/Makefile include $(CLANG_LEVEL)/Makefile

View File

@ -35,12 +35,15 @@ BUILT_SOURCES += $(ObjDir)/../PassByValue/.objdir
SOURCES += $(addprefix ../ReplaceAutoPtr/,$(notdir $(wildcard $(PROJ_SRC_DIR)/../ReplaceAutoPtr/*.cpp))) SOURCES += $(addprefix ../ReplaceAutoPtr/,$(notdir $(wildcard $(PROJ_SRC_DIR)/../ReplaceAutoPtr/*.cpp)))
BUILT_SOURCES += $(ObjDir)/../ReplaceAutoPtr/.objdir BUILT_SOURCES += $(ObjDir)/../ReplaceAutoPtr/.objdir
LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader support mc mcparser option LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader bitwriter \
instrumentation ipo support mc objcarcopts option
USEDLIBS = modernizeCore.a clangFormat.a \ USEDLIBS = modernizeCore.a clangFormat.a \
clangTooling.a clangToolingCore.a clangFrontend.a \ clangTooling.a clangToolingCore.a clangFrontend.a \
clangSerialization.a clangDriver.a clangRewriteFrontend.a \ clangSerialization.a clangDriver.a clangRewriteFrontend.a \
clangRewrite.a clangParse.a clangSema.a clangAnalysis.a \ clangRewrite.a clangParse.a clangSema.a clangAnalysis.a \
clangAST.a clangASTMatchers.a clangEdit.a clangLex.a clangBasic.a clangAST.a clangASTMatchers.a clangEdit.a clangLex.a clangBasic.a \
clangCodeGen.a
include $(CLANG_LEVEL)/Makefile include $(CLANG_LEVEL)/Makefile

View File

@ -17,11 +17,13 @@ TOOL_NO_EXPORTS = 1
SOURCES = ClangQuery.cpp SOURCES = ClangQuery.cpp
LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader support mc mcparser option LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader bitwriter \
instrumentation ipo support mc objcarcopts option
USEDLIBS = clangQuery.a clangDynamicASTMatchers.a clangFormat.a clangTooling.a \ USEDLIBS = clangQuery.a clangDynamicASTMatchers.a clangFormat.a clangTooling.a \
clangFrontend.a clangSerialization.a clangDriver.a clangRewriteFrontend.a \ clangFrontend.a clangSerialization.a clangDriver.a clangRewriteFrontend.a \
LLVMLineEditor.a clangRewrite.a clangParse.a clangSema.a clangAnalysis.a \ LLVMLineEditor.a clangRewrite.a clangParse.a clangSema.a clangAnalysis.a \
clangAST.a clangASTMatchers.a clangEdit.a clangLex.a clangBasic.a clangAST.a clangASTMatchers.a clangEdit.a clangLex.a clangBasic.a \
clangCodeGen.a
include $(CLANG_LEVEL)/Makefile include $(CLANG_LEVEL)/Makefile

View File

@ -1,13 +1,20 @@
CLANG_LEVEL := ../../../.. CLANG_LEVEL := ../../../..
TOOLNAME = clang-rename TOOLNAME = clang-rename
include $(CLANG_LEVEL)/../../Makefile.config include $(CLANG_LEVEL)/../../Makefile.config
LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader support mc option # 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
USEDLIBS = clangRename.a clangFrontend.a clangSerialization.a clangDriver.a \ USEDLIBS = clangRename.a clangFrontend.a clangSerialization.a clangDriver.a \
clangTooling.a clangToolingCore.a \ clangTooling.a clangToolingCore.a \
clangParse.a clangSema.a clangIndex.a \ clangParse.a clangSema.a clangIndex.a \
clangStaticAnalyzerFrontend.a clangStaticAnalyzerCheckers.a \ clangStaticAnalyzerFrontend.a clangStaticAnalyzerCheckers.a \
clangStaticAnalyzerCore.a clangAnalysis.a clangRewriteFrontend.a \ clangStaticAnalyzerCore.a clangAnalysis.a clangRewriteFrontend.a \
clangRewrite.a clangEdit.a clangAST.a clangLex.a clangBasic.a clangRewrite.a clangEdit.a clangAST.a clangLex.a clangBasic.a \
clangCodeGen.a
include $(CLANG_LEVEL)/Makefile include $(CLANG_LEVEL)/Makefile

View File

@ -15,7 +15,8 @@ TOOLNAME = clang-tidy
TOOL_NO_EXPORTS = 1 TOOL_NO_EXPORTS = 1
include $(CLANG_LEVEL)/../../Makefile.config include $(CLANG_LEVEL)/../../Makefile.config
LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader support mc option LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader bitwriter \
instrumentation ipo support mc objcarcopts option
USEDLIBS = clangTidy.a clangTidyLLVMModule.a clangTidyGoogleModule.a \ USEDLIBS = clangTidy.a clangTidyLLVMModule.a clangTidyGoogleModule.a \
clangTidyMiscModule.a clangTidyReadability.a clangTidyUtils.a \ clangTidyMiscModule.a clangTidyReadability.a clangTidyUtils.a \
clangStaticAnalyzerFrontend.a clangStaticAnalyzerCheckers.a \ clangStaticAnalyzerFrontend.a clangStaticAnalyzerCheckers.a \
@ -23,6 +24,6 @@ USEDLIBS = clangTidy.a clangTidyLLVMModule.a clangTidyGoogleModule.a \
clangFormat.a clangASTMatchers.a clangTooling.a clangToolingCore.a \ clangFormat.a clangASTMatchers.a clangTooling.a clangToolingCore.a \
clangFrontend.a clangSerialization.a clangDriver.a clangParse.a \ clangFrontend.a clangSerialization.a clangDriver.a clangParse.a \
clangSema.a clangAnalysis.a clangRewriteFrontend.a clangRewrite.a \ clangSema.a clangAnalysis.a clangRewriteFrontend.a clangRewrite.a \
clangEdit.a clangAST.a clangLex.a clangBasic.a clangEdit.a clangAST.a clangLex.a clangBasic.a clangCodeGen.a
include $(CLANG_LEVEL)/Makefile include $(CLANG_LEVEL)/Makefile

View File

@ -15,10 +15,17 @@ NO_INSTALL = 0
# No plugins, optimize startup time. # No plugins, optimize startup time.
TOOL_NO_EXPORTS = 1 TOOL_NO_EXPORTS = 1
LINK_COMPONENTS := mcparser bitreader support mc option TransformUtils # 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
USEDLIBS = clangFrontend.a clangSerialization.a clangDriver.a \ USEDLIBS = clangFrontend.a clangSerialization.a clangDriver.a \
clangTooling.a clangParse.a clangSema.a clangAnalysis.a \ clangTooling.a clangParse.a clangSema.a clangAnalysis.a \
clangEdit.a clangAST.a clangLex.a clangBasic.a clangEdit.a clangAST.a clangLex.a clangBasic.a clangCodeGen.a
include $(CLANG_LEVEL)/Makefile include $(CLANG_LEVEL)/Makefile

View File

@ -14,9 +14,16 @@ TOOLNAME = pp-trace
# No plugins, optimize startup time. # No plugins, optimize startup time.
TOOL_NO_EXPORTS = 1 TOOL_NO_EXPORTS = 1
LINK_COMPONENTS := mcparser bitreader support mc option TransformUtils # 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
USEDLIBS = clangFrontend.a clangSerialization.a clangDriver.a \ USEDLIBS = clangFrontend.a clangSerialization.a clangDriver.a \
clangTooling.a clangParse.a clangSema.a clangAnalysis.a \ clangTooling.a clangParse.a clangSema.a clangAnalysis.a \
clangEdit.a clangAST.a clangLex.a clangBasic.a clangEdit.a clangAST.a clangLex.a clangBasic.a clangCodeGen.a
include $(CLANG_LEVEL)/Makefile include $(CLANG_LEVEL)/Makefile

View File

@ -16,10 +16,12 @@ NO_INSTALL = 1
TOOL_NO_EXPORTS = 1 TOOL_NO_EXPORTS = 1
include $(CLANG_LEVEL)/../../Makefile.config include $(CLANG_LEVEL)/../../Makefile.config
LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader support mc option LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader bitwriter \
instrumentation ipo support mc objcarcopts option
USEDLIBS = clangTooling.a clangFrontend.a clangSerialization.a clangDriver.a \ USEDLIBS = clangTooling.a clangFrontend.a clangSerialization.a clangDriver.a \
clangToolingCore.a clangRewriteFrontend.a clangRewrite.a \ clangToolingCore.a clangRewriteFrontend.a clangRewrite.a \
clangParse.a clangSema.a clangAnalysis.a \ clangParse.a clangSema.a clangAnalysis.a \
clangAST.a clangASTMatchers.a clangEdit.a clangLex.a clangBasic.a clangAST.a clangASTMatchers.a clangEdit.a clangLex.a clangBasic.a \
clangCodeGen.a
include $(CLANG_LEVEL)/Makefile include $(CLANG_LEVEL)/Makefile

View File

@ -15,11 +15,16 @@ NO_INSTALL = 1
# No plugins, optimize startup time. # No plugins, optimize startup time.
TOOL_NO_EXPORTS = 1 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 include $(CLANG_LEVEL)/../../Makefile.config
LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader support mc option LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader bitwriter \
instrumentation ipo support mc objcarcopts option
USEDLIBS = clangTooling.a clangFrontend.a clangSerialization.a clangDriver.a \ USEDLIBS = clangTooling.a clangFrontend.a clangSerialization.a clangDriver.a \
clangRewriteFrontend.a clangToolingCore.a clangRewrite.a \ clangRewriteFrontend.a clangToolingCore.a clangRewrite.a \
clangParse.a clangSema.a clangAnalysis.a \ clangParse.a clangSema.a clangAnalysis.a \
clangAST.a clangASTMatchers.a clangEdit.a clangLex.a clangBasic.a clangAST.a clangASTMatchers.a clangEdit.a clangLex.a clangBasic.a \
clangCodeGen.a
include $(CLANG_LEVEL)/Makefile include $(CLANG_LEVEL)/Makefile

View File

@ -11,13 +11,14 @@ CLANG_LEVEL = ../../../..
include $(CLANG_LEVEL)/../../Makefile.config include $(CLANG_LEVEL)/../../Makefile.config
TESTNAME = ClangApplyReplacementsTests TESTNAME = ClangApplyReplacementsTests
LINK_COMPONENTS := asmparser bitreader support mc mcparser option \ LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser mcparser bitreader bitwriter \
TransformUtils instrumentation ipo support transformutils mc objcarcopts option
USEDLIBS = clangApplyReplacements.a clangFormat.a clangTooling.a \ USEDLIBS = clangApplyReplacements.a clangFormat.a clangTooling.a \
clangToolingCore.a clangFrontend.a \ clangToolingCore.a clangFrontend.a \
clangSerialization.a clangDriver.a clangRewriteFrontend.a \ clangSerialization.a clangDriver.a clangRewriteFrontend.a \
clangRewrite.a clangParse.a clangSema.a clangAnalysis.a \ clangRewrite.a clangParse.a clangSema.a clangAnalysis.a \
clangAST.a clangASTMatchers.a clangEdit.a clangLex.a clangBasic.a clangAST.a clangASTMatchers.a clangEdit.a clangLex.a clangBasic.a \
clangCodeGen.a
include $(CLANG_LEVEL)/Makefile include $(CLANG_LEVEL)/Makefile
MAKEFILE_UNITTEST_NO_INCLUDE_COMMON := 1 MAKEFILE_UNITTEST_NO_INCLUDE_COMMON := 1

View File

@ -11,14 +11,14 @@ CLANG_LEVEL = ../../../..
include $(CLANG_LEVEL)/../../Makefile.config include $(CLANG_LEVEL)/../../Makefile.config
TESTNAME = ClangModernizeTests TESTNAME = ClangModernizeTests
LINK_COMPONENTS := asmparser bitreader support MC MCParser option \ LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser mcparser bitreader bitwriter \
TransformUtils instrumentation ipo support transformutils mc objcarcopts option
USEDLIBS = modernizeCore.a clangFormat.a clangApplyReplacements.a \ USEDLIBS = modernizeCore.a clangFormat.a clangApplyReplacements.a \
clangTooling.a clangToolingCore.a clangFrontend.a \ clangTooling.a clangToolingCore.a clangFrontend.a \
clangSerialization.a clangDriver.a clangRewriteFrontend.a \ clangSerialization.a clangDriver.a clangRewriteFrontend.a \
clangRewrite.a clangParse.a clangSema.a clangAnalysis.a \ clangRewrite.a clangParse.a clangSema.a clangAnalysis.a \
clangAST.a clangASTMatchers.a clangEdit.a clangLex.a \ clangAST.a clangASTMatchers.a clangEdit.a clangLex.a \
clangBasic.a clangBasic.a clangCodeGen.a
include $(CLANG_LEVEL)/Makefile include $(CLANG_LEVEL)/Makefile
MAKEFILE_UNITTEST_NO_INCLUDE_COMMON := 1 MAKEFILE_UNITTEST_NO_INCLUDE_COMMON := 1

View File

@ -11,12 +11,12 @@ CLANG_LEVEL = ../../../..
include $(CLANG_LEVEL)/../../Makefile.config include $(CLANG_LEVEL)/../../Makefile.config
TESTNAME = ClangQuery TESTNAME = ClangQuery
LINK_COMPONENTS := asmparser bitreader support MC MCParser option \ LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser mcparser bitreader bitwriter \
TransformUtils instrumentation ipo support transformutils mc objcarcopts option
USEDLIBS = clangQuery.a clangTooling.a clangFrontend.a clangSerialization.a \ USEDLIBS = clangQuery.a clangTooling.a clangFrontend.a clangSerialization.a \
clangDriver.a clangParse.a clangSema.a clangEdit.a clangAnalysis.a \ clangDriver.a clangParse.a clangSema.a clangEdit.a clangAnalysis.a \
clangAST.a clangASTMatchers.a clangDynamicASTMatchers.a clangLex.a \ clangAST.a clangASTMatchers.a clangDynamicASTMatchers.a clangLex.a \
clangBasic.a clangBasic.a clangCodeGen.a
include $(CLANG_LEVEL)/Makefile include $(CLANG_LEVEL)/Makefile
MAKEFILE_UNITTEST_NO_INCLUDE_COMMON := 1 MAKEFILE_UNITTEST_NO_INCLUDE_COMMON := 1

View File

@ -11,13 +11,14 @@ CLANG_LEVEL = ../../../..
include $(CLANG_LEVEL)/../../Makefile.config include $(CLANG_LEVEL)/../../Makefile.config
TESTNAME = ClangRenameTests TESTNAME = ClangRenameTests
LINK_COMPONENTS := asmparser bitreader support MC MCParser option \ LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser mcparser bitreader bitwriter \
TransformUtils instrumentation ipo support transformutils mc objcarcopts option
USEDLIBS = clangRename.a clangFrontend.a clangSerialization.a clangDriver.a \ USEDLIBS = clangRename.a clangFrontend.a clangSerialization.a clangDriver.a \
clangTooling.a clangParse.a clangSema.a clangIndex.a \ clangTooling.a clangParse.a clangSema.a clangIndex.a \
clangStaticAnalyzerFrontend.a clangStaticAnalyzerCheckers.a \ clangStaticAnalyzerFrontend.a clangStaticAnalyzerCheckers.a \
clangStaticAnalyzerCore.a clangAnalysis.a clangRewriteFrontend.a \ clangStaticAnalyzerCore.a clangAnalysis.a clangRewriteFrontend.a \
clangRewrite.a clangEdit.a clangAST.a clangLex.a clangBasic.a clangRewrite.a clangEdit.a clangAST.a clangLex.a clangBasic.a \
clangCodeGen.a
include $(CLANG_LEVEL)/Makefile include $(CLANG_LEVEL)/Makefile
MAKEFILE_UNITTEST_NO_INCLUDE_COMMON := 1 MAKEFILE_UNITTEST_NO_INCLUDE_COMMON := 1

View File

@ -11,8 +11,8 @@ CLANG_LEVEL = ../../../..
include $(CLANG_LEVEL)/../../Makefile.config include $(CLANG_LEVEL)/../../Makefile.config
TESTNAME = ClangTidy TESTNAME = ClangTidy
LINK_COMPONENTS := asmparser bitreader support MC MCParser option \ LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser mcparser bitreader bitwriter \
TransformUtils instrumentation ipo support transformutils mc objcarcopts option
USEDLIBS = clangTidy.a clangTidyLLVMModule.a clangTidyGoogleModule.a \ USEDLIBS = clangTidy.a clangTidyLLVMModule.a clangTidyGoogleModule.a \
clangTidyMiscModule.a clangTidyReadability.a clangTidy.a \ clangTidyMiscModule.a clangTidyReadability.a clangTidy.a \
clangTidyUtils.a \ clangTidyUtils.a \
@ -22,7 +22,7 @@ USEDLIBS = clangTidy.a clangTidyLLVMModule.a clangTidyGoogleModule.a \
clangFrontend.a clangSerialization.a \ clangFrontend.a clangSerialization.a \
clangDriver.a clangRewriteFrontend.a clangRewrite.a \ clangDriver.a clangRewriteFrontend.a clangRewrite.a \
clangParse.a clangSema.a clangAnalysis.a clangAST.a \ clangParse.a clangSema.a clangAnalysis.a clangAST.a \
clangASTMatchers.a clangEdit.a clangLex.a clangBasic.a clangASTMatchers.a clangEdit.a clangLex.a clangBasic.a clangCodeGen.a
include $(CLANG_LEVEL)/Makefile include $(CLANG_LEVEL)/Makefile
MAKEFILE_UNITTEST_NO_INCLUDE_COMMON := 1 MAKEFILE_UNITTEST_NO_INCLUDE_COMMON := 1