aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile6
-rw-r--r--examples/PrintFunctionNames/Makefile2
-rw-r--r--examples/clang-interpreter/Makefile1
-rw-r--r--examples/wpa/Makefile1
-rw-r--r--lib/AST/Makefile2
-rw-r--r--lib/Analysis/Makefile2
-rw-r--r--lib/Basic/Makefile5
-rw-r--r--lib/Checker/Makefile2
-rw-r--r--lib/CodeGen/Makefile5
-rw-r--r--lib/Driver/Makefile2
-rw-r--r--lib/Frontend/Makefile2
-rw-r--r--lib/Index/Makefile2
-rw-r--r--lib/Lex/Makefile2
-rw-r--r--lib/Parse/Makefile2
-rw-r--r--lib/Rewrite/Makefile2
-rw-r--r--lib/Sema/Makefile2
-rw-r--r--tools/c-index-test/Makefile1
-rw-r--r--tools/driver/Makefile1
-rw-r--r--tools/libclang/Makefile2
19 files changed, 6 insertions, 38 deletions
diff --git a/Makefile b/Makefile
index 7b2a365f97..acb620dddd 100644
--- a/Makefile
+++ b/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/examples/PrintFunctionNames/Makefile b/examples/PrintFunctionNames/Makefile
index 4136a98c5c..fe9712f8f2 100644
--- a/examples/PrintFunctionNames/Makefile
+++ b/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/examples/clang-interpreter/Makefile b/examples/clang-interpreter/Makefile
index 6683a57c3b..e46b2037b9 100644
--- a/examples/clang-interpreter/Makefile
+++ b/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/examples/wpa/Makefile b/examples/wpa/Makefile
index 16f92804ac..2c2154d8d3 100644
--- a/examples/wpa/Makefile
+++ b/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/lib/AST/Makefile b/lib/AST/Makefile
index a4bb9aa99d..7a1672b817 100644
--- a/lib/AST/Makefile
+++ b/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/lib/Analysis/Makefile b/lib/Analysis/Makefile
index e9950fc440..03bf7a6712 100644
--- a/lib/Analysis/Makefile
+++ b/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/lib/Basic/Makefile b/lib/Basic/Makefile
index f36a1bcff6..51b8ac1b45 100644
--- a/lib/Basic/Makefile
+++ b/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/lib/Checker/Makefile b/lib/Checker/Makefile
index fc2bc50721..1bc6529164 100644
--- a/lib/Checker/Makefile
+++ b/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/lib/CodeGen/Makefile b/lib/CodeGen/Makefile
index cfa0217942..4b93524267 100644
--- a/lib/CodeGen/Makefile
+++ b/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/lib/Driver/Makefile b/lib/Driver/Makefile
index 5ee4abc99c..7bc340e109 100644
--- a/lib/Driver/Makefile
+++ b/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/lib/Frontend/Makefile b/lib/Frontend/Makefile
index 962568b58d..3eb4bc95f4 100644
--- a/lib/Frontend/Makefile
+++ b/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/lib/Index/Makefile b/lib/Index/Makefile
index 191e9d4b59..c902db0d56 100644
--- a/lib/Index/Makefile
+++ b/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/lib/Lex/Makefile b/lib/Lex/Makefile
index 98452146c0..938b8d5f05 100644
--- a/lib/Lex/Makefile
+++ b/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/lib/Parse/Makefile b/lib/Parse/Makefile
index e6bac34be2..238e02d999 100644
--- a/lib/Parse/Makefile
+++ b/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/lib/Rewrite/Makefile b/lib/Rewrite/Makefile
index 29e0595c1d..1c5b8a8117 100644
--- a/lib/Rewrite/Makefile
+++ b/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/lib/Sema/Makefile b/lib/Sema/Makefile
index 6e13327af1..90f2dffa0f 100644
--- a/lib/Sema/Makefile
+++ b/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/tools/c-index-test/Makefile b/tools/c-index-test/Makefile
index dd39d25e57..ff3dbe9a8a 100644
--- a/tools/c-index-test/Makefile
+++ b/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/tools/driver/Makefile b/tools/driver/Makefile
index 5125892efb..b1f020667a 100644
--- a/tools/driver/Makefile
+++ b/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/tools/libclang/Makefile b/tools/libclang/Makefile
index 4cfe1260fd..2fbdb0c6f3 100644
--- a/tools/libclang/Makefile
+++ b/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
generated by cgit v1.2.3-18-g5258 (git 2.32.0) at 2025-08-02 20:54:09 +0000