From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Campbell Subject: Re: [PATCH] stubdom: fix make clean and distclean on a freshly cloned tree Date: Mon, 2 Mar 2015 14:15:43 +0000 Message-ID: <1425305743.21151.44.camel@citrix.com> References: <1425294550-8461-1-git-send-email-wei.liu2@citrix.com> <20150302111506.GA11855@zion.uk.xensource.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20150302111506.GA11855@zion.uk.xensource.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Wei Liu Cc: Sander Eikelenboom , Stefano Stabellini , Ian Jackson , samuel.thibault@ens-lyon.org, xen-devel@lists.xen.org List-Id: xen-devel@lists.xenproject.org On Mon, 2015-03-02 at 11:15 +0000, Wei Liu wrote: > > -include $(XEN_ROOT)/Config.mk > > + > > +ifeq (,$(findstring clean,$(MAKECMDGOALS))) > > + ifeq ($(wildcard $(MINI_OS)/Config.mk),) > > + $(error Please run `make mini-os-dir' in top-level directory) > > + endif > > + include $(XEN_ROOT)/Config.mk I'm not sure why the inclusion of this apparently unrelated file ($(MINI_OS) vs $(XEN_ROOT) is conditionalised here. If that wasn't here then the two ifeq's could be combined into something like: ifeq(,$(findstring clean,$(MAKECMDGOALS)$(wildcard $(MINI_OS)/Config.mk)) or is that too subtle? > > +endif > > + > > -include $(XEN_ROOT)/config/Stubdom.mk > > > > GNU_TARGET_ARCH:=$(XEN_TARGET_ARCH) > > diff --git a/stubdom/c/Makefile b/stubdom/c/Makefile > > index c646c26..b252dca 100644 > > --- a/stubdom/c/Makefile > > +++ b/stubdom/c/Makefile > > @@ -1,6 +1,8 @@ > > XEN_ROOT = $(CURDIR)/../.. > > > > +ifeq (,$(findstring clean,$(MAKECMDGOALS))) > > include $(XEN_ROOT)/Config.mk XEN_ROOT/Config.mk always exists. Did you misread it as MINI_OS? (and in the next hunk too)