Put some common CFLAGS/CPPFLAGS into Makefile.inc

diff --git a/platform/Makefile.inc b/platform/Makefile.inc
index 3b37c7ad780eccaa1bf2507fec4cc051761f3bea..01db505af9233e69126d43afbe68338a1e42406b 100644 (file)
--- 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 b4caebbec1f63e181212979495b412670b3e475a..387440bdeb833aa47767db43ecb58b6d4b432a6d 100644 (file)
--- 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 85b3383120231735736d59b87da9d2ea4d71135e..8e711094d8c8d352cf7f1a3b5730456a20ec7ced 100644 (file)
--- 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?