Consolidate the RUMPRUN_MKCONF include dance into global.mk

Convert all safe-looking locations, i.e. NOT app-tools
or platform/xen/xen.

diff --git a/global.mk b/global.mk
index a3bdd95f9770c3ad962b835769169aff8739fe7d..2fe2da6859cb7e27b4d77b61c914f8278ed781dd 100644 (file)
--- a/global.mk
+++ b/global.mk
@@ -1,3 +1,11 @@
+ifeq ($(RUMPRUN_MKCONF),)
+$(error RUMPRUN_MKCONF missing)
+endif
+include ${RUMPRUN_MKCONF}
+ifeq (${RRDEST},)
+$(error invalid RUMPRUN_MKCONF)
+endif
+
 DBG?=   -O2 -g
 CFLAGS+= -std=gnu99 ${DBG}
 CFLAGS+= -fno-stack-protector -ffreestanding

diff --git a/platform/hw/Makefile b/platform/hw/Makefile
index 4b665c71c08bbd7cdd0559a4a63bae6c4ef49d83..f6d7ed34235b9ad096ed346b06030006afeb22ed 100644 (file)
--- a/platform/hw/Makefile
+++ b/platform/hw/Makefile
@@ -1,17 +1,10 @@
-ifeq ($(RUMPRUN_MKCONF),)
-$(error RUMPRUN_MKCONF missing)
-endif
-include ${RUMPRUN_MKCONF}
+include ../../global.mk
+include ${BUILDRUMP_TOOLFLAGS}
 
 default: all
 
 PLATFORM_DEFAULT_TESTER=qemu
 
-include ../../global.mk
-ifdef BUILDRUMP_TOOLFLAGS
-include ${BUILDRUMP_TOOLFLAGS}
-endif
-
 CPPFLAGS=      -Iinclude -I../../include -nostdinc
 CFLAGS+=       ${BUILDRUMP_TOOL_CFLAGS}
 

diff --git a/platform/xen/Makefile b/platform/xen/Makefile
index 73fe18bfc7dfebcd22d95e60649ba26288525636..a12ee6b0852ff4c6cb3c77d851accff32abaa4a4 100644 (file)
--- a/platform/xen/Makefile
+++ b/platform/xen/Makefile
@@ -1,17 +1,10 @@
-ifeq ($(RUMPRUN_MKCONF),)
-$(error RUMPRUN_MKCONF missing)
-endif
-include ${RUMPRUN_MKCONF}
-
 .PHONY: all
 all: default
 
 PLATFORM_DEFAULT_TESTER=xen
 
 include ../../global.mk
-ifdef BUILDRUMP_TOOLFLAGS
 include ${BUILDRUMP_TOOLFLAGS}
-endif
 
 #
 # Rumprun-xen Makefile.

diff --git a/tests/nolibc/Makefile b/tests/nolibc/Makefile
index b1cacf946ccd740537fcc35479572fa77b66e8ce..89e25cb0996d38c8df742d54440d71a9e1bc17bc 100644 (file)
--- a/tests/nolibc/Makefile
+++ b/tests/nolibc/Makefile
@@ -1,14 +1,5 @@
-ifeq ($(RUMPRUN_MKCONF),)
-$(error RUMPRUN_MKCONF missing)
-endif
-include ${RUMPRUN_MKCONF}
-
-ifeq (${BUILDRUMP_TOOLFLAGS},)
-$(error invalid config file ${RUMPRUN_MKCONF})
-endif
-include ${BUILDRUMP_TOOLFLAGS}
-
 include ../../global.mk
+include ${BUILDRUMP_TOOLFLAGS}
 
 CFLAGS+=       ${BUILDRUMP_TOOL_CFLAGS}