12 files changed, 15 insertions, 15 deletions
diff --git a/clang/lib/AST/Makefile b/clang/lib/AST/Makefile
index 8afc629d6b3..ede25777c90 100644
--- a/clang/lib/AST/Makefile
+++ b/clang/lib/AST/Makefile
@@ -15,7 +15,7 @@ LEVEL = ../../../..
 LIBRARYNAME := clangAST
 BUILD_ARCHIVE = 1
 
-CPPFLAGS += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
+CPP.Flags += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
 
 include $(LEVEL)/Makefile.common
 
diff --git a/clang/lib/Analysis/Makefile b/clang/lib/Analysis/Makefile
index d6411122e32..9b473803fa9 100644
--- a/clang/lib/Analysis/Makefile
+++ b/clang/lib/Analysis/Makefile
@@ -15,7 +15,7 @@ LEVEL = ../../../..
 LIBRARYNAME := clangAnalysis
 BUILD_ARCHIVE = 1
 
-CPPFLAGS += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
+CPP.Flags += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
 
 include $(LEVEL)/Makefile.common
 
diff --git a/clang/lib/Checker/Makefile b/clang/lib/Checker/Makefile
index 673d152270c..c45ab294dec 100644
--- a/clang/lib/Checker/Makefile
+++ b/clang/lib/Checker/Makefile
@@ -15,7 +15,7 @@ LEVEL = ../../../..
 LIBRARYNAME := clangChecker
 BUILD_ARCHIVE = 1
 
-CPPFLAGS += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
+CPP.Flags += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
 
 include $(LEVEL)/Makefile.common
 
diff --git a/clang/lib/CodeGen/Makefile b/clang/lib/CodeGen/Makefile
index 83cb3673870..3cea6bbd9f0 100644
--- a/clang/lib/CodeGen/Makefile
+++ b/clang/lib/CodeGen/Makefile
@@ -16,9 +16,9 @@ LEVEL = ../../../..
 LIBRARYNAME := clangCodeGen
 BUILD_ARCHIVE = 1
 
-CPPFLAGS += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
+CPP.Flags += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
 ifdef CLANG_VENDOR
-CPPFLAGS += -DCLANG_VENDOR='"$(CLANG_VENDOR) "'
+CPP.Flags += -DCLANG_VENDOR='"$(CLANG_VENDOR) "'
 endif
 
 include $(LEVEL)/Makefile.common
diff --git a/clang/lib/Frontend/Makefile b/clang/lib/Frontend/Makefile
index a630b013363..9e1a864d96e 100644
--- a/clang/lib/Frontend/Makefile
+++ b/clang/lib/Frontend/Makefile
@@ -11,7 +11,7 @@ LEVEL = ../../../..
 LIBRARYNAME := clangFrontend
 BUILD_ARCHIVE = 1
 
-CPPFLAGS += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
+CPP.Flags += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
 
 include $(LEVEL)/Makefile.common
 
diff --git a/clang/lib/Index/Makefile b/clang/lib/Index/Makefile
index 9d33a2d175e..4d8671361cd 100644
--- a/clang/lib/Index/Makefile
+++ b/clang/lib/Index/Makefile
@@ -18,10 +18,10 @@ LIBRARYNAME := clangIndex
 BUILD_ARCHIVE = 1
 
 ifeq ($(ARCH),PowerPC)
-CXXFLAGS += -maltivec
+CXX.Flags += -maltivec
 endif
 
-CPPFLAGS += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
+CPP.Flags += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
 
 include $(LEVEL)/Makefile.common
 
diff --git a/clang/lib/Lex/Makefile b/clang/lib/Lex/Makefile
index 509077017c2..bd3c7a872d3 100644
--- a/clang/lib/Lex/Makefile
+++ b/clang/lib/Lex/Makefile
@@ -18,10 +18,10 @@ LIBRARYNAME := clangLex
 BUILD_ARCHIVE = 1
 
 ifeq ($(ARCH),PowerPC)
-CXXFLAGS += -maltivec
+CXX.Flags += -maltivec
 endif
 
-CPPFLAGS += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
+CPP.Flags += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
 
 include $(LEVEL)/Makefile.common
 
diff --git a/clang/lib/Parse/Makefile b/clang/lib/Parse/Makefile
index de16e3ea665..6a5540f7335 100644
--- a/clang/lib/Parse/Makefile
+++ b/clang/lib/Parse/Makefile
@@ -15,7 +15,7 @@ LEVEL = ../../../..
 LIBRARYNAME := clangParse
 BUILD_ARCHIVE = 1
 
-CPPFLAGS += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
+CPP.Flags += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
 
 include $(LEVEL)/Makefile.common
 
diff --git a/clang/lib/Rewrite/Makefile b/clang/lib/Rewrite/Makefile
index a6d3f772568..04c353090dc 100644
--- a/clang/lib/Rewrite/Makefile
+++ b/clang/lib/Rewrite/Makefile
@@ -15,7 +15,7 @@ LEVEL = ../../../..
 LIBRARYNAME := clangRewrite
 BUILD_ARCHIVE = 1
 
-CPPFLAGS += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
+CPP.Flags += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
 
 include $(LEVEL)/Makefile.common
 
diff --git a/clang/lib/Sema/Makefile b/clang/lib/Sema/Makefile
index 158f1af213d..3a5a99ad576 100644
--- a/clang/lib/Sema/Makefile
+++ b/clang/lib/Sema/Makefile
@@ -16,7 +16,7 @@ LEVEL = ../../../..
 LIBRARYNAME := clangSema
 BUILD_ARCHIVE = 1
 
-CPPFLAGS += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
+CPP.Flags += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
 
 include $(LEVEL)/Makefile.common
 
diff --git a/clang/tools/CIndex/Makefile b/clang/tools/CIndex/Makefile
index 3e288623e5e..650bcd3645d 100644
--- a/clang/tools/CIndex/Makefile
+++ b/clang/tools/CIndex/Makefile
@@ -10,7 +10,7 @@
 LEVEL = ../../../..
 LIBRARYNAME = CIndex
 
-CPPFLAGS += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
+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 
diff --git a/clang/tools/driver/Makefile b/clang/tools/driver/Makefile
index e5a9280a0cb..6434cb4ef55 100644
--- a/clang/tools/driver/Makefile
+++ b/clang/tools/driver/Makefile
@@ -12,7 +12,7 @@ TOOLNAME = clang
 ifndef CLANG_IS_PRODUCTION
 TOOLALIAS = clang++
 endif
-CPPFLAGS += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
+CPP.Flags += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
 
 # Clang tool has no plugins, optimize startup time.
 TOOL_NO_EXPORTS = 1