[Xen-changelog] [xen-unstable] Make ioemu targets more robust and make ioemu clean always succeed.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User chris@xxxxxxxxxxxxxxxxxxxxxxxx
# Node ID b8b7c278ca4c6e99f9f0e483400624418157deaf
# Parent  a61fd84125aab25a2a3b8a5f1a61a3dac3acbce8
Make ioemu targets more robust and make ioemu clean always succeed.

Based on a patch by: Alex Brett <Alex.Brett@xxxxxxxxxxxxx>
Signed-off-by: Christian Limpach <Christian.Limpach@xxxxxxxxxxxxx>
---
 tools/Makefile                |    6 +++---
 tools/ioemu/Makefile          |    4 ++--
 tools/ioemu/patches/xen-build |   17 ++++++++++++-----
 3 files changed, 17 insertions(+), 10 deletions(-)

diff -r a61fd84125aa -r b8b7c278ca4c tools/Makefile
--- a/tools/Makefile    Tue Jul 25 11:53:29 2006 +0100
+++ b/tools/Makefile    Tue Jul 25 14:26:54 2006 +0100
@@ -62,11 +62,11 @@ ifdef CONFIG_IOEMU
 ifdef CONFIG_IOEMU
 export IOEMU_DIR ?= ioemu
 ioemu ioemuinstall:
-       [ -f $(IOEMU_DIR)/config-host.h ] || \
-       (cd $(IOEMU_DIR) && sh configure --prefix=/usr)
+       [ -f $(IOEMU_DIR)/config-host.mak ] || \
+         (cd $(IOEMU_DIR) && sh configure --prefix=/usr)
        $(MAKE) -C $(IOEMU_DIR) $(patsubst ioemu%,%,$@)
 ioemuclean:
-       [ ! -f $(IOEMU_DIR)/config-host.h ] || $(MAKE) -C $(IOEMU_DIR) clean
+       $(MAKE) -C $(IOEMU_DIR) distclean
 else
 ioemu ioemuinstall ioemuclean:
 endif
diff -r a61fd84125aa -r b8b7c278ca4c tools/ioemu/Makefile
--- a/tools/ioemu/Makefile      Tue Jul 25 11:53:29 2006 +0100
+++ b/tools/ioemu/Makefile      Tue Jul 25 14:26:54 2006 +0100
@@ -1,7 +1,7 @@ XEN_ROOT=../..
 XEN_ROOT=../..
 include $(XEN_ROOT)/tools/Rules.mk
 
-include config-host.mak
+-include config-host.mak
 
 CFLAGS+=-Wall -O2 -g -fno-strict-aliasing -I.
 ifdef CONFIG_DARWIN
@@ -37,7 +37,7 @@ clean:
        rm -f *.o *.a $(TOOLS) dyngen$(EXESUF) TAGS *.pod *~ */*~
        $(MAKE) -C tests clean
        for d in $(TARGET_DIRS); do \
-       $(MAKE) -C $$d $@ || exit 1 ; \
+       [ -d $$d ] && $(MAKE) -C $$d $@ || exit 0 ; \
         done
 
 distclean: clean
diff -r a61fd84125aa -r b8b7c278ca4c tools/ioemu/patches/xen-build
--- a/tools/ioemu/patches/xen-build     Tue Jul 25 11:53:29 2006 +0100
+++ b/tools/ioemu/patches/xen-build     Tue Jul 25 14:26:54 2006 +0100
@@ -1,14 +1,15 @@ Index: ioemu/Makefile
 Index: ioemu/Makefile
 ===================================================================
---- ioemu.orig/Makefile        2006-07-12 10:39:09.278608692 +0100
-+++ ioemu/Makefile     2006-07-12 10:46:21.003128750 +0100
+--- ioemu.orig/Makefile        2006-07-25 14:18:33.163941149 +0100
++++ ioemu/Makefile     2006-07-25 14:24:31.695096861 +0100
 @@ -1,6 +1,9 @@
+-include config-host.mak
 +XEN_ROOT=../..
 +include $(XEN_ROOT)/tools/Rules.mk
-+
- include config-host.mak
  
 -CFLAGS=-Wall -O2 -g -fno-strict-aliasing -I.
++-include config-host.mak
++
 +CFLAGS+=-Wall -O2 -g -fno-strict-aliasing -I.
  ifdef CONFIG_DARWIN
  CFLAGS+= -mdynamic-no-pic
@@ -22,6 +23,15 @@ Index: ioemu/Makefile
        for d in $(TARGET_DIRS); do \
        $(MAKE) -C $$d $@ || exit 1 ; \
          done
+@@ -34,7 +37,7 @@
+       rm -f *.o *.a $(TOOLS) dyngen$(EXESUF) TAGS *.pod *~ */*~
+       $(MAKE) -C tests clean
+       for d in $(TARGET_DIRS); do \
+-      $(MAKE) -C $$d $@ || exit 1 ; \
++      [ -d $$d ] && $(MAKE) -C $$d $@ || exit 0 ; \
+         done
+ 
+ distclean: clean
 @@ -57,12 +60,12 @@
  
  install: all $(if $(BUILD_DOCS),install-doc)
@@ -57,8 +67,8 @@ Index: ioemu/Makefile
  FILE=qemu-$(shell cat VERSION)
 Index: ioemu/Makefile.target
 ===================================================================
---- ioemu.orig/Makefile.target 2006-07-12 10:39:09.279608582 +0100
-+++ ioemu/Makefile.target      2006-07-12 11:32:51.034101952 +0100
+--- ioemu.orig/Makefile.target 2006-07-25 14:18:33.163941149 +0100
++++ ioemu/Makefile.target      2006-07-25 14:24:17.501562050 +0100
 @@ -1,5 +1,8 @@
  include config.mak
  
@@ -130,8 +140,8 @@ Index: ioemu/Makefile.target
  include .depend
 Index: ioemu/configure
 ===================================================================
---- ioemu.orig/configure       2006-07-12 10:39:09.280608472 +0100
-+++ ioemu/configure    2006-07-12 11:32:51.034101952 +0100
+--- ioemu.orig/configure       2006-07-25 14:18:33.163941149 +0100
++++ ioemu/configure    2006-07-25 14:24:17.501562050 +0100
 @@ -18,8 +18,8 @@
  
  # default parameters

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog