From 42488368c42bbe79ec103ea93de927e947649e6e Mon Sep 17 00:00:00 2001 From: Roger Pau Monne Date: Tue, 24 Apr 2012 18:20:07 +0100 Subject: 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 Cc: George Dunlap Committed-by: Ian Jackson --- tools/Rules.mk | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'tools/Rules.mk') diff --git a/tools/Rules.mk b/tools/Rules.mk index 202c0dd7db..a2a1a5846a 100644 --- a/tools/Rules.mk +++ b/tools/Rules.mk @@ -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-install-%: .phony 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 -- cgit v1.2.3