Re: [Xen-devel] [PATCH] stubdom: fix make clean and distclean on a freshly cloned tree

[Ian Campbell <ian.campbell@xxxxxxxxxx>]

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)



_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel