[Xen-changelog] [xen-unstable] tools/build: fix distclean

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Roger Pau Monne <roger.pau@xxxxxxxxxx>
# Date 1335288007 -3600
# Node ID 18f64a3630db7edf97f9a6875111389fd9758e16
# Parent  4030cd5f99695c097bcf318993350433ddd1af10
tools/build: fix distclean

distclean removed config/Tools.mk which was needed by tools/Rules.mk, thus
preventing distclean from running properly in the tools directory. This patch
only enforces config/Tools.mk presence when not performing a clean/distclean
target

Signed-off-by: Roger Pau Monne <roger.pau@xxxxxxxxxx>
Cc: George Dunlap <george.dunlap@xxxxxxxxxxxxx>
Committed-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---


diff -r 4030cd5f9969 -r 18f64a3630db tools/Rules.mk
--- a/tools/Rules.mk    Tue Apr 24 18:17:51 2012 +0100
+++ b/tools/Rules.mk    Tue Apr 24 18:20:07 2012 +0100
@@ -4,7 +4,7 @@
 all:
 
 include $(XEN_ROOT)/Config.mk
-include $(XEN_ROOT)/config/Tools.mk
+-include $(XEN_ROOT)/config/Tools.mk
 
 export _INSTALL := $(INSTALL)
 INSTALL = $(XEN_ROOT)/tools/cross-install
@@ -109,6 +109,7 @@ subdir-all-% subdir-clean-% subdir-insta
 subdir-distclean-%: .phony
        $(MAKE) -C $* clean
 
+ifeq (,$(findstring clean,$(MAKECMDGOALS)))
 $(XEN_ROOT)/config/Tools.mk:
-       @echo "You have to run ./configure before building or installing the 
tools"
-       @exit 1
+       $(error You have to run ./configure before building or installing the 
tools)
+endif

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