Revert 61c0c52a8c6c "qemu-xen: build adjustments"

It appears that the changeset
  qemu-xen: build adjustments to support out-of-tree builds
broke the build.

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>

diff --git a/Makefile b/Makefile
index d1c6b0a5b5041000102b790e30eaafda500ab3b1..d3af867a23671c70d9d1f36e062c6a44e3740ef7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -215,9 +215,6 @@ $(OCAML_STAMPFILE): ocaml-$(XEN_TARGET_ARCH)/.dirstamp
 .PHONY: $(CROSS_ROOT)
 $(CROSS_ROOT): cross-newlib cross-zlib cross-libpci
 
-QEMU_ROOT := $(shell if [ -d "$(CONFIG_QEMU)" ]; then echo "$(CONFIG_QEMU)"; else echo .; fi)
-
-ifeq ($(QEMU_ROOT),.)
 $(XEN_ROOT)/tools/ioemu-dir:
        $(CROSS_MAKE) -C $(XEN_ROOT)/tools ioemu-dir-find
 
@@ -234,13 +231,6 @@ ioemu/linkfarm.stamp: $(XEN_ROOT)/tools/ioemu-dir
                        )) |                                                    \
            while read f; do rm -f "$$f"; ln -s "$$src/$$f" "$$f"; done
        touch ioemu/linkfarm.stamp
-else
-export QEMU_ROOT
-
-ioemu/linkfarm.stamp:
-       mkdir -p ioemu
-       touch ioemu/linkfarm.stamp
-endif
 
 mk-headers-$(XEN_TARGET_ARCH): ioemu/linkfarm.stamp
        mkdir -p include/xen && \
@@ -297,8 +287,8 @@ ioemu: cross-zlib cross-libpci libxc
            TARGET_CPPFLAGS="$(TARGET_CPPFLAGS)" \
            TARGET_CFLAGS="$(TARGET_CFLAGS)" \
            TARGET_LDFLAGS="$(TARGET_LDFLAGS)" \
-           $(QEMU_ROOT)/xen-setup-stubdom )
-       $(CROSS_MAKE) -C ioemu -f $(QEMU_ROOT)/Makefile
+           ./xen-setup-stubdom )
+       $(CROSS_MAKE) -C ioemu
 
 ######
 # caml