Makefiles: Set Clang CPP compiler flags in a single location, instead of scattered throughout the project Makefiles.

ddunbar · ddunbar · commit ee6b6925510a · 2010-06-08T20:44:43.000Z
llvm-svn: 105638
diff --git a/clang/Makefile b/clang/Makefile
@@ -32,6 +32,12 @@ LEVEL := $(CLANG_LEVEL)/../..
 # 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.
 
diff --git a/clang/examples/PrintFunctionNames/Makefile b/clang/examples/PrintFunctionNames/Makefile
@@ -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
diff --git a/clang/examples/clang-interpreter/Makefile b/clang/examples/clang-interpreter/Makefile
@@ -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.
diff --git a/clang/examples/wpa/Makefile b/clang/examples/wpa/Makefile
@@ -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.
diff --git a/clang/lib/AST/Makefile b/clang/lib/AST/Makefile
@@ -15,7 +15,5 @@ CLANG_LEVEL := ../..
 LIBRARYNAME := clangAST
 BUILD_ARCHIVE = 1
 
-CPP.Flags += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
-
 include $(CLANG_LEVEL)/Makefile
 
diff --git a/clang/lib/Analysis/Makefile b/clang/lib/Analysis/Makefile
@@ -15,7 +15,5 @@ CLANG_LEVEL := ../..
 LIBRARYNAME := clangAnalysis
 BUILD_ARCHIVE = 1
 
-CPP.Flags += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
-
 include $(CLANG_LEVEL)/Makefile
 
diff --git a/clang/lib/Basic/Makefile b/clang/lib/Basic/Makefile
@@ -15,11 +15,6 @@ CLANG_LEVEL := ../..
 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)/../..)
diff --git a/clang/lib/Checker/Makefile b/clang/lib/Checker/Makefile
@@ -15,7 +15,5 @@ CLANG_LEVEL := ../..
 LIBRARYNAME := clangChecker
 BUILD_ARCHIVE = 1
 
-CPP.Flags += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
-
 include $(CLANG_LEVEL)/Makefile
 
diff --git a/clang/lib/CodeGen/Makefile b/clang/lib/CodeGen/Makefile
@@ -16,10 +16,5 @@ CLANG_LEVEL := ../..
 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
 
diff --git a/clang/lib/Driver/Makefile b/clang/lib/Driver/Makefile
@@ -11,6 +11,4 @@ CLANG_LEVEL := ../..
 LIBRARYNAME := clangDriver
 BUILD_ARCHIVE = 1
 
-CPPFLAGS += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
-
 include $(CLANG_LEVEL)/Makefile
diff --git a/clang/lib/Frontend/Makefile b/clang/lib/Frontend/Makefile
@@ -11,7 +11,5 @@ CLANG_LEVEL := ../..
 LIBRARYNAME := clangFrontend
 BUILD_ARCHIVE = 1
 
-CPP.Flags += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
-
 include $(CLANG_LEVEL)/Makefile
 
diff --git a/clang/lib/Index/Makefile b/clang/lib/Index/Makefile
@@ -21,7 +21,5 @@ ifeq ($(ARCH),PowerPC)
 CXX.Flags += -maltivec
 endif
 
-CPP.Flags += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
-
 include $(CLANG_LEVEL)/Makefile
 
diff --git a/clang/lib/Lex/Makefile b/clang/lib/Lex/Makefile
@@ -21,7 +21,5 @@ ifeq ($(ARCH),PowerPC)
 CXX.Flags += -maltivec
 endif
 
-CPP.Flags += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
-
 include $(CLANG_LEVEL)/Makefile
 
diff --git a/clang/lib/Parse/Makefile b/clang/lib/Parse/Makefile
@@ -15,7 +15,5 @@ CLANG_LEVEL := ../..
 LIBRARYNAME := clangParse
 BUILD_ARCHIVE = 1
 
-CPP.Flags += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
-
 include $(CLANG_LEVEL)/Makefile
 
diff --git a/clang/lib/Rewrite/Makefile b/clang/lib/Rewrite/Makefile
@@ -15,7 +15,5 @@ CLANG_LEVEL := ../..
 LIBRARYNAME := clangRewrite
 BUILD_ARCHIVE = 1
 
-CPP.Flags += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
-
 include $(CLANG_LEVEL)/Makefile
 
diff --git a/clang/lib/Sema/Makefile b/clang/lib/Sema/Makefile
@@ -16,7 +16,5 @@ CLANG_LEVEL := ../..
 LIBRARYNAME := clangSema
 BUILD_ARCHIVE = 1
 
-CPP.Flags += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
-
 include $(CLANG_LEVEL)/Makefile
 
diff --git a/clang/tools/c-index-test/Makefile b/clang/tools/c-index-test/Makefile
@@ -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
diff --git a/clang/tools/driver/Makefile b/clang/tools/driver/Makefile
@@ -16,7 +16,6 @@ else
     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
diff --git a/clang/tools/libclang/Makefile b/clang/tools/libclang/Makefile
@@ -12,8 +12,6 @@ LIBRARYNAME = clang
 
 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
