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

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir@xxxxxxx>
# Date 1300349050 0
# Node ID 5069eaaa9f7981a3974cb1f73ec296d8f6affc20
# Parent  4ca13a170482edc642b8a7d8c68556c4194f11d0
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>
---


diff -r 4ca13a170482 -r 5069eaaa9f79 xen/Makefile
--- a/xen/Makefile      Wed Mar 16 16:44:25 2011 +0000
+++ b/xen/Makefile      Thu Mar 17 08:04:10 2011 +0000
@@ -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 4ca13a170482 -r 5069eaaa9f79 xen/Rules.mk
--- a/xen/Rules.mk      Wed Mar 16 16:44:25 2011 +0000
+++ b/xen/Rules.mk      Thu Mar 17 08:04:10 2011 +0000
@@ -11,7 +11,6 @@
 frame_pointer ?= n
 lto           ?= n
 
-XEN_ROOT=$(BASEDIR)/..
 include $(XEN_ROOT)/Config.mk
 
 # Hardcoded configuration implications and dependencies.
diff -r 4ca13a170482 -r 5069eaaa9f79 xen/arch/x86/boot/build32.mk
--- a/xen/arch/x86/boot/build32.mk      Wed Mar 16 16:44:25 2011 +0000
+++ b/xen/arch/x86/boot/build32.mk      Thu Mar 17 08:04:10 2011 +0000
@@ -1,4 +1,3 @@
-XEN_ROOT=../../../..
 override XEN_TARGET_ARCH=x86_32
 CFLAGS =
 include $(XEN_ROOT)/Config.mk
diff -r 4ca13a170482 -r 5069eaaa9f79 xen/include/Makefile
--- a/xen/include/Makefile      Wed Mar 16 16:44:25 2011 +0000
+++ b/xen/include/Makefile      Thu Mar 17 08:04:10 2011 +0000
@@ -1,4 +1,3 @@
-XEN_ROOT:=$(BASEDIR)/..
 include $(XEN_ROOT)/Config.mk
 
 ifneq ($(CONFIG_COMPAT),)
diff -r 4ca13a170482 -r 5069eaaa9f79 xen/tools/Makefile
--- a/xen/tools/Makefile        Wed Mar 16 16:44:25 2011 +0000
+++ b/xen/tools/Makefile        Thu Mar 17 08:04:10 2011 +0000
@@ -1,5 +1,4 @@
 
-XEN_ROOT = $(BASEDIR)/..
 include $(XEN_ROOT)/Config.mk
 
 .PHONY: default
diff -r 4ca13a170482 -r 5069eaaa9f79 xen/tools/figlet/Makefile
--- a/xen/tools/figlet/Makefile Wed Mar 16 16:44:25 2011 +0000
+++ b/xen/tools/figlet/Makefile Thu Mar 17 08:04:10 2011 +0000
@@ -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