[cfe-commits] r105638 - in /cfe/trunk: Makefile examples/PrintFunctionNames/Makefile examples/clang-interpreter/Makefile examples/wpa/Makefile lib/AST/Makefile lib/Analysis/Makefile lib/Basic/Makefile lib/Checker/Makefile lib/CodeGen/Makefile lib/Driver/Makefile lib/Frontend/Makefile lib/Index/Makefile lib/Lex/Makefile lib/Parse/Makefile lib/Rewrite/Makefile lib/Sema/Makefile tools/c-index-test/Makefile tools/driver/Makefile tools/libclang/Makefile
Daniel Dunbar
daniel at zuster.org
Tue Jun 8 13:44:44 PDT 2010
Author: ddunbar
Date: Tue Jun 8 15:44:43 2010
New Revision: 105638
URL: http://llvm.org/viewvc/llvm-project?rev=105638&view=rev
Log:
Makefiles: Set Clang CPP compiler flags in a single location, instead of scattered throughout the project Makefiles.
Modified:
cfe/trunk/Makefile
cfe/trunk/examples/PrintFunctionNames/Makefile
cfe/trunk/examples/clang-interpreter/Makefile
cfe/trunk/examples/wpa/Makefile
cfe/trunk/lib/AST/Makefile
cfe/trunk/lib/Analysis/Makefile
cfe/trunk/lib/Basic/Makefile
cfe/trunk/lib/Checker/Makefile
cfe/trunk/lib/CodeGen/Makefile
cfe/trunk/lib/Driver/Makefile
cfe/trunk/lib/Frontend/Makefile
cfe/trunk/lib/Index/Makefile
cfe/trunk/lib/Lex/Makefile
cfe/trunk/lib/Parse/Makefile
cfe/trunk/lib/Rewrite/Makefile
cfe/trunk/lib/Sema/Makefile
cfe/trunk/tools/c-index-test/Makefile
cfe/trunk/tools/driver/Makefile
cfe/trunk/tools/libclang/Makefile
Modified: cfe/trunk/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/Makefile?rev=105638&r1=105637&r2=105638&view=diff
==============================================================================
--- cfe/trunk/Makefile (original)
+++ cfe/trunk/Makefile Tue Jun 8 15:44:43 2010
@@ -32,6 +32,12 @@
# Include LLVM common makefile.
include $(LEVEL)/Makefile.common
+# Set common Clang build flags.
+CPP.Flags += -I$(PROJ_SRC_DIR)/$(CLANG_LEVEL)/include -I$(PROJ_OBJ_DIR)/$(CLANG_LEVEL)/include
+ifdef CLANG_VENDOR
+CPP.Flags += -DCLANG_VENDOR='"$(CLANG_VENDOR) "'
+endif
+
###
# Clang Top Level specific stuff.
Modified: cfe/trunk/examples/PrintFunctionNames/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/examples/PrintFunctionNames/Makefile?rev=105638&r1=105637&r2=105638&view=diff
==============================================================================
--- cfe/trunk/examples/PrintFunctionNames/Makefile (original)
+++ cfe/trunk/examples/PrintFunctionNames/Makefile Tue Jun 8 15:44:43 2010
@@ -10,8 +10,6 @@
CLANG_LEVEL := ../..
LIBRARYNAME = PrintFunctionNames
-CPPFLAGS += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
-
# Include this here so we can get the configuration of the targets that have
# been configured for construction. We have to do this early so we can set up
# LINK_COMPONENTS before including Makefile.rules
Modified: cfe/trunk/examples/clang-interpreter/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/examples/clang-interpreter/Makefile?rev=105638&r1=105637&r2=105638&view=diff
==============================================================================
--- cfe/trunk/examples/clang-interpreter/Makefile (original)
+++ cfe/trunk/examples/clang-interpreter/Makefile Tue Jun 8 15:44:43 2010
@@ -10,7 +10,6 @@
CLANG_LEVEL := ../..
TOOLNAME = clang-interpreter
-CPPFLAGS += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
NO_INSTALL = 1
# No plugins, optimize startup time.
Modified: cfe/trunk/examples/wpa/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/examples/wpa/Makefile?rev=105638&r1=105637&r2=105638&view=diff
==============================================================================
--- cfe/trunk/examples/wpa/Makefile (original)
+++ cfe/trunk/examples/wpa/Makefile Tue Jun 8 15:44:43 2010
@@ -10,7 +10,6 @@
CLANG_LEVEL := ../..
TOOLNAME = clang-wpa
-CPPFLAGS += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
NO_INSTALL = 1
# No plugins, optimize startup time.
Modified: cfe/trunk/lib/AST/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/Makefile?rev=105638&r1=105637&r2=105638&view=diff
==============================================================================
--- cfe/trunk/lib/AST/Makefile (original)
+++ cfe/trunk/lib/AST/Makefile Tue Jun 8 15:44:43 2010
@@ -15,7 +15,5 @@
LIBRARYNAME := clangAST
BUILD_ARCHIVE = 1
-CPP.Flags += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
-
include $(CLANG_LEVEL)/Makefile
Modified: cfe/trunk/lib/Analysis/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Analysis/Makefile?rev=105638&r1=105637&r2=105638&view=diff
==============================================================================
--- cfe/trunk/lib/Analysis/Makefile (original)
+++ cfe/trunk/lib/Analysis/Makefile Tue Jun 8 15:44:43 2010
@@ -15,7 +15,5 @@
LIBRARYNAME := clangAnalysis
BUILD_ARCHIVE = 1
-CPP.Flags += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
-
include $(CLANG_LEVEL)/Makefile
Modified: cfe/trunk/lib/Basic/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/Makefile?rev=105638&r1=105637&r2=105638&view=diff
==============================================================================
--- cfe/trunk/lib/Basic/Makefile (original)
+++ cfe/trunk/lib/Basic/Makefile Tue Jun 8 15:44:43 2010
@@ -15,11 +15,6 @@
LIBRARYNAME := clangBasic
BUILD_ARCHIVE = 1
-CPPFLAGS += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
-ifdef CLANG_VENDOR
-CPPFLAGS += -DCLANG_VENDOR='"$(CLANG_VENDOR) "'
-endif
-
include $(CLANG_LEVEL)/Makefile
SVN_REVISION := $(shell $(LLVM_SRC_ROOT)/utils/GetSourceVersion $(PROJ_SRC_DIR)/../..)
Modified: cfe/trunk/lib/Checker/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Checker/Makefile?rev=105638&r1=105637&r2=105638&view=diff
==============================================================================
--- cfe/trunk/lib/Checker/Makefile (original)
+++ cfe/trunk/lib/Checker/Makefile Tue Jun 8 15:44:43 2010
@@ -15,7 +15,5 @@
LIBRARYNAME := clangChecker
BUILD_ARCHIVE = 1
-CPP.Flags += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
-
include $(CLANG_LEVEL)/Makefile
Modified: cfe/trunk/lib/CodeGen/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/Makefile?rev=105638&r1=105637&r2=105638&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/Makefile (original)
+++ cfe/trunk/lib/CodeGen/Makefile Tue Jun 8 15:44:43 2010
@@ -16,10 +16,5 @@
LIBRARYNAME := clangCodeGen
BUILD_ARCHIVE = 1
-CPP.Flags += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
-ifdef CLANG_VENDOR
-CPP.Flags += -DCLANG_VENDOR='"$(CLANG_VENDOR) "'
-endif
-
include $(CLANG_LEVEL)/Makefile
Modified: cfe/trunk/lib/Driver/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/Makefile?rev=105638&r1=105637&r2=105638&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/Makefile (original)
+++ cfe/trunk/lib/Driver/Makefile Tue Jun 8 15:44:43 2010
@@ -11,6 +11,4 @@
LIBRARYNAME := clangDriver
BUILD_ARCHIVE = 1
-CPPFLAGS += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
-
include $(CLANG_LEVEL)/Makefile
Modified: cfe/trunk/lib/Frontend/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/Makefile?rev=105638&r1=105637&r2=105638&view=diff
==============================================================================
--- cfe/trunk/lib/Frontend/Makefile (original)
+++ cfe/trunk/lib/Frontend/Makefile Tue Jun 8 15:44:43 2010
@@ -11,7 +11,5 @@
LIBRARYNAME := clangFrontend
BUILD_ARCHIVE = 1
-CPP.Flags += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
-
include $(CLANG_LEVEL)/Makefile
Modified: cfe/trunk/lib/Index/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Index/Makefile?rev=105638&r1=105637&r2=105638&view=diff
==============================================================================
--- cfe/trunk/lib/Index/Makefile (original)
+++ cfe/trunk/lib/Index/Makefile Tue Jun 8 15:44:43 2010
@@ -21,7 +21,5 @@
CXX.Flags += -maltivec
endif
-CPP.Flags += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
-
include $(CLANG_LEVEL)/Makefile
Modified: cfe/trunk/lib/Lex/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Lex/Makefile?rev=105638&r1=105637&r2=105638&view=diff
==============================================================================
--- cfe/trunk/lib/Lex/Makefile (original)
+++ cfe/trunk/lib/Lex/Makefile Tue Jun 8 15:44:43 2010
@@ -21,7 +21,5 @@
CXX.Flags += -maltivec
endif
-CPP.Flags += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
-
include $(CLANG_LEVEL)/Makefile
Modified: cfe/trunk/lib/Parse/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Parse/Makefile?rev=105638&r1=105637&r2=105638&view=diff
==============================================================================
--- cfe/trunk/lib/Parse/Makefile (original)
+++ cfe/trunk/lib/Parse/Makefile Tue Jun 8 15:44:43 2010
@@ -15,7 +15,5 @@
LIBRARYNAME := clangParse
BUILD_ARCHIVE = 1
-CPP.Flags += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
-
include $(CLANG_LEVEL)/Makefile
Modified: cfe/trunk/lib/Rewrite/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Rewrite/Makefile?rev=105638&r1=105637&r2=105638&view=diff
==============================================================================
--- cfe/trunk/lib/Rewrite/Makefile (original)
+++ cfe/trunk/lib/Rewrite/Makefile Tue Jun 8 15:44:43 2010
@@ -15,7 +15,5 @@
LIBRARYNAME := clangRewrite
BUILD_ARCHIVE = 1
-CPP.Flags += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
-
include $(CLANG_LEVEL)/Makefile
Modified: cfe/trunk/lib/Sema/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/Makefile?rev=105638&r1=105637&r2=105638&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/Makefile (original)
+++ cfe/trunk/lib/Sema/Makefile Tue Jun 8 15:44:43 2010
@@ -16,7 +16,5 @@
LIBRARYNAME := clangSema
BUILD_ARCHIVE = 1
-CPP.Flags += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
-
include $(CLANG_LEVEL)/Makefile
Modified: cfe/trunk/tools/c-index-test/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/c-index-test/Makefile?rev=105638&r1=105637&r2=105638&view=diff
==============================================================================
--- cfe/trunk/tools/c-index-test/Makefile (original)
+++ cfe/trunk/tools/c-index-test/Makefile Tue Jun 8 15:44:43 2010
@@ -9,7 +9,6 @@
CLANG_LEVEL := ../..
TOOLNAME = c-index-test
-CPPFLAGS += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
# No plugins, optimize startup time.
TOOL_NO_EXPORTS = 1
Modified: cfe/trunk/tools/driver/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/driver/Makefile?rev=105638&r1=105637&r2=105638&view=diff
==============================================================================
--- cfe/trunk/tools/driver/Makefile (original)
+++ cfe/trunk/tools/driver/Makefile Tue Jun 8 15:44:43 2010
@@ -16,7 +16,6 @@
TOOLALIAS = clang++
endif
endif
-CPP.Flags += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
# Clang tool has no plugins, optimize startup time.
TOOL_NO_EXPORTS = 1
Modified: cfe/trunk/tools/libclang/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/libclang/Makefile?rev=105638&r1=105637&r2=105638&view=diff
==============================================================================
--- cfe/trunk/tools/libclang/Makefile (original)
+++ cfe/trunk/tools/libclang/Makefile Tue Jun 8 15:44:43 2010
@@ -12,8 +12,6 @@
EXPORTED_SYMBOL_FILE = $(PROJ_SRC_DIR)/libclang.exports
-CPP.Flags += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
-
# Include this here so we can get the configuration of the targets
# that have been configured for construction. We have to do this
# early so we can set up LINK_COMPONENTS before including Makefile.rules
More information about the cfe-commits
mailing list