Move <root>/Driver into <root>/tools/clang-cc.

Again, I tried to update cmake but it is untested.

llvm-svn: 67605

clang/CMakeLists.txt

@@ -51,7 +51,6 @@ add_definitions( -D_GNU_SOURCE )
 
 add_subdirectory(include)
 add_subdirectory(lib)
-add_subdirectory(Driver)
 add_subdirectory(tools)
 
 # TODO: docs.

clang/Makefile

@@ -1,5 +1,5 @@
 LEVEL = ../..
-DIRS := include lib Driver docs tools
+DIRS := include lib tools docs
 
 include $(LEVEL)/Makefile.common
 
@@ -24,7 +24,7 @@ tags::
 	$(Verb) etags `find . -type f -name \*.h | grep -v /lib/Headers | grep -v /test/` `find . -type f -name \*.cpp | grep -v /lib/Headers | grep -v /test/`
 
 cscope.files:
-	find Driver lib include -name '*.cpp' \
+	find tools lib include -name '*.cpp' \
 	                    -or -name '*.def' \
 	                    -or -name '*.td' \
 	                    -or -name '*.h' > cscope.files

clang/tools/CMakeLists.txt

@@ -1 +1,2 @@
+add_subdirectory(clang-cc)
 add_subdirectory(driver)

clang/tools/Makefile

@@ -8,6 +8,6 @@
 ##===----------------------------------------------------------------------===##
 
 LEVEL := ../../..
-DIRS := ccc driver
+DIRS := clang-cc ccc driver
 
 include $(LEVEL)/Makefile.common

clang/tools/clang-cc/CMakeLists.txt

@@ -21,7 +21,7 @@ set( LLVM_LINK_COMPONENTS
   selectiondag
   )
 
-add_clang_executable(clang
+add_clang_executable(clang-cc
   AnalysisConsumer.cpp
   ASTConsumers.cpp
   Backend.cpp

clang/tools/clang-cc/Makefile

@@ -1,6 +1,15 @@
-LEVEL = ../../..
+##===- tools/clang-cc/Makefile -----------------------------*- Makefile -*-===##
+# 
+#                     The LLVM Compiler Infrastructure
+#
+# This file is distributed under the University of Illinois Open Source
+# License. See LICENSE.TXT for details.
+# 
+##===----------------------------------------------------------------------===##
+LEVEL = ../../../..
+
 TOOLNAME = clang-cc
-CPPFLAGS += -I$(PROJ_SRC_DIR)/../include -I$(PROJ_OBJ_DIR)/../include
+CPPFLAGS += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
 CXXFLAGS = -fno-rtti
 
 # Clang has no plugins, optimize startup time.

clang/tools/driver/Makefile

@@ -12,12 +12,12 @@ TOOLNAME = clang-driver
 CPPFLAGS += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
 CXXFLAGS = -fno-rtti
 
+# This tool has no plugins, optimize startup time.
+TOOL_NO_EXPORTS = 1
+
 # FIXME: It is unfortunate we need to pull in the bitcode reader and
 # writer just to get the serializer stuff used by clangBasic.
 LINK_COMPONENTS := system support bitreader bitwriter
 USEDLIBS = clangDriver.a clangBasic.a
 
-# This tool has no plugins, optimize startup time.
-TOOL_NO_EXPORTS = 1
-
 include $(LEVEL)/Makefile.common