WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-changelog

[Xen-changelog] [xen-unstable] Add ioemu to subdirs.

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1201361215 0
# Node ID 363a1e84518912c71d2b4dc671c9798ad1a912a9
# Parent  7f2b79c0598809e20fd1d577ab6eeae4531214c4
Add ioemu to subdirs.
ioemu is handled different because of the configure setup.

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

diff -r 7f2b79c05988 -r 363a1e845189 tools/Makefile
--- a/tools/Makefile    Sat Jan 26 15:26:41 2008 +0000
+++ b/tools/Makefile    Sat Jan 26 15:26:55 2008 +0000
@@ -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-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog

<Prev in Thread] Current Thread [Next in Thread>
  • [Xen-changelog] [xen-unstable] Add ioemu to subdirs., Xen patchbot-unstable <=