diff options
| author | Keir Fraser <keir@xen.org> | 2011-10-06 20:03:56 +0100 |
|---|---|---|
| committer | Keir Fraser <keir@xen.org> | 2011-10-06 20:03:56 +0100 |
| commit | 8bdbe7015af9e1b0ec6c9cbf10063505107db396 (patch) | |
| tree | 939fcfccf64e7cbce3abd758e29dd28c56da925c | |
| parent | 7297daddfa6a2aeb72b08e544836895f2a33aaa7 (diff) | |
| download | xen-8bdbe7015af9e1b0ec6c9cbf10063505107db396.tar.gz xen-8bdbe7015af9e1b0ec6c9cbf10063505107db396.tar.bz2 xen-8bdbe7015af9e1b0ec6c9cbf10063505107db396.zip | |
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>
xen-unstable changeset: 23048:5069eaaa9f79
xen-unstable date: Thu Mar 17 08:04:10 2011 +0000
| -rw-r--r-- | xen/Makefile | 1 | ||||
| -rw-r--r-- | xen/Rules.mk | 1 | ||||
| -rw-r--r-- | xen/arch/x86/boot/build32.mk | 1 | ||||
| -rw-r--r-- | xen/include/Makefile | 1 | ||||
| -rw-r--r-- | xen/tools/Makefile | 1 | ||||
| -rw-r--r-- | xen/tools/figlet/Makefile | 1 |
6 files changed, 1 insertions, 5 deletions
diff --git a/xen/Makefile b/xen/Makefile index 9e1ed772ba..8926c0bf63 100644 --- 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 d3348144c0..6c5d3de71e 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -10,7 +10,6 @@ lock_profile ?= n crash_debug ?= n frame_pointer ?= 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 2d2cfb15aa..809ddf2075 100644 --- 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 633030ba03..420294cc99 100644 --- 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 922f15fae4..612e36df18 100644 --- 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 8b649375cd..b1f1045e84 100644 --- 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 |