1.1 --- a/tools/Makefile	Sat Jan 26 15:26:41 2008 +0000
     1.2 +++ b/tools/Makefile	Sat Jan 26 15:26:55 2008 +0000
     1.3 @@ -21,6 +21,7 @@ SUBDIRS-y += libaio
     1.4  SUBDIRS-y += blktap
     1.5  SUBDIRS-y += libfsimage
     1.6  SUBDIRS-$(LIBXENAPI_BINDINGS) += libxen
     1.7 +SUBDIRS-$(CONFIG_IOEMU) += ioemu
     1.8  
     1.9  # These don't cross-compile
    1.10  ifeq ($(XEN_COMPILE_ARCH),$(XEN_TARGET_ARCH))
    1.11 @@ -39,14 +40,12 @@ all: check
    1.12  	@set -e; for subdir in $(SUBDIRS-y); do \
    1.13  		$(MAKE) subdir-$@-$$subdir; \
    1.14  	done
    1.15 -	$(MAKE) ioemu
    1.16  
    1.17  .PHONY: install
    1.18  install: check
    1.19  	@set -e; for subdir in $(SUBDIRS-y); do \
    1.20  		$(MAKE) subdir-$@-$$subdir; \
    1.21  	done
    1.22 -	$(MAKE) ioemuinstall
    1.23  	$(INSTALL_DIR) $(DESTDIR)/var/xen/dump
    1.24  	$(INSTALL_DIR) $(DESTDIR)/var/log/xen
    1.25  	$(INSTALL_DIR) $(DESTDIR)/var/lib/xen
    1.26 @@ -56,7 +55,6 @@ clean: check_clean
    1.27  	@set -e; for subdir in $(SUBDIRS-y); do \
    1.28  		$(MAKE) subdir-$@-$$subdir; \
    1.29  	done
    1.30 -	$(MAKE) ioemuclean
    1.31  
    1.32  .PHONY: distclean
    1.33  distclean: clean
    1.34 @@ -78,21 +76,17 @@ check:
    1.35  check_clean:
    1.36  	$(MAKE) -C check clean
    1.37  
    1.38 -.PHONY: ioemu ioemuinstall ioemuclean
    1.39 -ifeq ($(CONFIG_IOEMU),y)
    1.40 -IOEMU_DIR ?= ioemu
    1.41  ifneq ($(XEN_COMPILE_ARCH),$(XEN_TARGET_ARCH))
    1.42  IOEMU_CONFIGURE_CROSS ?= --cross-prefix=$(CROSS_COMPILE) \
    1.43  			 --interp-prefix=$(CROSS_SYS_ROOT)
    1.44  endif
    1.45 -ioemu ioemuinstall:
    1.46 -	[ -f $(IOEMU_DIR)/config-host.mak ] || \
    1.47 -	  ( cd $(IOEMU_DIR) && XEN_TARGET_ARCH=$(XEN_TARGET_ARCH) sh configure --prefix=/usr \
    1.48 -		$(IOEMU_CONFIGURE_CROSS) )
    1.49 -	$(MAKE) -C $(IOEMU_DIR) $(patsubst ioemu%,%,$@)
    1.50 -ioemuclean:
    1.51 -	$(MAKE) -C $(IOEMU_DIR) distclean
    1.52 -else
    1.53 -ioemu ioemuinstall ioemuclean:
    1.54 -endif
    1.55 +
    1.56 +ioemu/config-host.mak:
    1.57 +	cd ioemu && XEN_TARGET_ARCH=$(XEN_TARGET_ARCH) sh configure --prefix=/usr \
    1.58 +		$(IOEMU_CONFIGURE_CROSS)
    1.59  
    1.60 +subdir-all-ioemu subdir-install-ioemu: ioemu/config-host.mak
    1.61 +
    1.62 +subdir-clean-ioemu:
    1.63 +	$(MAKE) -C ioemu distclean
    1.64 +