debuggers.hg

diff stubdom/Makefile @ 22466:de125ae8415d

Reapply 61c0c52a8c6c "qemu-xen: build adjustments"

The changeset
qemu-xen: build adjustments to support out-of-tree builds
works after all. Sorry for the noise.

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
author Ian Jackson <Ian.Jackson@eu.citrix.com>
date Tue Nov 23 19:12:55 2010 +0000 (2010-11-23)
parents a4e3051f811b
children
line diff
     1.1 --- a/stubdom/Makefile	Tue Nov 23 18:38:16 2010 +0000
     1.2 +++ b/stubdom/Makefile	Tue Nov 23 19:12:55 2010 +0000
     1.3 @@ -215,6 +215,9 @@ cross-ocaml: $(OCAML_STAMPFILE)
     1.4  .PHONY: $(CROSS_ROOT)
     1.5  $(CROSS_ROOT): cross-newlib cross-zlib cross-libpci
     1.6  
     1.7 +QEMU_ROOT := $(shell if [ -d "$(CONFIG_QEMU)" ]; then echo "$(CONFIG_QEMU)"; else echo .; fi)
     1.8 +
     1.9 +ifeq ($(QEMU_ROOT),.)
    1.10  $(XEN_ROOT)/tools/ioemu-dir:
    1.11  	$(CROSS_MAKE) -C $(XEN_ROOT)/tools ioemu-dir-find
    1.12  
    1.13 @@ -231,6 +234,13 @@ ioemu/linkfarm.stamp: $(XEN_ROOT)/tools/
    1.14  			)) |							\
    1.15  	    while read f; do rm -f "$$f"; ln -s "$$src/$$f" "$$f"; done
    1.16  	touch ioemu/linkfarm.stamp
    1.17 +else
    1.18 +export QEMU_ROOT
    1.19 +
    1.20 +ioemu/linkfarm.stamp:
    1.21 +	mkdir -p ioemu
    1.22 +	touch ioemu/linkfarm.stamp
    1.23 +endif
    1.24  
    1.25  mk-headers-$(XEN_TARGET_ARCH): ioemu/linkfarm.stamp
    1.26  	mkdir -p include/xen && \
    1.27 @@ -287,8 +297,8 @@ ioemu: cross-zlib cross-libpci libxc
    1.28  	    TARGET_CPPFLAGS="$(TARGET_CPPFLAGS)" \
    1.29  	    TARGET_CFLAGS="$(TARGET_CFLAGS)" \
    1.30  	    TARGET_LDFLAGS="$(TARGET_LDFLAGS)" \
    1.31 -	    ./xen-setup-stubdom )
    1.32 -	$(CROSS_MAKE) -C ioemu
    1.33 +	    $(QEMU_ROOT)/xen-setup-stubdom )
    1.34 +	$(CROSS_MAKE) -C ioemu -f $(QEMU_ROOT)/Makefile
    1.35  
    1.36  ######
    1.37  # caml