Re-structure clang-rename into a library and the tool.

This allows the unit tests to link the library.

Patch by Xin Huang.

llvm-svn: 219609

7 files changed, 39 insertions, 20 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
+
diff --git a/clang-tools-extra/unittests/Makefile b/clang-tools-extra/unittests/Makefile
index fc781b6d0cd..ae5f64a7b9e 100644
--- a/clang-tools-extra/unittests/Makefile
+++ b/clang-tools-extra/unittests/Makefile
@@ -10,6 +10,6 @@
 CLANG_LEVEL := ../../..
 include $(CLANG_LEVEL)/../../Makefile.config
 
-PARALLEL_DIRS := clang-apply-replacements clang-modernize clang-query clang-tidy
+PARALLEL_DIRS := clang-apply-replacements clang-modernize clang-query clang-tidy clang-rename
 
 include $(CLANG_LEVEL)/Makefile
diff --git a/clang-tools-extra/unittests/clang-rename/Makefile b/clang-tools-extra/unittests/clang-rename/Makefile
index c86d13253ab..d597e47583f 100644
--- a/clang-tools-extra/unittests/clang-rename/Makefile
+++ b/clang-tools-extra/unittests/clang-rename/Makefile
@@ -13,12 +13,13 @@ include $(CLANG_LEVEL)/../../Makefile.config
 TESTNAME = ClangRenameTests
 LINK_COMPONENTS := asmparser bitreader support MC MCParser option \
 		 TransformUtils
-USEDLIBS = clangAnalysis.a clangAST.a clangBasic.a clangDriver.a clangEdit.a \
-	   clangFrontend.a clangFrontendTool.a clangIndex.a clangLex.a \
-	   clangParse.a clangRewrite.a clangRewriteFrontend.a \
-	   clangSerialization.a clangSema.a clangTooling.a
+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
 MAKEFILE_UNITTEST_NO_INCLUDE_COMMON := 1
-CPP.Flags += -I(PROJ_SRC_DIR)/../../clang-rename
+CPP.Flags += -I$(PROJ_SRC_DIR)/../../clang-rename
 include $(LLVM_SRC_ROOT)/unittests/Makefile.unittest