ia64/xen-unstable

changeset 10778:b8b7c278ca4c

Make ioemu targets more robust and make ioemu clean always succeed.

Based on a patch by: Alex Brett <Alex.Brett@xensource.com>
Signed-off-by: Christian Limpach <Christian.Limpach@xensource.com>
author chris@kneesaa.uk.xensource.com
date Tue Jul 25 14:26:54 2006 +0100 (2006-07-25)
parents a61fd84125aa
children d48322cddd87
files tools/Makefile tools/ioemu/Makefile tools/ioemu/patches/xen-build
line diff
     1.1 --- a/tools/Makefile	Tue Jul 25 11:53:29 2006 +0100
     1.2 +++ b/tools/Makefile	Tue Jul 25 14:26:54 2006 +0100
     1.3 @@ -62,11 +62,11 @@ check_clean:
     1.4  ifdef CONFIG_IOEMU
     1.5  export IOEMU_DIR ?= ioemu
     1.6  ioemu ioemuinstall:
     1.7 -	[ -f $(IOEMU_DIR)/config-host.h ] || \
     1.8 -	(cd $(IOEMU_DIR) && sh configure --prefix=/usr)
     1.9 +	[ -f $(IOEMU_DIR)/config-host.mak ] || \
    1.10 +	  (cd $(IOEMU_DIR) && sh configure --prefix=/usr)
    1.11  	$(MAKE) -C $(IOEMU_DIR) $(patsubst ioemu%,%,$@)
    1.12  ioemuclean:
    1.13 -	[ ! -f $(IOEMU_DIR)/config-host.h ] || $(MAKE) -C $(IOEMU_DIR) clean
    1.14 +	$(MAKE) -C $(IOEMU_DIR) distclean
    1.15  else
    1.16  ioemu ioemuinstall ioemuclean:
    1.17  endif
     2.1 --- a/tools/ioemu/Makefile	Tue Jul 25 11:53:29 2006 +0100
     2.2 +++ b/tools/ioemu/Makefile	Tue Jul 25 14:26:54 2006 +0100
     2.3 @@ -1,7 +1,7 @@
     2.4  XEN_ROOT=../..
     2.5  include $(XEN_ROOT)/tools/Rules.mk
     2.6  
     2.7 -include config-host.mak
     2.8 +-include config-host.mak
     2.9  
    2.10  CFLAGS+=-Wall -O2 -g -fno-strict-aliasing -I.
    2.11  ifdef CONFIG_DARWIN
    2.12 @@ -37,7 +37,7 @@ clean:
    2.13  	rm -f *.o *.a $(TOOLS) dyngen$(EXESUF) TAGS *.pod *~ */*~
    2.14  	$(MAKE) -C tests clean
    2.15  	for d in $(TARGET_DIRS); do \
    2.16 -	$(MAKE) -C $$d $@ || exit 1 ; \
    2.17 +	[ -d $$d ] && $(MAKE) -C $$d $@ || exit 0 ; \
    2.18          done
    2.19  
    2.20  distclean: clean
     3.1 --- a/tools/ioemu/patches/xen-build	Tue Jul 25 11:53:29 2006 +0100
     3.2 +++ b/tools/ioemu/patches/xen-build	Tue Jul 25 14:26:54 2006 +0100
     3.3 @@ -1,14 +1,15 @@
     3.4  Index: ioemu/Makefile
     3.5  ===================================================================
     3.6 ---- ioemu.orig/Makefile	2006-07-12 10:39:09.278608692 +0100
     3.7 -+++ ioemu/Makefile	2006-07-12 10:46:21.003128750 +0100
     3.8 +--- ioemu.orig/Makefile	2006-07-25 14:18:33.163941149 +0100
     3.9 ++++ ioemu/Makefile	2006-07-25 14:24:31.695096861 +0100
    3.10  @@ -1,6 +1,9 @@
    3.11 +-include config-host.mak
    3.12  +XEN_ROOT=../..
    3.13  +include $(XEN_ROOT)/tools/Rules.mk
    3.14 -+
    3.15 - include config-host.mak
    3.16   
    3.17  -CFLAGS=-Wall -O2 -g -fno-strict-aliasing -I.
    3.18 ++-include config-host.mak
    3.19 ++
    3.20  +CFLAGS+=-Wall -O2 -g -fno-strict-aliasing -I.
    3.21   ifdef CONFIG_DARWIN
    3.22   CFLAGS+= -mdynamic-no-pic
    3.23 @@ -22,6 +23,15 @@ Index: ioemu/Makefile
    3.24   	for d in $(TARGET_DIRS); do \
    3.25   	$(MAKE) -C $$d $@ || exit 1 ; \
    3.26           done
    3.27 +@@ -34,7 +37,7 @@
    3.28 + 	rm -f *.o *.a $(TOOLS) dyngen$(EXESUF) TAGS *.pod *~ */*~
    3.29 + 	$(MAKE) -C tests clean
    3.30 + 	for d in $(TARGET_DIRS); do \
    3.31 +-	$(MAKE) -C $$d $@ || exit 1 ; \
    3.32 ++	[ -d $$d ] && $(MAKE) -C $$d $@ || exit 0 ; \
    3.33 +         done
    3.34 + 
    3.35 + distclean: clean
    3.36  @@ -57,12 +60,12 @@
    3.37   
    3.38   install: all $(if $(BUILD_DOCS),install-doc)
    3.39 @@ -57,8 +67,8 @@ Index: ioemu/Makefile
    3.40   FILE=qemu-$(shell cat VERSION)
    3.41  Index: ioemu/Makefile.target
    3.42  ===================================================================
    3.43 ---- ioemu.orig/Makefile.target	2006-07-12 10:39:09.279608582 +0100
    3.44 -+++ ioemu/Makefile.target	2006-07-12 11:32:51.034101952 +0100
    3.45 +--- ioemu.orig/Makefile.target	2006-07-25 14:18:33.163941149 +0100
    3.46 ++++ ioemu/Makefile.target	2006-07-25 14:24:17.501562050 +0100
    3.47  @@ -1,5 +1,8 @@
    3.48   include config.mak
    3.49   
    3.50 @@ -130,8 +140,8 @@ Index: ioemu/Makefile.target
    3.51   include .depend
    3.52  Index: ioemu/configure
    3.53  ===================================================================
    3.54 ---- ioemu.orig/configure	2006-07-12 10:39:09.280608472 +0100
    3.55 -+++ ioemu/configure	2006-07-12 11:32:51.034101952 +0100
    3.56 +--- ioemu.orig/configure	2006-07-25 14:18:33.163941149 +0100
    3.57 ++++ ioemu/configure	2006-07-25 14:24:17.501562050 +0100
    3.58  @@ -18,8 +18,8 @@
    3.59   
    3.60   # default parameters