Silently ignore rm and include errors during make distclean

Signed-off-by: Daniel Kiper <daniel.kiper@oracle.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>

diff --git a/Makefile b/Makefile
index 32efb709a623a9866a86be8c211be21229edceb2..5a7107eb21106a77a2e7cef06a22df0a1af13905 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -158,7 +158,7 @@ endif
 # clean, but blow away kernel build tree plus tarballs
 .PHONY: distclean
 distclean:
-       -rm config/Toplevel.mk
+       rm -f config/Toplevel.mk
        $(MAKE) -C xen distclean
        $(MAKE) -C tools distclean
        $(MAKE) -C stubdom distclean

diff --git a/buildconfigs/mk.linux-2.6-common b/buildconfigs/mk.linux-2.6-common
index f3680f0982fa9a6ff656657b5949792cfa7c8170..e8e97fbcaf5a3972747dbff10558d3696b425944 100644 (file)
--- a/buildconfigs/mk.linux-2.6-common
+++ b/buildconfigs/mk.linux-2.6-common
@@ -29,7 +29,7 @@ LINUX_VER3  := $(LINUX_SERIES).$(word 3, $(subst ., ,$(LINUX_VER)))
 .PHONY: _build
 _build: build
 
-include buildconfigs/src.$(XEN_LINUX_SOURCE)
+-include buildconfigs/src.$(XEN_LINUX_SOURCE)
 
 LINUX_ARCH = $$(sh buildconfigs/select-linux-arch $(LINUX_SRCDIR))
 IMAGE_PATH = $$(sh buildconfigs/select-linux-image $(LINUX_DIR) $(LINUX_ARCH) $(IMAGE_TARGET))

diff --git a/stubdom/Makefile b/stubdom/Makefile
index f316d4e985dde182a5906022b8ef54df55797ed4..32f0daf63db6238335274dbd7202d4d558f55d69 100644 (file)
--- a/stubdom/Makefile
+++ b/stubdom/Makefile
@@ -546,8 +546,7 @@ downloadclean: patchclean
 
 .PHONY: distclean
 distclean: downloadclean
-       -rm ../config/Stubdom.mk
-       rm -rf config.log config.status config.cache autom4te.cache
+       rm -rf config.log config.status config.cache autom4te.cache ../config/Stubdom.mk
 
 ifeq (,$(findstring clean,$(MAKECMDGOALS)))
 $(XEN_ROOT)/config/Stubdom.mk: