From 5fc480e7c453996c23bc0abe094c91cb0d5c4147 Mon Sep 17 00:00:00 2001
From: Antti Kantee <pooka@iki.fi>
Date: Thu, 11 Feb 2016 20:04:55 +0000
Subject: [PATCH] Put some common CFLAGS/CPPFLAGS into Makefile.inc

---
 platform/Makefile.inc | 3 +++
 platform/hw/Makefile  | 3 ---
 platform/xen/Makefile | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/platform/Makefile.inc b/platform/Makefile.inc
index 3b37c7a..01db505 100644
--- a/platform/Makefile.inc
+++ b/platform/Makefile.inc
@@ -2,6 +2,9 @@ ifeq (${PLATFORM},)
 $(error need to specify $$PLATFORM!)
 endif
 
+CPPFLAGS+=	-Iinclude -I../../include -I${RROBJ}/include -nostdinc
+CFLAGS+=	${BUILDRUMP_TOOL_CFLAGS}
+
 TARGETS=	rumpkernlibs
 # compiler_rt is strictly speaking necessary only in KERNONLY=true,
 # but building it always makes testing kernonly easier
diff --git a/platform/hw/Makefile b/platform/hw/Makefile
index b4caebb..387440b 100644
--- a/platform/hw/Makefile
+++ b/platform/hw/Makefile
@@ -3,9 +3,6 @@ include ${BUILDRUMP_TOOLFLAGS}
 
 default: all
 
-CPPFLAGS=	-Iinclude -I../../include -I${RROBJ}/include -nostdinc
-CFLAGS+=	${BUILDRUMP_TOOL_CFLAGS}
-
 # Check if we're building for a supported target.
 supported= false
 # assume we're doing "make clean"
diff --git a/platform/xen/Makefile b/platform/xen/Makefile
index 85b3383..8e71109 100644
--- a/platform/xen/Makefile
+++ b/platform/xen/Makefile
@@ -19,10 +19,10 @@ include ../Makefile.inc
 .PHONY: default
 default: prepare links mini-os ${MAINOBJ} ${TARGETS}
 
-CPPFLAGS+= -isystem xen/include -I. -I../../include
+CPPFLAGS+= -isystem xen/include
 CPPFLAGS+= -no-integrated-cpp -nostdinc
 
-CFLAGS += -fno-builtin ${BUILDRUMP_TOOL_CFLAGS}
+CFLAGS += -fno-builtin
 
 # This is semi-duplicated from xen/arch/x86/arch.mk, can we avoid that?
 # XXX Which parts of the rumprun source *must* be compiled with these flags?
-- 
2.39.5