[clang-tools-extra] r230104 - Revert "Adapt Makefile dependencies for the clang module format change in r230089."
Adrian Prantl
aprantl at apple.com
Fri Feb 20 16:29:43 PST 2015
Author: adrian
Date: Fri Feb 20 18:29:43 2015
New Revision: 230104
URL: http://llvm.org/viewvc/llvm-project?rev=230104&view=rev
Log:
Revert "Adapt Makefile dependencies for the clang module format change in r230089."
Modified:
clang-tools-extra/trunk/clang-apply-replacements/tool/Makefile
clang-tools-extra/trunk/clang-modernize/tool/Makefile
clang-tools-extra/trunk/clang-query/tool/Makefile
clang-tools-extra/trunk/clang-rename/tool/Makefile
clang-tools-extra/trunk/clang-tidy/tool/Makefile
clang-tools-extra/trunk/modularize/Makefile
clang-tools-extra/trunk/pp-trace/Makefile
clang-tools-extra/trunk/remove-cstr-calls/Makefile
clang-tools-extra/trunk/tool-template/Makefile
clang-tools-extra/trunk/unittests/clang-apply-replacements/Makefile
clang-tools-extra/trunk/unittests/clang-modernize/Makefile
clang-tools-extra/trunk/unittests/clang-query/Makefile
clang-tools-extra/trunk/unittests/clang-rename/Makefile
clang-tools-extra/trunk/unittests/clang-tidy/Makefile
Modified: clang-tools-extra/trunk/clang-apply-replacements/tool/Makefile
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-apply-replacements/tool/Makefile?rev=230104&r1=230103&r2=230104&view=diff
==============================================================================
--- clang-tools-extra/trunk/clang-apply-replacements/tool/Makefile (original)
+++ clang-tools-extra/trunk/clang-apply-replacements/tool/Makefile Fri Feb 20 18:29:43 2015
@@ -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
Modified: clang-tools-extra/trunk/clang-modernize/tool/Makefile
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-modernize/tool/Makefile?rev=230104&r1=230103&r2=230104&view=diff
==============================================================================
--- clang-tools-extra/trunk/clang-modernize/tool/Makefile (original)
+++ clang-tools-extra/trunk/clang-modernize/tool/Makefile Fri Feb 20 18:29:43 2015
@@ -35,15 +35,12 @@ BUILT_SOURCES += $(ObjDir)/../PassByValu
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
Modified: clang-tools-extra/trunk/clang-query/tool/Makefile
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-query/tool/Makefile?rev=230104&r1=230103&r2=230104&view=diff
==============================================================================
--- clang-tools-extra/trunk/clang-query/tool/Makefile (original)
+++ clang-tools-extra/trunk/clang-query/tool/Makefile Fri Feb 20 18:29:43 2015
@@ -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
Modified: clang-tools-extra/trunk/clang-rename/tool/Makefile
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-rename/tool/Makefile?rev=230104&r1=230103&r2=230104&view=diff
==============================================================================
--- clang-tools-extra/trunk/clang-rename/tool/Makefile (original)
+++ clang-tools-extra/trunk/clang-rename/tool/Makefile Fri Feb 20 18:29:43 2015
@@ -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
Modified: clang-tools-extra/trunk/clang-tidy/tool/Makefile
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-tidy/tool/Makefile?rev=230104&r1=230103&r2=230104&view=diff
==============================================================================
--- clang-tools-extra/trunk/clang-tidy/tool/Makefile (original)
+++ clang-tools-extra/trunk/clang-tidy/tool/Makefile Fri Feb 20 18:29:43 2015
@@ -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 clangTidyLLVMModu
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
Modified: clang-tools-extra/trunk/modularize/Makefile
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/modularize/Makefile?rev=230104&r1=230103&r2=230104&view=diff
==============================================================================
--- clang-tools-extra/trunk/modularize/Makefile (original)
+++ clang-tools-extra/trunk/modularize/Makefile Fri Feb 20 18:29:43 2015
@@ -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
Modified: clang-tools-extra/trunk/pp-trace/Makefile
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/pp-trace/Makefile?rev=230104&r1=230103&r2=230104&view=diff
==============================================================================
--- clang-tools-extra/trunk/pp-trace/Makefile (original)
+++ clang-tools-extra/trunk/pp-trace/Makefile Fri Feb 20 18:29:43 2015
@@ -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
Modified: clang-tools-extra/trunk/remove-cstr-calls/Makefile
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/remove-cstr-calls/Makefile?rev=230104&r1=230103&r2=230104&view=diff
==============================================================================
--- clang-tools-extra/trunk/remove-cstr-calls/Makefile (original)
+++ clang-tools-extra/trunk/remove-cstr-calls/Makefile Fri Feb 20 18:29:43 2015
@@ -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
Modified: clang-tools-extra/trunk/tool-template/Makefile
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/tool-template/Makefile?rev=230104&r1=230103&r2=230104&view=diff
==============================================================================
--- clang-tools-extra/trunk/tool-template/Makefile (original)
+++ clang-tools-extra/trunk/tool-template/Makefile Fri Feb 20 18:29:43 2015
@@ -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
Modified: clang-tools-extra/trunk/unittests/clang-apply-replacements/Makefile
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/unittests/clang-apply-replacements/Makefile?rev=230104&r1=230103&r2=230104&view=diff
==============================================================================
--- clang-tools-extra/trunk/unittests/clang-apply-replacements/Makefile (original)
+++ clang-tools-extra/trunk/unittests/clang-apply-replacements/Makefile Fri Feb 20 18:29:43 2015
@@ -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
Modified: clang-tools-extra/trunk/unittests/clang-modernize/Makefile
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/unittests/clang-modernize/Makefile?rev=230104&r1=230103&r2=230104&view=diff
==============================================================================
--- clang-tools-extra/trunk/unittests/clang-modernize/Makefile (original)
+++ clang-tools-extra/trunk/unittests/clang-modernize/Makefile Fri Feb 20 18:29:43 2015
@@ -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
Modified: clang-tools-extra/trunk/unittests/clang-query/Makefile
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/unittests/clang-query/Makefile?rev=230104&r1=230103&r2=230104&view=diff
==============================================================================
--- clang-tools-extra/trunk/unittests/clang-query/Makefile (original)
+++ clang-tools-extra/trunk/unittests/clang-query/Makefile Fri Feb 20 18:29:43 2015
@@ -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
Modified: clang-tools-extra/trunk/unittests/clang-rename/Makefile
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/unittests/clang-rename/Makefile?rev=230104&r1=230103&r2=230104&view=diff
==============================================================================
--- clang-tools-extra/trunk/unittests/clang-rename/Makefile (original)
+++ clang-tools-extra/trunk/unittests/clang-rename/Makefile Fri Feb 20 18:29:43 2015
@@ -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
Modified: clang-tools-extra/trunk/unittests/clang-tidy/Makefile
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/unittests/clang-tidy/Makefile?rev=230104&r1=230103&r2=230104&view=diff
==============================================================================
--- clang-tools-extra/trunk/unittests/clang-tidy/Makefile (original)
+++ clang-tools-extra/trunk/unittests/clang-tidy/Makefile Fri Feb 20 18:29:43 2015
@@ -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 clangTidyLLVMModu
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
More information about the cfe-commits
mailing list