diff options
| author | Douglas Gregor <dgregor@apple.com> | 2009-03-16 23:06:59 +0000 |
|---|---|---|
| committer | Douglas Gregor <dgregor@apple.com> | 2009-03-16 23:06:59 +0000 |
| commit | a393e9eedcc28b25f521a4feceb3b56e3d0d360f (patch) | |
| tree | 666937547a17f428a2bcbaebc8a82c97798871dd /lib | |
| parent | 8c84417776e57d58ab573b2f4c485e67cb68d996 (diff) | |
Build system changes to use TableGen to generate the various
diagnostics. This builds on the patch that Sebastian committed and
then revert. Major differences are:
- We don't remove or use the current ".def" files. Instead, for now,
we just make sure that we're building the ".inc" files.
- Fixed CMake makefiles to run TableGen and build the ".inc" files
when needed. Tested with both the Xcode and Makefile generators
provided by CMake, so it should be solid.
- Fixed normal makefiles to handle out-of-source builds that involve
the ".inc" files.
I'll send a separate patch to the list with Sebastian's changes that
eliminate the use of the .def files.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@67058 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/AST/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | lib/AST/Makefile | 2 | ||||
| -rw-r--r-- | lib/Analysis/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | lib/Analysis/Makefile | 2 | ||||
| -rw-r--r-- | lib/Basic/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | lib/Basic/Makefile | 2 | ||||
| -rw-r--r-- | lib/CodeGen/Makefile | 2 | ||||
| -rw-r--r-- | lib/Driver/Makefile | 2 | ||||
| -rw-r--r-- | lib/Frontend/Makefile | 2 | ||||
| -rw-r--r-- | lib/Lex/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | lib/Lex/Makefile | 2 | ||||
| -rw-r--r-- | lib/Parse/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | lib/Parse/Makefile | 2 | ||||
| -rw-r--r-- | lib/Rewrite/Makefile | 2 | ||||
| -rw-r--r-- | lib/Sema/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | lib/Sema/Makefile | 2 |
16 files changed, 30 insertions, 10 deletions
diff --git a/lib/AST/CMakeLists.txt b/lib/AST/CMakeLists.txt index 9687f34be8..48b1971112 100644 --- a/lib/AST/CMakeLists.txt +++ b/lib/AST/CMakeLists.txt @@ -29,3 +29,5 @@ add_clang_library(clangAST Type.cpp TypeSerialization.cpp ) + +add_dependencies(clangAST ClangDiagnosticAST) diff --git a/lib/AST/Makefile b/lib/AST/Makefile index cdfc64caca..f7d4e9f62d 100644 --- a/lib/AST/Makefile +++ b/lib/AST/Makefile @@ -16,7 +16,7 @@ LIBRARYNAME := clangAST BUILD_ARCHIVE = 1 CXXFLAGS = -fno-rtti -CPPFLAGS += -I$(PROJ_SRC_DIR)/../../include +CPPFLAGS += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include include $(LEVEL)/Makefile.common diff --git a/lib/Analysis/CMakeLists.txt b/lib/Analysis/CMakeLists.txt index 64aa3a499f..72bc3aea4a 100644 --- a/lib/Analysis/CMakeLists.txt +++ b/lib/Analysis/CMakeLists.txt @@ -31,3 +31,5 @@ add_clang_library(clangAnalysis SymbolManager.cpp UninitializedValues.cpp ) + +add_dependencies(clangAnalysis ClangDiagnosticAnalysis) diff --git a/lib/Analysis/Makefile b/lib/Analysis/Makefile index b1d9178182..c597254fd2 100644 --- a/lib/Analysis/Makefile +++ b/lib/Analysis/Makefile @@ -16,7 +16,7 @@ LIBRARYNAME := clangAnalysis BUILD_ARCHIVE = 1 CXXFLAGS = -fno-rtti -CPPFLAGS += -I$(PROJ_SRC_DIR)/../../include +CPPFLAGS += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include include $(LEVEL)/Makefile.common diff --git a/lib/Basic/CMakeLists.txt b/lib/Basic/CMakeLists.txt index 37fa210df8..26568598f6 100644 --- a/lib/Basic/CMakeLists.txt +++ b/lib/Basic/CMakeLists.txt @@ -11,3 +11,13 @@ add_clang_library(clangBasic Targets.cpp TokenKinds.cpp ) + +add_dependencies(clangBasic + ClangDiagnosticAnalysis + ClangDiagnosticAST + ClangDiagnosticCommon + ClangDiagnosticDriver + ClangDiagnosticFrontend + ClangDiagnosticLex + ClangDiagnosticParse + ClangDiagnosticSema) diff --git a/lib/Basic/Makefile b/lib/Basic/Makefile index e95d6dbfa3..3fd6c2c153 100644 --- a/lib/Basic/Makefile +++ b/lib/Basic/Makefile @@ -16,7 +16,7 @@ LIBRARYNAME := clangBasic BUILD_ARCHIVE = 1 CXXFLAGS = -fno-rtti -CPPFLAGS += -I$(PROJ_SRC_DIR)/../../include +CPPFLAGS += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include include $(LEVEL)/Makefile.common diff --git a/lib/CodeGen/Makefile b/lib/CodeGen/Makefile index 4d7828ef67..e716fe78bc 100644 --- a/lib/CodeGen/Makefile +++ b/lib/CodeGen/Makefile @@ -17,7 +17,7 @@ LIBRARYNAME := clangCodeGen BUILD_ARCHIVE = 1 CXXFLAGS = -fno-rtti -CPPFLAGS += -I$(PROJ_SRC_DIR)/../../include +CPPFLAGS += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include include $(LEVEL)/Makefile.common diff --git a/lib/Driver/Makefile b/lib/Driver/Makefile index a43033acbe..fb437d2644 100644 --- a/lib/Driver/Makefile +++ b/lib/Driver/Makefile @@ -12,7 +12,7 @@ LIBRARYNAME := clangDriver BUILD_ARCHIVE = 1 CXXFLAGS = -fno-rtti -CPPFLAGS += -I$(PROJ_SRC_DIR)/../../include +CPPFLAGS += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include include $(LEVEL)/Makefile.common diff --git a/lib/Frontend/Makefile b/lib/Frontend/Makefile index 70edfd5230..8d70847578 100644 --- a/lib/Frontend/Makefile +++ b/lib/Frontend/Makefile @@ -12,7 +12,7 @@ LIBRARYNAME := clangFrontend BUILD_ARCHIVE = 1 CXXFLAGS = -fno-rtti -CPPFLAGS += -I$(PROJ_SRC_DIR)/../../include +CPPFLAGS += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include include $(LEVEL)/Makefile.common diff --git a/lib/Lex/CMakeLists.txt b/lib/Lex/CMakeLists.txt index 6347142ada..a7237a7b76 100644 --- a/lib/Lex/CMakeLists.txt +++ b/lib/Lex/CMakeLists.txt @@ -22,3 +22,5 @@ add_clang_library(clangLex TokenLexer.cpp TokenConcatenation.cpp ) + +add_dependencies(clangLex ClangDiagnosticLex) diff --git a/lib/Lex/Makefile b/lib/Lex/Makefile index 187448c992..a2437da812 100644 --- a/lib/Lex/Makefile +++ b/lib/Lex/Makefile @@ -22,7 +22,7 @@ ifeq ($(ARCH),PowerPC) CXXFLAGS += -maltivec endif -CPPFLAGS += -I$(PROJ_SRC_DIR)/../../include +CPPFLAGS += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include include $(LEVEL)/Makefile.common diff --git a/lib/Parse/CMakeLists.txt b/lib/Parse/CMakeLists.txt index 91355844e7..8fb7cd23b8 100644 --- a/lib/Parse/CMakeLists.txt +++ b/lib/Parse/CMakeLists.txt @@ -17,3 +17,5 @@ add_clang_library(clangParse ParseTentative.cpp ParseTemplate.cpp ) + +add_dependencies(clangParse ClangDiagnosticParse) diff --git a/lib/Parse/Makefile b/lib/Parse/Makefile index b5d2653bb0..5d69029edc 100644 --- a/lib/Parse/Makefile +++ b/lib/Parse/Makefile @@ -16,7 +16,7 @@ LIBRARYNAME := clangParse BUILD_ARCHIVE = 1 CXXFLAGS = -fno-rtti -CPPFLAGS += -I$(PROJ_SRC_DIR)/../../include +CPPFLAGS += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include include $(LEVEL)/Makefile.common diff --git a/lib/Rewrite/Makefile b/lib/Rewrite/Makefile index 3c0b5a5727..61fdf4006f 100644 --- a/lib/Rewrite/Makefile +++ b/lib/Rewrite/Makefile @@ -16,7 +16,7 @@ LIBRARYNAME := clangRewrite BUILD_ARCHIVE = 1 CXXFLAGS = -fno-rtti -CPPFLAGS += -I$(PROJ_SRC_DIR)/../../include +CPPFLAGS += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include include $(LEVEL)/Makefile.common diff --git a/lib/Sema/CMakeLists.txt b/lib/Sema/CMakeLists.txt index 23809b9309..e90c7e30c2 100644 --- a/lib/Sema/CMakeLists.txt +++ b/lib/Sema/CMakeLists.txt @@ -24,3 +24,5 @@ add_clang_library(clangSema SemaTemplateInstantiate.cpp SemaType.cpp ) + +add_dependencies(clangSema ClangDiagnosticSema) diff --git a/lib/Sema/Makefile b/lib/Sema/Makefile index 9193a546ca..0f4c7965dc 100644 --- a/lib/Sema/Makefile +++ b/lib/Sema/Makefile @@ -17,7 +17,7 @@ LIBRARYNAME := clangSema BUILD_ARCHIVE = 1 CXXFLAGS = -fno-rtti -CPPFLAGS += -I$(PROJ_SRC_DIR)/../../include +CPPFLAGS += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include include $(LEVEL)/Makefile.common |