diff options
Diffstat (limited to 'clang-tools-extra/clang-rename')
| -rw-r--r-- | clang-tools-extra/clang-rename/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | clang-tools-extra/clang-rename/Makefile | 10 | ||||
| -rw-r--r-- | clang-tools-extra/clang-rename/tool/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | clang-tools-extra/clang-rename/tool/ClangRename.cpp (renamed from clang-tools-extra/clang-rename/ClangRename.cpp) | 4 | ||||
| -rw-r--r-- | clang-tools-extra/clang-rename/tool/Makefile | 12 |
5 files changed, 32 insertions, 14 deletions
diff --git a/clang-tools-extra/clang-rename/CMakeLists.txt b/clang-tools-extra/clang-rename/CMakeLists.txt index 69962a77c27..a8d9adb0a5f 100644 --- a/clang-tools-extra/clang-rename/CMakeLists.txt +++ b/clang-tools-extra/clang-rename/CMakeLists.txt @@ -1,14 +1,12 @@ set(LLVM_LINK_COMPONENTS support) -add_clang_executable(clang-rename - ClangRename.cpp +add_clang_library(clangRename USRFinder.cpp USRFindingAction.cpp USRLocFinder.cpp RenamingAction.cpp - ) -target_link_libraries(clang-rename + LINK_LIBS clangAST clangBasic clangFrontend @@ -17,4 +15,4 @@ target_link_libraries(clang-rename clangTooling ) -install(TARGETS clang-rename RUNTIME DESTINATION bin) +add_subdirectory(tool) diff --git a/clang-tools-extra/clang-rename/Makefile b/clang-tools-extra/clang-rename/Makefile index 8efcc45fb1c..d534a78fab8 100644 --- a/clang-tools-extra/clang-rename/Makefile +++ b/clang-tools-extra/clang-rename/Makefile @@ -8,13 +8,9 @@ ##===----------------------------------------------------------------------===## CLANG_LEVEL := ../../.. -TOOLNAME = clang-rename +LIBRARYNAME = clangRename include $(CLANG_LEVEL)/../../Makefile.config -LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader support mc option -USEDLIBS = 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 + +DIRS = tool include $(CLANG_LEVEL)/Makefile diff --git a/clang-tools-extra/clang-rename/tool/CMakeLists.txt b/clang-tools-extra/clang-rename/tool/CMakeLists.txt new file mode 100644 index 00000000000..4d218d93391 --- /dev/null +++ b/clang-tools-extra/clang-rename/tool/CMakeLists.txt @@ -0,0 +1,12 @@ +add_clang_executable(clang-rename ClangRename.cpp) + +target_link_libraries(clang-rename + clangAST + clangBasic + clangFrontend + clangIndex + clangRename + clangRewrite + clangTooling) + +install(TARGETS clang-rename RUNTIME DESTINATION bin) diff --git a/clang-tools-extra/clang-rename/ClangRename.cpp b/clang-tools-extra/clang-rename/tool/ClangRename.cpp index 077c591826b..4e971f3603d 100644 --- a/clang-tools-extra/clang-rename/ClangRename.cpp +++ b/clang-tools-extra/clang-rename/tool/ClangRename.cpp @@ -13,8 +13,8 @@ /// //===----------------------------------------------------------------------===// -#include "USRFindingAction.h" -#include "RenamingAction.h" +#include "../USRFindingAction.h" +#include "../RenamingAction.h" #include "clang/AST/ASTConsumer.h" #include "clang/AST/ASTContext.h" #include "clang/Basic/FileManager.h" diff --git a/clang-tools-extra/clang-rename/tool/Makefile b/clang-tools-extra/clang-rename/tool/Makefile new file mode 100644 index 00000000000..9c1fa99272b --- /dev/null +++ b/clang-tools-extra/clang-rename/tool/Makefile @@ -0,0 +1,12 @@ +CLANG_LEVEL := ../../../.. +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 \ + clangStaticAnalyzerFrontend.a clangStaticAnalyzerCheckers.a \ + clangStaticAnalyzerCore.a clangAnalysis.a clangRewriteFrontend.a \ + clangRewrite.a clangEdit.a clangAST.a clangLex.a clangBasic.a + +include $(CLANG_LEVEL)/Makefile + |
