# HG changeset patch # User Bastian Blank <waldi@debian.org> # Date 1201359991 -3600 # Node ID b3a70b37e377e44630ebbc688afbf9431dc9953d # Parent a2098ff1ee2eeb65e726057a8351ff4048eaad2c Add ioemu to subdirs. ioemu is handled different because of the configure setup. Signed-off-by: Bastian Blank <waldi@debian.org> diff -r a2098ff1ee2e -r b3a70b37e377 tools/Makefile --- a/tools/Makefile Sat Jan 26 16:06:31 2008 +0100 +++ b/tools/Makefile Sat Jan 26 16:06:31 2008 +0100 @@ -21,6 +21,7 @@ SUBDIRS-y += blktap SUBDIRS-y += blktap SUBDIRS-y += libfsimage SUBDIRS-$(LIBXENAPI_BINDINGS) += libxen +SUBDIRS-$(CONFIG_IOEMU) += ioemu # These don''t cross-compile ifeq ($(XEN_COMPILE_ARCH),$(XEN_TARGET_ARCH)) @@ -39,14 +40,12 @@ all: check @set -e; for subdir in $(SUBDIRS-y); do \ $(MAKE) subdir-$@-$$subdir; \ done - $(MAKE) ioemu .PHONY: install install: check @set -e; for subdir in $(SUBDIRS-y); do \ $(MAKE) subdir-$@-$$subdir; \ done - $(MAKE) ioemuinstall $(INSTALL_DIR) $(DESTDIR)/var/xen/dump $(INSTALL_DIR) $(DESTDIR)/var/log/xen $(INSTALL_DIR) $(DESTDIR)/var/lib/xen @@ -56,7 +55,6 @@ clean: check_clean @set -e; for subdir in $(SUBDIRS-y); do \ $(MAKE) subdir-$@-$$subdir; \ done - $(MAKE) ioemuclean .PHONY: distclean distclean: clean @@ -78,21 +76,17 @@ check_clean: check_clean: $(MAKE) -C check clean -.PHONY: ioemu ioemuinstall ioemuclean -ifeq ($(CONFIG_IOEMU),y) -IOEMU_DIR ?= ioemu ifneq ($(XEN_COMPILE_ARCH),$(XEN_TARGET_ARCH)) IOEMU_CONFIGURE_CROSS ?= --cross-prefix=$(CROSS_COMPILE) \ --interp-prefix=$(CROSS_SYS_ROOT) endif -ioemu ioemuinstall: - [ -f $(IOEMU_DIR)/config-host.mak ] || \ - ( cd $(IOEMU_DIR) && XEN_TARGET_ARCH=$(XEN_TARGET_ARCH) sh configure --prefix=/usr \ - $(IOEMU_CONFIGURE_CROSS) ) - $(MAKE) -C $(IOEMU_DIR) $(patsubst ioemu%,%,$@) -ioemuclean: - $(MAKE) -C $(IOEMU_DIR) distclean -else -ioemu ioemuinstall ioemuclean: -endif +ioemu/config-host.mak: + cd ioemu && XEN_TARGET_ARCH=$(XEN_TARGET_ARCH) sh configure --prefix=/usr \ + $(IOEMU_CONFIGURE_CROSS) + +subdir-all-ioemu subdir-install-ioemu: ioemu/config-host.mak + +subdir-clean-ioemu: + $(MAKE) -C ioemu distclean + _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel