[Xen-changelog] [xen-4.1-testing] Do not re-define XEN_ROOT in hypervisor sub-Makefiles.

[Xen patchbot-4.1-testing <patchbot@xxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir@xxxxxxx>
# Date 1317927836 -3600
# Node ID 460b613596fa27cf2026ce1de9ff42560853061a
# Parent  2e840539a705b41590bd15ab415eb091ead9e5b1
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@xxxxxxx>
xen-unstable changeset:   23048:5069eaaa9f79
xen-unstable date:        Thu Mar 17 08:04:10 2011 +0000
---


diff -r 2e840539a705 -r 460b613596fa xen/Makefile
--- a/xen/Makefile      Thu Oct 06 19:47:14 2011 +0100
+++ b/xen/Makefile      Thu Oct 06 20:03:56 2011 +0100
@@ -10,6 +10,7 @@
 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 -r 2e840539a705 -r 460b613596fa xen/Rules.mk
--- a/xen/Rules.mk      Thu Oct 06 19:47:14 2011 +0100
+++ b/xen/Rules.mk      Thu Oct 06 20:03:56 2011 +0100
@@ -10,7 +10,6 @@
 crash_debug   ?= n
 frame_pointer ?= n
 
-XEN_ROOT=$(BASEDIR)/..
 include $(XEN_ROOT)/Config.mk
 
 # Hardcoded configuration implications and dependencies.
diff -r 2e840539a705 -r 460b613596fa xen/arch/x86/boot/build32.mk
--- a/xen/arch/x86/boot/build32.mk      Thu Oct 06 19:47:14 2011 +0100
+++ b/xen/arch/x86/boot/build32.mk      Thu Oct 06 20:03:56 2011 +0100
@@ -1,4 +1,3 @@
-XEN_ROOT=../../../..
 override XEN_TARGET_ARCH=x86_32
 CFLAGS =
 include $(XEN_ROOT)/Config.mk
diff -r 2e840539a705 -r 460b613596fa xen/include/Makefile
--- a/xen/include/Makefile      Thu Oct 06 19:47:14 2011 +0100
+++ b/xen/include/Makefile      Thu Oct 06 20:03:56 2011 +0100
@@ -1,4 +1,3 @@
-XEN_ROOT:=$(BASEDIR)/..
 include $(XEN_ROOT)/Config.mk
 
 ifneq ($(CONFIG_COMPAT),)
diff -r 2e840539a705 -r 460b613596fa xen/tools/Makefile
--- a/xen/tools/Makefile        Thu Oct 06 19:47:14 2011 +0100
+++ b/xen/tools/Makefile        Thu Oct 06 20:03:56 2011 +0100
@@ -1,5 +1,4 @@
 
-XEN_ROOT = $(BASEDIR)/..
 include $(XEN_ROOT)/Config.mk
 
 .PHONY: default
diff -r 2e840539a705 -r 460b613596fa xen/tools/figlet/Makefile
--- a/xen/tools/figlet/Makefile Thu Oct 06 19:47:14 2011 +0100
+++ b/xen/tools/figlet/Makefile Thu Oct 06 20:03:56 2011 +0100
@@ -1,5 +1,4 @@
 
-XEN_ROOT = $(BASEDIR)/..
 include $(XEN_ROOT)/Config.mk
 
 figlet: figlet.c

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog