1.1 --- a/stubdom/Makefile	Fri Sep 12 10:40:19 2008 +0100
     1.2 +++ b/stubdom/Makefile	Fri Sep 12 10:41:51 2008 +0100
     1.3 @@ -7,8 +7,6 @@ export stubdom=y
     1.4  export debug=y
     1.5  include $(XEN_ROOT)/Config.mk
     1.6  
     1.7 -override CONFIG_QEMU=ioemu
     1.8 -
     1.9  IOEMU_OPTIONS=--disable-sdl --disable-opengl --disable-vnc-tls --disable-brlapi --disable-kqemu
    1.10  ZLIB_URL?=http://www.zlib.net
    1.11  ZLIB_VERSION=1.2.3
    1.12 @@ -59,8 +57,8 @@ TARGET_CPPFLAGS += -nostdinc
    1.13  TARGET_CPPFLAGS += -isystem $(CURDIR)/$(MINI_OS)/include/posix
    1.14  TARGET_CPPFLAGS += -isystem $(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf/include
    1.15  TARGET_CPPFLAGS += -isystem $(GCC_INSTALL)include
    1.16 -TARGET_CPPFLAGS += -isystem $(CURDIR)/lwip/src/include
    1.17 -TARGET_CPPFLAGS += -isystem $(CURDIR)/lwip/src/include/ipv4
    1.18 +TARGET_CPPFLAGS += -isystem $(CURDIR)/lwip-$(XEN_TARGET_ARCH)/src/include
    1.19 +TARGET_CPPFLAGS += -isystem $(CURDIR)/lwip-$(XEN_TARGET_ARCH)/src/include/ipv4
    1.20  TARGET_CPPFLAGS += -I$(CURDIR)/include
    1.21  
    1.22  TARGET_LDFLAGS += -nostdlib -L$(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf/lib
    1.23 @@ -164,7 +162,10 @@ lwip-$(XEN_TARGET_ARCH): lwip-$(LWIP_VER
    1.24  .PHONY: $(CROSS_ROOT)
    1.25  $(CROSS_ROOT): cross-newlib cross-zlib cross-libpci
    1.26  
    1.27 -mk-headers-$(XEN_TARGET_ARCH):
    1.28 +$(XEN_ROOT)/tools/ioemu-dir:
    1.29 +	make -C $(XEN_ROOT)/tools ioemu-dir-find
    1.30 +
    1.31 +mk-headers-$(XEN_TARGET_ARCH): $(XEN_ROOT)/tools/ioemu-dir
    1.32  	mkdir -p include/xen && \
    1.33            ln -sf $(addprefix ../../,$(wildcard $(XEN_ROOT)/xen/include/public/*.h)) include/xen && \
    1.34            ln -sf $(addprefix ../../$(XEN_ROOT)/xen/include/public/,arch-ia64 arch-x86 hvm io xsm) include/xen && \
    1.35 @@ -189,7 +190,7 @@ ifeq ($(CONFIG_QEMU),ioemu)
    1.36  	  ln -sf ../$(XEN_ROOT)/tools/ioemu/* .)
    1.37  else
    1.38  	[ -h ioemu/Makefile ] || ( cd ioemu && \
    1.39 -	  ln -sf $(CONFIG_QEMU)/* . && \
    1.40 +	  ln -sf ../$(XEN_ROOT)/tools/ioemu-dir/* . && \
    1.41            rm -fr i386-dm && \
    1.42            rm -fr i386-stubdom && \
    1.43            mkdir i386-dm && \
    1.44 @@ -336,7 +337,7 @@ clean:
    1.45  	$(MAKE) -C c clean
    1.46  	rm -fr grub-$(XEN_TARGET_ARCH)
    1.47  	[ ! -d libxc-$(XEN_TARGET_ARCH) ] || $(MAKE) -C libxc-$(XEN_TARGET_ARCH) clean
    1.48 -	[ ! -d ioemu ] || $(MAKE) -C ioemu clean
    1.49 +	-[ ! -d ioemu ] || $(MAKE) -C ioemu clean
    1.50  
    1.51  # clean the cross-compilation result
    1.52  .PHONY: crossclean