[cfe-commits] r67605 - in /cfe/trunk: CMakeLists.txt Driver/ Makefile tools/CMakeLists.txt tools/Makefile tools/clang-cc/ tools/clang-cc/CMakeLists.txt tools/clang-cc/Makefile tools/driver/Makefile

[Daniel Dunbar]

Author: ddunbar
Date: Mon Mar 23 22:00:12 2009
New Revision: 67605

URL: http://llvm.org/viewvc/llvm-project?rev=67605&view=rev
Log:
Move <root>/Driver into <root>/tools/clang-cc.

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

Added:
    cfe/trunk/tools/clang-cc/
      - copied from r67603, cfe/trunk/Driver/
Removed:
    cfe/trunk/Driver/
Modified:
    cfe/trunk/CMakeLists.txt
    cfe/trunk/Makefile
    cfe/trunk/tools/CMakeLists.txt
    cfe/trunk/tools/Makefile
    cfe/trunk/tools/clang-cc/CMakeLists.txt
    cfe/trunk/tools/clang-cc/Makefile
    cfe/trunk/tools/driver/Makefile

Modified: cfe/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/CMakeLists.txt?rev=67605&r1=67604&r2=67605&view=diff

==============================================================================
--- cfe/trunk/CMakeLists.txt (original)
+++ cfe/trunk/CMakeLists.txt Mon Mar 23 22:00:12 2009
@@ -51,7 +51,6 @@
 
 add_subdirectory(include)
 add_subdirectory(lib)
-add_subdirectory(Driver)
 add_subdirectory(tools)
 
 # TODO: docs.

Modified: cfe/trunk/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/Makefile?rev=67605&r1=67604&r2=67605&view=diff

==============================================================================
--- cfe/trunk/Makefile (original)
+++ cfe/trunk/Makefile Mon Mar 23 22:00:12 2009
@@ -1,5 +1,5 @@
 LEVEL = ../..
-DIRS := include lib Driver docs tools
+DIRS := include lib tools docs
 
 include $(LEVEL)/Makefile.common
 
@@ -24,7 +24,7 @@
 	$(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

Modified: cfe/trunk/tools/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/CMakeLists.txt?rev=67605&r1=67604&r2=67605&view=diff

==============================================================================
--- cfe/trunk/tools/CMakeLists.txt (original)
+++ cfe/trunk/tools/CMakeLists.txt Mon Mar 23 22:00:12 2009
@@ -1 +1,2 @@
+add_subdirectory(clang-cc)
 add_subdirectory(driver)

Modified: cfe/trunk/tools/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/Makefile?rev=67605&r1=67604&r2=67605&view=diff

==============================================================================
--- cfe/trunk/tools/Makefile (original)
+++ cfe/trunk/tools/Makefile Mon Mar 23 22:00:12 2009
@@ -8,6 +8,6 @@
 ##===----------------------------------------------------------------------===##
 
 LEVEL := ../../..
-DIRS := ccc driver
+DIRS := clang-cc ccc driver
 
 include $(LEVEL)/Makefile.common

Modified: cfe/trunk/tools/clang-cc/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/clang-cc/CMakeLists.txt?rev=67605&r1=67603&r2=67605&view=diff

==============================================================================
--- cfe/trunk/tools/clang-cc/CMakeLists.txt (original)
+++ cfe/trunk/tools/clang-cc/CMakeLists.txt Mon Mar 23 22:00:12 2009
@@ -21,7 +21,7 @@
   selectiondag
   )
 
-add_clang_executable(clang
+add_clang_executable(clang-cc
   AnalysisConsumer.cpp
   ASTConsumers.cpp
   Backend.cpp

Modified: cfe/trunk/tools/clang-cc/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/clang-cc/Makefile?rev=67605&r1=67603&r2=67605&view=diff

==============================================================================
--- cfe/trunk/tools/clang-cc/Makefile (original)
+++ cfe/trunk/tools/clang-cc/Makefile Mon Mar 23 22:00:12 2009
@@ -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.

Modified: cfe/trunk/tools/driver/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/driver/Makefile?rev=67605&r1=67604&r2=67605&view=diff

==============================================================================
--- cfe/trunk/tools/driver/Makefile (original)
+++ cfe/trunk/tools/driver/Makefile Mon Mar 23 22:00:12 2009
@@ -12,12 +12,12 @@
 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