diff options
| author | Keir Fraser <keir@xen.org> | 2011-03-17 10:36:25 +0000 |
|---|---|---|
| committer | Keir Fraser <keir@xen.org> | 2011-03-17 10:36:25 +0000 |
| commit | 547cb1849c1d6338d3141817f67c3ddd2c2beff5 (patch) | |
| tree | 2536c4884d8230ae2295098d4139f99d00bfffac /tools | |
| parent | fd515be3e4ac3d44d4aa2e7ee5de1f44965fdbee (diff) | |
| download | xen-547cb1849c1d6338d3141817f67c3ddd2c2beff5.tar.gz xen-547cb1849c1d6338d3141817f67c3ddd2c2beff5.tar.bz2 xen-547cb1849c1d6338d3141817f67c3ddd2c2beff5.zip | |
build: Make XEN_ROOT an absolute path.
Otherwise make can search the path relative to certain standard paths
such as /usr/include (e.g., the line '-include $(XEN_ROOT)/.config' in
Config.mk suffers from this).
Signed-off-by: Keir Fraser <keir@xen.org>
Diffstat (limited to 'tools')
94 files changed, 105 insertions, 107 deletions
diff --git a/tools/Makefile b/tools/Makefile index a7c1487807..3ac76e6b43 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT = .. +XEN_ROOT = $(CURDIR)/.. include $(XEN_ROOT)/tools/Rules.mk SUBDIRS-y := @@ -105,7 +105,6 @@ ioemu-dir-find: ln -sf ioemu-remote ioemu-dir; \ fi set -e; \ - $(absolutify_xen_root); \ $(buildmakevars2shellvars); \ cd ioemu-dir; \ $(QEMU_ROOT)/xen-setup $(IOEMU_CONFIGURE_CROSS) @@ -123,7 +122,6 @@ subdir-all-ioemu-dir subdir-install-ioemu-dir: ioemu-dir-find subdir-clean-ioemu-dir: set -e; if test -d ioemu-dir/.; then \ - $(absolutify_xen_root); \ $(buildmakevars2shellvars); \ $(MAKE) -C ioemu-dir clean; \ fi diff --git a/tools/blktap/Makefile b/tools/blktap/Makefile index 21c9556f60..40205660e8 100644 --- a/tools/blktap/Makefile +++ b/tools/blktap/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT = ../.. +XEN_ROOT = $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk SUBDIRS-y := diff --git a/tools/blktap/drivers/Makefile b/tools/blktap/drivers/Makefile index d2615d09b6..7265c76bd4 100644 --- a/tools/blktap/drivers/Makefile +++ b/tools/blktap/drivers/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT = ../../.. +XEN_ROOT = $(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk IBIN = blktapctrl tapdisk diff --git a/tools/blktap/lib/Makefile b/tools/blktap/lib/Makefile index 206e060114..505625e077 100644 --- a/tools/blktap/lib/Makefile +++ b/tools/blktap/lib/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT = ../../.. +XEN_ROOT = $(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk MAJOR = 3.0 diff --git a/tools/blktap2/Makefile b/tools/blktap2/Makefile index 51a9a4986e..d41758f58e 100644 --- a/tools/blktap2/Makefile +++ b/tools/blktap2/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT = ../.. +XEN_ROOT = $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk CFLAGS += $(CFLAGS_libxenctrl) diff --git a/tools/blktap2/control/Makefile b/tools/blktap2/control/Makefile index 8cab32e52e..4030ceb300 100644 --- a/tools/blktap2/control/Makefile +++ b/tools/blktap2/control/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT := ../../../ +XEN_ROOT := $(CURDIR)/../../../ include $(XEN_ROOT)/tools/Rules.mk MAJOR = 1.0 diff --git a/tools/blktap2/drivers/Makefile b/tools/blktap2/drivers/Makefile index eb20c7a1c9..b718c0839f 100644 --- a/tools/blktap2/drivers/Makefile +++ b/tools/blktap2/drivers/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT=../../.. +XEN_ROOT=$(CURDIR)/../../.. BLKTAP_ROOT= .. include $(XEN_ROOT)/tools/Rules.mk diff --git a/tools/blktap2/include/Makefile b/tools/blktap2/include/Makefile index ca18512405..f85351ec87 100644 --- a/tools/blktap2/include/Makefile +++ b/tools/blktap2/include/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT := ../../.. +XEN_ROOT := $(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk .PHONY: all diff --git a/tools/blktap2/lvm/Makefile b/tools/blktap2/lvm/Makefile index d5e07b2202..dc0ebfeb8c 100644 --- a/tools/blktap2/lvm/Makefile +++ b/tools/blktap2/lvm/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT = ../../.. +XEN_ROOT = $(CURDIR)/../../.. BLKTAP_ROOT := .. include $(XEN_ROOT)/tools/Rules.mk diff --git a/tools/blktap2/vhd/Makefile b/tools/blktap2/vhd/Makefile index f356f5ec6f..cb5e14593d 100644 --- a/tools/blktap2/vhd/Makefile +++ b/tools/blktap2/vhd/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT=../../.. +XEN_ROOT=$(CURDIR)/../../.. BLKTAP_ROOT := .. include $(XEN_ROOT)/tools/Rules.mk diff --git a/tools/blktap2/vhd/lib/Makefile b/tools/blktap2/vhd/lib/Makefile index 6f5f04c1c1..1b3fc692aa 100644 --- a/tools/blktap2/vhd/lib/Makefile +++ b/tools/blktap2/vhd/lib/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT=../../../.. +XEN_ROOT=$(CURDIR)/../../../.. BLKTAP_ROOT := ../.. include $(XEN_ROOT)/tools/Rules.mk diff --git a/tools/check/Makefile b/tools/check/Makefile index adfbdaea3a..f24816601b 100644 --- a/tools/check/Makefile +++ b/tools/check/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT = ../.. +XEN_ROOT = $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk .PHONY: all install diff --git a/tools/console/Makefile b/tools/console/Makefile index 3dc4c1b3d5..5a119b44cd 100644 --- a/tools/console/Makefile +++ b/tools/console/Makefile @@ -1,5 +1,5 @@ -XEN_ROOT=../.. +XEN_ROOT=$(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk CFLAGS += -Werror diff --git a/tools/console/testsuite/Makefile b/tools/console/testsuite/Makefile index 71deb0a6f8..d9e43809f6 100644 --- a/tools/console/testsuite/Makefile +++ b/tools/console/testsuite/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT = ../../.. +XEN_ROOT = $(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk LDFLAGS=-static diff --git a/tools/debugger/gdbsx/Makefile b/tools/debugger/gdbsx/Makefile index ce206e2ea5..7938dd84a9 100644 --- a/tools/debugger/gdbsx/Makefile +++ b/tools/debugger/gdbsx/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT = ../../.. +XEN_ROOT = $(CURDIR)/../../.. include ./Rules.mk .PHONY: all diff --git a/tools/debugger/gdbsx/gx/Makefile b/tools/debugger/gdbsx/gx/Makefile index 6dd8bf1ec5..9a0ff07d10 100644 --- a/tools/debugger/gdbsx/gx/Makefile +++ b/tools/debugger/gdbsx/gx/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT = ../../../.. +XEN_ROOT = $(CURDIR)/../../../.. include ../Rules.mk GX_OBJS := gx_comm.o gx_main.o gx_utils.o gx_local.o diff --git a/tools/debugger/gdbsx/xg/Makefile b/tools/debugger/gdbsx/xg/Makefile index c3e6185d94..2d02565290 100644 --- a/tools/debugger/gdbsx/xg/Makefile +++ b/tools/debugger/gdbsx/xg/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT = ../../../.. +XEN_ROOT = $(CURDIR)/../../../.. include ../Rules.mk XG_HDRS := xg_public.h diff --git a/tools/debugger/kdd/Makefile b/tools/debugger/kdd/Makefile index 0211c008dd..db162aa0fb 100644 --- a/tools/debugger/kdd/Makefile +++ b/tools/debugger/kdd/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT = ../../.. +XEN_ROOT = $(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk CFLAGS += $(CFLAGS_libxenctrl) diff --git a/tools/debugger/xenitp/Makefile b/tools/debugger/xenitp/Makefile index e1deaa480e..b4d5473fb9 100644 --- a/tools/debugger/xenitp/Makefile +++ b/tools/debugger/xenitp/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT=../../.. +XEN_ROOT=$(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk #CFLAGS += -Werror -g -O0 diff --git a/tools/examples/Makefile b/tools/examples/Makefile index 3d820c5f18..1a3b049c32 100644 --- a/tools/examples/Makefile +++ b/tools/examples/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT = ../.. +XEN_ROOT = $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk # Init scripts. diff --git a/tools/firmware/Makefile b/tools/firmware/Makefile index 0ce965e749..4b6d144134 100644 --- a/tools/firmware/Makefile +++ b/tools/firmware/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT = ../.. +XEN_ROOT = $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk # hvmloader is a 32-bit protected mode binary. diff --git a/tools/firmware/etherboot/Makefile b/tools/firmware/etherboot/Makefile index 8c3a422e6b..326f9b8264 100644 --- a/tools/firmware/etherboot/Makefile +++ b/tools/firmware/etherboot/Makefile @@ -1,6 +1,6 @@ override XEN_TARGET_ARCH = x86_32 -XEN_ROOT = ../../.. +XEN_ROOT = $(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk include Config diff --git a/tools/firmware/hvmloader/Makefile b/tools/firmware/hvmloader/Makefile index 175465c013..a18a8c5c0f 100644 --- a/tools/firmware/hvmloader/Makefile +++ b/tools/firmware/hvmloader/Makefile @@ -18,7 +18,7 @@ # Place - Suite 330, Boston, MA 02111-1307 USA. # -XEN_ROOT = ../../.. +XEN_ROOT = $(CURDIR)/../../.. include $(XEN_ROOT)/tools/firmware/Rules.mk SUBDIRS := acpi diff --git a/tools/firmware/hvmloader/acpi/Makefile b/tools/firmware/hvmloader/acpi/Makefile index f8ded8938b..96117248df 100644 --- a/tools/firmware/hvmloader/acpi/Makefile +++ b/tools/firmware/hvmloader/acpi/Makefile @@ -15,7 +15,7 @@ # Place - Suite 330, Boston, MA 02111-1307 USA. # -XEN_ROOT = ../../../.. +XEN_ROOT = $(CURDIR)/../../../.. include $(XEN_ROOT)/tools/firmware/Rules.mk C_SRC = build.c dsdt_anycpu.c dsdt_15cpu.c static_tables.c diff --git a/tools/firmware/rombios/32bit/Makefile b/tools/firmware/rombios/32bit/Makefile index 407faff956..92b32367f5 100644 --- a/tools/firmware/rombios/32bit/Makefile +++ b/tools/firmware/rombios/32bit/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT = ../../../.. +XEN_ROOT = $(CURDIR)/../../../.. include $(XEN_ROOT)/tools/firmware/Rules.mk TARGET = 32bitbios_flat.h diff --git a/tools/firmware/rombios/32bit/tcgbios/Makefile b/tools/firmware/rombios/32bit/tcgbios/Makefile index 8ce1d77e35..09c01f7a7b 100644 --- a/tools/firmware/rombios/32bit/tcgbios/Makefile +++ b/tools/firmware/rombios/32bit/tcgbios/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT = ../../../../.. +XEN_ROOT = $(CURDIR)/../../../../.. include $(XEN_ROOT)/tools/firmware/Rules.mk TARGET = tcgbiosext.o diff --git a/tools/firmware/rombios/Makefile b/tools/firmware/rombios/Makefile index 8321eadd85..2f2e4090e7 100644 --- a/tools/firmware/rombios/Makefile +++ b/tools/firmware/rombios/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT = ../../.. +XEN_ROOT = $(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk SUBDIRS := 32bit diff --git a/tools/flask/Makefile b/tools/flask/Makefile index 08961cf810..a27b2650b3 100644 --- a/tools/flask/Makefile +++ b/tools/flask/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT = ../.. +XEN_ROOT = $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk SUBDIRS := diff --git a/tools/flask/libflask/Makefile b/tools/flask/libflask/Makefile index 0af2f06213..e1f5703762 100644 --- a/tools/flask/libflask/Makefile +++ b/tools/flask/libflask/Makefile @@ -1,7 +1,7 @@ MAJOR = 1.0 MINOR = 0 -XEN_ROOT = ../../.. +XEN_ROOT = $(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk XEN_LIBXC = $(XEN_ROOT)/tools/libxc diff --git a/tools/flask/utils/Makefile b/tools/flask/utils/Makefile index c7110a45bf..85a02291cd 100644 --- a/tools/flask/utils/Makefile +++ b/tools/flask/utils/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT=../../.. +XEN_ROOT=$(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk XEN_LIBXC = $(XEN_ROOT)/tools/libxc diff --git a/tools/hotplug/Linux/Makefile b/tools/hotplug/Linux/Makefile index d3662a8455..5401592ae1 100644 --- a/tools/hotplug/Linux/Makefile +++ b/tools/hotplug/Linux/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT = ../../.. +XEN_ROOT = $(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk # Init scripts. diff --git a/tools/hotplug/Makefile b/tools/hotplug/Makefile index e22cae4fa5..f147b5918c 100644 --- a/tools/hotplug/Makefile +++ b/tools/hotplug/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT = ../.. +XEN_ROOT = $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk SUBDIRS-y := common diff --git a/tools/hotplug/NetBSD/Makefile b/tools/hotplug/NetBSD/Makefile index 98c1c5bbd4..2ae5a34ebc 100644 --- a/tools/hotplug/NetBSD/Makefile +++ b/tools/hotplug/NetBSD/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT = ../../.. +XEN_ROOT = $(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk # Xen script dir and scripts to go there. diff --git a/tools/hotplug/common/Makefile b/tools/hotplug/common/Makefile index 35fab6daf2..fe6ae4b466 100644 --- a/tools/hotplug/common/Makefile +++ b/tools/hotplug/common/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT = ../../.. +XEN_ROOT = $(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk HOTPLUGPATH="hotplugpath.sh" diff --git a/tools/include/Makefile b/tools/include/Makefile index 62c27170ef..cbff41b93e 100644 --- a/tools/include/Makefile +++ b/tools/include/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT = ../.. +XEN_ROOT = $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk .PHONY: all @@ -11,11 +11,11 @@ xen-foreign: xen/.dir: @rm -rf xen mkdir -p xen/libelf - ln -sf ../$(XEN_ROOT)/xen/include/public/COPYING xen - ln -sf $(addprefix ../,$(wildcard $(XEN_ROOT)/xen/include/public/*.h)) xen - ln -sf $(addprefix ../$(XEN_ROOT)/xen/include/public/,arch-ia64 arch-x86 hvm io xsm) xen + ln -sf $(XEN_ROOT)/xen/include/public/COPYING xen + ln -sf $(wildcard $(XEN_ROOT)/xen/include/public/*.h) xen + ln -sf $(addprefix $(XEN_ROOT)/xen/include/public/,arch-ia64 arch-x86 hvm io xsm) xen ln -sf ../xen-sys/$(XEN_OS) xen/sys - ln -sf $(addprefix ../../$(XEN_ROOT)/xen/include/xen/,libelf.h elfstructs.h) xen/libelf/ + ln -sf $(addprefix $(XEN_ROOT)/xen/include/xen/,libelf.h elfstructs.h) xen/libelf/ ln -s ../xen-foreign xen/foreign touch $@ diff --git a/tools/include/xen-foreign/Makefile b/tools/include/xen-foreign/Makefile index 77a535f4d0..0de9018310 100644 --- a/tools/include/xen-foreign/Makefile +++ b/tools/include/xen-foreign/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT=../../.. +XEN_ROOT=$(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk ROOT = $(XEN_ROOT)/xen/include/public diff --git a/tools/libaio/src/Makefile b/tools/libaio/src/Makefile index dd67529ae7..4ec7ab0e6c 100644 --- a/tools/libaio/src/Makefile +++ b/tools/libaio/src/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT = ../../.. +XEN_ROOT = $(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk prefix=$(PREFIX) diff --git a/tools/libfsimage/Makefile b/tools/libfsimage/Makefile index d5194fe54d..2075a192ab 100644 --- a/tools/libfsimage/Makefile +++ b/tools/libfsimage/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT = ../.. +XEN_ROOT = $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk SUBDIRS-y = common ufs reiserfs iso9660 fat zfs diff --git a/tools/libfsimage/common/Makefile b/tools/libfsimage/common/Makefile index 4f72bb5eea..afb1e96e0d 100644 --- a/tools/libfsimage/common/Makefile +++ b/tools/libfsimage/common/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT = ../../.. +XEN_ROOT = $(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk MAJOR = 1.0 diff --git a/tools/libfsimage/ext2fs-lib/Makefile b/tools/libfsimage/ext2fs-lib/Makefile index a60b3a58a5..142207f63b 100644 --- a/tools/libfsimage/ext2fs-lib/Makefile +++ b/tools/libfsimage/ext2fs-lib/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT = ../../.. +XEN_ROOT = $(CURDIR)/../../.. LIB_SRCS-y = ext2fs-lib.c diff --git a/tools/libfsimage/ext2fs/Makefile b/tools/libfsimage/ext2fs/Makefile index 43a4501f5d..8ff4c71a1c 100644 --- a/tools/libfsimage/ext2fs/Makefile +++ b/tools/libfsimage/ext2fs/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT = ../../.. +XEN_ROOT = $(CURDIR)/../../.. LIB_SRCS-y = fsys_ext2fs.c diff --git a/tools/libfsimage/fat/Makefile b/tools/libfsimage/fat/Makefile index bfc55e4f8c..2911a0e0e7 100644 --- a/tools/libfsimage/fat/Makefile +++ b/tools/libfsimage/fat/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT = ../../.. +XEN_ROOT = $(CURDIR)/../../.. LIB_SRCS-y = fsys_fat.c diff --git a/tools/libfsimage/iso9660/Makefile b/tools/libfsimage/iso9660/Makefile index 6e7169490b..4096cafa0c 100644 --- a/tools/libfsimage/iso9660/Makefile +++ b/tools/libfsimage/iso9660/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT = ../../.. +XEN_ROOT = $(CURDIR)/../../.. LIB_SRCS-y = fsys_iso9660.c diff --git a/tools/libfsimage/reiserfs/Makefile b/tools/libfsimage/reiserfs/Makefile index c71fff8843..57f286b256 100644 --- a/tools/libfsimage/reiserfs/Makefile +++ b/tools/libfsimage/reiserfs/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT = ../../.. +XEN_ROOT = $(CURDIR)/../../.. LIB_SRCS-y = fsys_reiserfs.c diff --git a/tools/libfsimage/ufs/Makefile b/tools/libfsimage/ufs/Makefile index b7218c2b3f..c1371080f5 100644 --- a/tools/libfsimage/ufs/Makefile +++ b/tools/libfsimage/ufs/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT = ../../.. +XEN_ROOT = $(CURDIR)/../../.. LIB_SRCS-y = fsys_ufs.c diff --git a/tools/libfsimage/zfs/Makefile b/tools/libfsimage/zfs/Makefile index 1f55def8ce..9fb0aabe78 100644 --- a/tools/libfsimage/zfs/Makefile +++ b/tools/libfsimage/zfs/Makefile @@ -22,7 +22,7 @@ # Use is subject to license terms. # -XEN_ROOT = ../../.. +XEN_ROOT = $(CURDIR)/../../.. CFLAGS += -DFSYS_ZFS -DFSIMAGE -I$(XEN_ROOT)/tools/libfsimage/zfs LIB_SRCS-y = zfs_lzjb.c zfs_sha256.c zfs_fletcher.c fsi_zfs.c fsys_zfs.c diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile index 5a7677e996..9942c3ab11 100644 --- a/tools/libxc/Makefile +++ b/tools/libxc/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT = ../.. +XEN_ROOT = $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk MAJOR = 4.0 diff --git a/tools/libxc/ia64/Makefile b/tools/libxc/ia64/Makefile index 6a1d6d00e6..9d4d5ebc77 100644 --- a/tools/libxc/ia64/Makefile +++ b/tools/libxc/ia64/Makefile @@ -14,7 +14,7 @@ DOMFW_SRCS_BASE := dom_fw_common.c dom_fw_domu.c dom_fw_asm.S endif DOMFW_SRCS := $(addprefix ia64/, $(DOMFW_SRCS_BASE)) $(DOMFW_SRCS): - ln -sf ../$(XEN_ROOT)/xen/arch/ia64/xen/$(@F) $@ + ln -sf $(XEN_ROOT)/xen/arch/ia64/xen/$(@F) $@ # XXX kludge: libxc/Makefile doesn't understand .S. GUEST_SRCS-y += $(patsubst %.S, %.c, $(DOMFW_SRCS)) @@ -29,7 +29,7 @@ CFLAGS += -Iia64 DOMFW_ASM_HDRS_BASE := bundle.h dom_fw.h dom_fw_common.h dom_fw_domu.h DOMFW_ASM_HDRS := $(addprefix ia64/asm/, $(DOMFW_ASM_HDRS_BASE)) $(DOMFW_ASM_HDRS): ia64/asm - ln -sf ../../$(XEN_ROOT)/xen/include/asm-ia64/$(@F) $@ + ln -sf $(XEN_ROOT)/xen/include/asm-ia64/$(@F) $@ build: $(DOMFW_ASM_HDR) .PHONY: mk-symlinks-acpi mk-symlinks-misc ia64-clean @@ -43,12 +43,12 @@ $(IA64_EMPTY_FILES): $(IA64_HDR_DIRS) echo "/* automatically created dummy empty header file. */" > $@ mk-symlinks-acpi: $(IA64_HDR_DIRS) $(IA64_EMPTY_FILES) $(DOMFW_ASM_HDRS) - ( cd ia64/acpi && ln -sf ../../$(XEN_ROOT)/xen/include/acpi/*.h .) - ( cd ia64/acpi/platform && ln -sf ../../../$(XEN_ROOT)/xen/include/acpi/platform/*.h .) - ( cd ia64/xen && ln -sf ../../$(XEN_ROOT)/xen/include/xen/acpi.h .) + ( cd ia64/acpi && ln -sf $(XEN_ROOT)/xen/include/acpi/*.h .) + ( cd ia64/acpi/platform && ln -sf $(XEN_ROOT)/xen/include/acpi/platform/*.h .) + ( cd ia64/xen && ln -sf $(XEN_ROOT)/xen/include/xen/acpi.h .) mk-symlinks-misc: $(IA64_HDR_DIRS) - ( cd ia64/asm && ln -sf ../../$(XEN_ROOT)/xen/include/asm-ia64/linux-xen/asm/kregs.h .) - ( cd ia64/asm && ln -sf ../../$(XEN_ROOT)/xen/include/asm-ia64/linux/asm/fpswa.h .) + ( cd ia64/asm && ln -sf $(XEN_ROOT)/xen/include/asm-ia64/linux-xen/asm/kregs.h .) + ( cd ia64/asm && ln -sf $(XEN_ROOT)/xen/include/asm-ia64/linux/asm/fpswa.h .) build: mk-symlinks-acpi mk-symlinks-misc clean: ia64-clean diff --git a/tools/libxen/Makefile b/tools/libxen/Makefile index d051667588..1996b98142 100644 --- a/tools/libxen/Makefile +++ b/tools/libxen/Makefile @@ -15,7 +15,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -XEN_ROOT=../.. +XEN_ROOT=$(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk MAJOR = 1.0 diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile index a139f54b52..725d5d1491 100644 --- a/tools/libxl/Makefile +++ b/tools/libxl/Makefile @@ -2,7 +2,7 @@ # tools/libxl/Makefile # -XEN_ROOT = ../.. +XEN_ROOT = $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk MAJOR = 1.0 diff --git a/tools/memshr/Makefile b/tools/memshr/Makefile index fcf3a4ef22..d6ed42a87e 100644 --- a/tools/memshr/Makefile +++ b/tools/memshr/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT = ../.. +XEN_ROOT = $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk LIBMEMSHR-BUILD := libmemshr.a diff --git a/tools/misc/Makefile b/tools/misc/Makefile index 89e0ac46a9..e4e8bfe14c 100644 --- a/tools/misc/Makefile +++ b/tools/misc/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT=../.. +XEN_ROOT=$(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk CFLAGS += -Werror diff --git a/tools/misc/lomount/Makefile b/tools/misc/lomount/Makefile index 7eafce16e5..67636a8cb1 100644 --- a/tools/misc/lomount/Makefile +++ b/tools/misc/lomount/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT=../../.. +XEN_ROOT=$(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk CFLAGS += -Werror diff --git a/tools/misc/miniterm/Makefile b/tools/misc/miniterm/Makefile index 116ef1f6b3..5c5f561393 100644 --- a/tools/misc/miniterm/Makefile +++ b/tools/misc/miniterm/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT:=../../.. +XEN_ROOT:=$(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk TARGET = miniterm diff --git a/tools/misc/nsplitd/Makefile b/tools/misc/nsplitd/Makefile index d15bb4d12b..91ccf4dab8 100644 --- a/tools/misc/nsplitd/Makefile +++ b/tools/misc/nsplitd/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT := ../../.. +XEN_ROOT := $(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk CFILES = $(wildcard *.c) diff --git a/tools/ocaml/Makefile b/tools/ocaml/Makefile index 9964631e51..6b22bbe779 100644 --- a/tools/ocaml/Makefile +++ b/tools/ocaml/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT = ../.. +XEN_ROOT = $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk SUBDIRS_PROGRAMS = xenstored diff --git a/tools/ocaml/libs/Makefile b/tools/ocaml/libs/Makefile index 2a50a31ef9..39705141eb 100644 --- a/tools/ocaml/libs/Makefile +++ b/tools/ocaml/libs/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT = ../../.. +XEN_ROOT = $(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk SUBDIRS= \ diff --git a/tools/ocaml/libs/eventchn/Makefile b/tools/ocaml/libs/eventchn/Makefile index ad017a1a93..2d644d9de6 100644 --- a/tools/ocaml/libs/eventchn/Makefile +++ b/tools/ocaml/libs/eventchn/Makefile @@ -1,4 +1,4 @@ -TOPLEVEL=../.. +TOPLEVEL=$(CURDIR)/../.. XEN_ROOT=$(TOPLEVEL)/../.. include $(TOPLEVEL)/common.make diff --git a/tools/ocaml/libs/log/Makefile b/tools/ocaml/libs/log/Makefile index f6a26d6c92..3f35bb0540 100644 --- a/tools/ocaml/libs/log/Makefile +++ b/tools/ocaml/libs/log/Makefile @@ -1,4 +1,4 @@ -TOPLEVEL=../.. +TOPLEVEL=$(CURDIR)/../.. XEN_ROOT=$(TOPLEVEL)/../.. include $(TOPLEVEL)/common.make diff --git a/tools/ocaml/libs/mmap/Makefile b/tools/ocaml/libs/mmap/Makefile index 6796d93895..1a790925f1 100644 --- a/tools/ocaml/libs/mmap/Makefile +++ b/tools/ocaml/libs/mmap/Makefile @@ -1,4 +1,4 @@ -TOPLEVEL=../.. +TOPLEVEL=$(CURDIR)/../.. XEN_ROOT=$(TOPLEVEL)/../.. include $(TOPLEVEL)/common.make diff --git a/tools/ocaml/libs/uuid/Makefile b/tools/ocaml/libs/uuid/Makefile index 509dd7c5f5..d6cd8dbc67 100644 --- a/tools/ocaml/libs/uuid/Makefile +++ b/tools/ocaml/libs/uuid/Makefile @@ -1,4 +1,4 @@ -TOPLEVEL=../.. +TOPLEVEL=$(CURDIR)/../.. XEN_ROOT=$(TOPLEVEL)/../.. include $(TOPLEVEL)/common.make diff --git a/tools/ocaml/libs/xb/Makefile b/tools/ocaml/libs/xb/Makefile index 7e583ea5d3..317d879c2c 100644 --- a/tools/ocaml/libs/xb/Makefile +++ b/tools/ocaml/libs/xb/Makefile @@ -1,4 +1,4 @@ -TOPLEVEL=../.. +TOPLEVEL=$(CURDIR)/../.. XEN_ROOT=$(TOPLEVEL)/../.. include $(TOPLEVEL)/common.make diff --git a/tools/ocaml/libs/xc/Makefile b/tools/ocaml/libs/xc/Makefile index 211ad87f2c..b53ab74b2f 100644 --- a/tools/ocaml/libs/xc/Makefile +++ b/tools/ocaml/libs/xc/Makefile @@ -1,4 +1,4 @@ -TOPLEVEL=../.. +TOPLEVEL=$(CURDIR)/../.. XEN_ROOT=$(TOPLEVEL)/../.. include $(TOPLEVEL)/common.make diff --git a/tools/ocaml/libs/xl/Makefile b/tools/ocaml/libs/xl/Makefile index f04e7c740d..1b31fad954 100644 --- a/tools/ocaml/libs/xl/Makefile +++ b/tools/ocaml/libs/xl/Makefile @@ -1,4 +1,4 @@ -TOPLEVEL=../.. +TOPLEVEL=$(CURDIR)/../.. XEN_ROOT=$(TOPLEVEL)/../.. include $(TOPLEVEL)/common.make diff --git a/tools/ocaml/libs/xs/Makefile b/tools/ocaml/libs/xs/Makefile index 31a9646f23..bc0db8318a 100644 --- a/tools/ocaml/libs/xs/Makefile +++ b/tools/ocaml/libs/xs/Makefile @@ -1,4 +1,4 @@ -TOPLEVEL=../.. +TOPLEVEL=$(CURDIR)/../.. XEN_ROOT=$(TOPLEVEL)/../.. include $(TOPLEVEL)/common.make diff --git a/tools/ocaml/xenstored/Makefile b/tools/ocaml/xenstored/Makefile index c13d837e67..4e674ab963 100644 --- a/tools/ocaml/xenstored/Makefile +++ b/tools/ocaml/xenstored/Makefile @@ -1,5 +1,5 @@ -XEN_ROOT = ../../.. -OCAML_TOPLEVEL = .. +XEN_ROOT = $(CURDIR)/../../.. +OCAML_TOPLEVEL = $(CURDIR)/.. include $(OCAML_TOPLEVEL)/common.make OCAMLINCLUDE += \ diff --git a/tools/pygrub/Makefile b/tools/pygrub/Makefile index 49abed06d1..1d6e659e63 100644 --- a/tools/pygrub/Makefile +++ b/tools/pygrub/Makefile @@ -1,5 +1,5 @@ -XEN_ROOT = ../.. +XEN_ROOT = $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk .PHONY: all diff --git a/tools/python/Makefile b/tools/python/Makefile index ee7e62564c..eb7d7f0bd1 100644 --- a/tools/python/Makefile +++ b/tools/python/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT = ../.. +XEN_ROOT = $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk .PHONY: all diff --git a/tools/remus/Makefile b/tools/remus/Makefile index 59514829dc..ae823769c6 100644 --- a/tools/remus/Makefile +++ b/tools/remus/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT=../.. +XEN_ROOT=$(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk SCRIPTS = remus diff --git a/tools/security/Makefile b/tools/security/Makefile index 4931637435..605bc8864a 100644 --- a/tools/security/Makefile +++ b/tools/security/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT = ../.. +XEN_ROOT = $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk CFLAGS += -Werror diff --git a/tools/tests/mce-test/tools/Makefile b/tools/tests/mce-test/tools/Makefile index c3e0513644..43e39ad1f4 100644 --- a/tools/tests/mce-test/tools/Makefile +++ b/tools/tests/mce-test/tools/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT=../../../.. +XEN_ROOT=$(CURDIR)/../../../.. include $(XEN_ROOT)/tools/Rules.mk CFLAGS += -Werror diff --git a/tools/tests/x86_emulator/Makefile b/tools/tests/x86_emulator/Makefile index d0bbe0ee83..9c9739f329 100644 --- a/tools/tests/x86_emulator/Makefile +++ b/tools/tests/x86_emulator/Makefile @@ -1,5 +1,5 @@ -XEN_ROOT=../../.. +XEN_ROOT=$(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk TARGET := test_x86_emulator diff --git a/tools/tests/x86_emulator/blowfish.mk b/tools/tests/x86_emulator/blowfish.mk index 85da259a5c..7202873a96 100644 --- a/tools/tests/x86_emulator/blowfish.mk +++ b/tools/tests/x86_emulator/blowfish.mk @@ -1,5 +1,5 @@ -XEN_ROOT = ../../.. +XEN_ROOT = $(CURDIR)/../../.. CFLAGS = include $(XEN_ROOT)/tools/Rules.mk diff --git a/tools/tests/xen-access/Makefile b/tools/tests/xen-access/Makefile index 1a7e0369fb..aed8912285 100644 --- a/tools/tests/xen-access/Makefile +++ b/tools/tests/xen-access/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT=../../.. +XEN_ROOT=$(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk CFLAGS += -Werror diff --git a/tools/vnet/doc/Makefile b/tools/vnet/doc/Makefile index a234721b51..53f2bbff61 100644 --- a/tools/vnet/doc/Makefile +++ b/tools/vnet/doc/Makefile @@ -1,6 +1,6 @@ #!/usr/bin/make -f # -*- mode: Makefile; -*- -XEN_ROOT = ../../.. +XEN_ROOT = $(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk VERSION = 1.0 diff --git a/tools/vnet/examples/Makefile b/tools/vnet/examples/Makefile index 84d3f1e093..786fcb7adc 100644 --- a/tools/vnet/examples/Makefile +++ b/tools/vnet/examples/Makefile @@ -1,6 +1,6 @@ # -*- mode: Makefile; -*- #============================================================================ -XEN_ROOT = ../../.. +XEN_ROOT = $(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk .PHONY: all diff --git a/tools/vnet/scripts/Makefile b/tools/vnet/scripts/Makefile index 22910a4432..2717f9e64e 100644 --- a/tools/vnet/scripts/Makefile +++ b/tools/vnet/scripts/Makefile @@ -1,6 +1,6 @@ # -*- mode: Makefile; -*- #============================================================================ -XEN_ROOT = ../../.. +XEN_ROOT = $(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk .PHONY: all diff --git a/tools/vtpm/Makefile b/tools/vtpm/Makefile index 10f68360e9..653505ac4b 100644 --- a/tools/vtpm/Makefile +++ b/tools/vtpm/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT = ../.. +XEN_ROOT = $(CURDIR)/../.. # Base definitions and rules include $(XEN_ROOT)/tools/vtpm/Rules.mk diff --git a/tools/vtpm_manager/Makefile b/tools/vtpm_manager/Makefile index dc90eb8992..632f41bce3 100644 --- a/tools/vtpm_manager/Makefile +++ b/tools/vtpm_manager/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT = ../.. +XEN_ROOT = $(CURDIR)/../.. # Base definitions and rules include $(XEN_ROOT)/tools/vtpm_manager/Rules.mk diff --git a/tools/vtpm_manager/crypto/Makefile b/tools/vtpm_manager/crypto/Makefile index 63233a940e..13b61c984a 100644 --- a/tools/vtpm_manager/crypto/Makefile +++ b/tools/vtpm_manager/crypto/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT = ../../.. +XEN_ROOT = $(CURDIR)/../../.. include $(XEN_ROOT)/tools/vtpm_manager/Rules.mk BIN = libtcpaCrypto.a diff --git a/tools/vtpm_manager/manager/Makefile b/tools/vtpm_manager/manager/Makefile index f9c34f9b0c..82da1068f8 100644 --- a/tools/vtpm_manager/manager/Makefile +++ b/tools/vtpm_manager/manager/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT = ../../.. +XEN_ROOT = $(CURDIR)/../../.. include $(XEN_ROOT)/tools/vtpm_manager/Rules.mk BIN = vtpm_managerd diff --git a/tools/vtpm_manager/migration/Makefile b/tools/vtpm_manager/migration/Makefile index 938fdf85f7..cc6aee8f10 100644 --- a/tools/vtpm_manager/migration/Makefile +++ b/tools/vtpm_manager/migration/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT = ../../.. +XEN_ROOT = $(CURDIR)/../../.. include $(XEN_ROOT)/tools/vtpm_manager/Rules.mk VPATH = ../manager diff --git a/tools/vtpm_manager/tcs/Makefile b/tools/vtpm_manager/tcs/Makefile index 9d25817e63..11af91e9ad 100644 --- a/tools/vtpm_manager/tcs/Makefile +++ b/tools/vtpm_manager/tcs/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT = ../../.. +XEN_ROOT = $(CURDIR)/../../.. include $(XEN_ROOT)/tools/vtpm_manager/Rules.mk BIN = libTCS.a diff --git a/tools/vtpm_manager/util/Makefile b/tools/vtpm_manager/util/Makefile index 9e26c5df15..36bc38f63f 100644 --- a/tools/vtpm_manager/util/Makefile +++ b/tools/vtpm_manager/util/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT = ../../.. +XEN_ROOT = $(CURDIR)/../../.. include $(XEN_ROOT)/tools/vtpm_manager/Rules.mk BIN = libTCGUtils.a diff --git a/tools/xcutils/Makefile b/tools/xcutils/Makefile index c779d128c6..5872d57d8c 100644 --- a/tools/xcutils/Makefile +++ b/tools/xcutils/Makefile @@ -8,7 +8,7 @@ # Copyright (C) 2005 by Christian Limpach # -XEN_ROOT = ../.. +XEN_ROOT = $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk CFLAGS += -Werror diff --git a/tools/xenbackendd/Makefile b/tools/xenbackendd/Makefile index c36a551698..4950134d7d 100644 --- a/tools/xenbackendd/Makefile +++ b/tools/xenbackendd/Makefile @@ -9,7 +9,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -XEN_ROOT=../.. +XEN_ROOT=$(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk CFLAGS += -Werror diff --git a/tools/xenmon/Makefile b/tools/xenmon/Makefile index 64ba03033c..bde12f2788 100644 --- a/tools/xenmon/Makefile +++ b/tools/xenmon/Makefile @@ -10,7 +10,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -XEN_ROOT=../.. +XEN_ROOT=$(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk CFLAGS += -Werror diff --git a/tools/xenpaging/Makefile b/tools/xenpaging/Makefile index 1d94710abb..ab886f53a7 100644 --- a/tools/xenpaging/Makefile +++ b/tools/xenpaging/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT=../.. +XEN_ROOT=$(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk CFLAGS += -I $(XEN_XC) diff --git a/tools/xenpmd/Makefile b/tools/xenpmd/Makefile index 101757d661..2a9249cb96 100644 --- a/tools/xenpmd/Makefile +++ b/tools/xenpmd/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT=../.. +XEN_ROOT=$(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk CFLAGS += -Werror diff --git a/tools/xenstat/Makefile b/tools/xenstat/Makefile index c12e0a49de..904ccdde71 100644 --- a/tools/xenstat/Makefile +++ b/tools/xenstat/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT = ../.. +XEN_ROOT = $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk SUBDIRS := diff --git a/tools/xenstat/libxenstat/Makefile b/tools/xenstat/libxenstat/Makefile index 1a08d0597c..618480ad1a 100644 --- a/tools/xenstat/libxenstat/Makefile +++ b/tools/xenstat/libxenstat/Makefile @@ -12,7 +12,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # Lesser General Public License for more details. -XEN_ROOT=../../.. +XEN_ROOT=$(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk prefix=$(PREFIX) diff --git a/tools/xenstat/xentop/Makefile b/tools/xenstat/xentop/Makefile index 15daa39c59..d31ba06066 100644 --- a/tools/xenstat/xentop/Makefile +++ b/tools/xenstat/xentop/Makefile @@ -10,7 +10,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -XEN_ROOT=../../.. +XEN_ROOT=$(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk ifneq ($(XENSTAT_XENTOP),y) diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile index 35e68d0533..788401d555 100644 --- a/tools/xenstore/Makefile +++ b/tools/xenstore/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT=../.. +XEN_ROOT=$(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk MAJOR = 3.0 diff --git a/tools/xentrace/Makefile b/tools/xentrace/Makefile index 25dda4984a..46b18794ec 100644 --- a/tools/xentrace/Makefile +++ b/tools/xentrace/Makefile @@ -1,4 +1,4 @@ -XEN_ROOT=../.. +XEN_ROOT=$(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk CFLAGS += -Werror |