Do not re-define XEN_ROOT in hypervisor sub-Makefiles.

We can globally export it from xen/Makefile instead, as all hypervisor
builds have this Makefile at their root.

Signed-off-by: Keir Fraser <keir@xen.org>

diff --git a/xen/Makefile b/xen/Makefile
index d38caf102c4f74d3c850bf8a2a1e0bdebbf69256..a6367df7d46873df7db9c55c09a5d32c27844277 100644 (file)
--- a/xen/Makefile
+++ b/xen/Makefile
@@ -10,6 +10,7 @@ export XEN_WHOAMI     ?= $(USER)
 export XEN_DOMAIN      ?= $(shell ([ -x /bin/dnsdomainname ] && /bin/dnsdomainname) || ([ -x /bin/domainname ] && /bin/domainname || echo [unknown]))
 
 export BASEDIR := $(CURDIR)
+export XEN_ROOT := $(BASEDIR)/..
 
 .PHONY: default
 default: build

diff --git a/xen/Rules.mk b/xen/Rules.mk
index b3224a6afa95b2fff111e90e6039ffee20a73bb6..c7fe2510fb66c6a6777ed0d8c2c9d9c6813b33fb 100644 (file)
--- a/xen/Rules.mk
+++ b/xen/Rules.mk
@@ -11,7 +11,6 @@ crash_debug   ?= n
 frame_pointer ?= n
 lto           ?= n
 
-XEN_ROOT=$(BASEDIR)/..
 include $(XEN_ROOT)/Config.mk
 
 # Hardcoded configuration implications and dependencies.

diff --git a/xen/arch/x86/boot/build32.mk b/xen/arch/x86/boot/build32.mk
index 4dfb12f0a65bc4eacf19fad275644606a5750202..447033afd2b4acaa2b6cd2eebc89b4ba46b09476 100644 (file)
--- a/xen/arch/x86/boot/build32.mk
+++ b/xen/arch/x86/boot/build32.mk
@@ -1,4 +1,3 @@
-XEN_ROOT=../../../..
 override XEN_TARGET_ARCH=x86_32
 CFLAGS =
 include $(XEN_ROOT)/Config.mk

diff --git a/xen/include/Makefile b/xen/include/Makefile
index 633030ba03ace2a22b28af666ae4e72f2c195018..420294cc99c35234127b7314f494085d267e6d8a 100644 (file)
--- a/xen/include/Makefile
+++ b/xen/include/Makefile
@@ -1,4 +1,3 @@
-XEN_ROOT:=$(BASEDIR)/..
 include $(XEN_ROOT)/Config.mk
 
 ifneq ($(CONFIG_COMPAT),)

diff --git a/xen/tools/Makefile b/xen/tools/Makefile
index 922f15fae4186f0e7ffd5cc55c30d0e8df318326..612e36df18fa6244fb170a02dd8d2becdf9fdd7d 100644 (file)
--- a/xen/tools/Makefile
+++ b/xen/tools/Makefile
@@ -1,5 +1,4 @@
 
-XEN_ROOT = $(BASEDIR)/..
 include $(XEN_ROOT)/Config.mk
 
 .PHONY: default

diff --git a/xen/tools/figlet/Makefile b/xen/tools/figlet/Makefile
index 8b649375cd62bb1e4b683c35a57ae93d2d670972..b1f1045e84cee7a25f754a34bc6f4a04af29280a 100644 (file)
--- a/xen/tools/figlet/Makefile
+++ b/xen/tools/figlet/Makefile
@@ -1,5 +1,4 @@
 
-XEN_ROOT = $(BASEDIR)/..
 include $(XEN_ROOT)/Config.mk
 
 figlet: figlet.c