From 9b74c5ff1c614b5dc2c6da7dbf0edf44b136beb2 Mon Sep 17 00:00:00 2001
From: Keir Fraser <keir.fraser@citrix.com>
Date: Sat, 26 Jan 2008 15:26:55 +0000
Subject: Add ioemu to subdirs. ioemu is handled different because of the
 configure setup.

Signed-off-by: Bastian Blank <waldi@debian.org>
---
 tools/Makefile | 26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)

(limited to 'tools/Makefile')

diff --git a/tools/Makefile b/tools/Makefile
index d5f49f4da5..e28c976359 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -21,6 +21,7 @@ SUBDIRS-y += libaio
 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:
 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
 
-- 
cgit v1.2.3