Re: [PATCH v3 05/17] perf build: Fix 'make clean'

Arnaldo Carvalho de Melo
2015-12-14T15:18:57Z

Em Mon, Dec 14, 2015 at 11:14:21AM +0100, Jiri Olsa escreveu:
> On Sun, Dec 13, 2015 at 10:18:05PM -0600, Josh Poimboeuf wrote:
> > Add some missing files to the 'make clean' target.
> >
> > Reported-by: Jiri Olsa <jolsa@redhat.com>
>
> Acked-by: Jiri Olsa <jolsa@kernel.org>

Applied.

> thanks,
> jirka
>
> > Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
> > ---
> > tools/perf/Makefile.perf | 7 ++++---
> > 1 file changed, 4 insertions(+), 3 deletions(-)
> >
> > diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf
> > index 929a32b..906c723 100644
> > --- a/tools/perf/Makefile.perf
> > +++ b/tools/perf/Makefile.perf
> > @@ -582,15 +582,16 @@ $(INSTALL_DOC_TARGETS):
> > #
> > config-clean:
> > $(call QUIET_CLEAN, config)
> > - $(Q)$(MAKE) -C $(srctree)/tools/build/feature/ clean >/dev/null
> > + $(Q)$(MAKE) -C $(srctree)/tools/build/feature/ $(if $(OUTPUT),OUTPUT=$(OUTPUT)feature/,) clean >/dev/null
> >
> > clean: $(LIBTRACEEVENT)-clean $(LIBAPI)-clean $(LIBBPF)-clean config-clean
> > $(call QUIET_CLEAN, core-objs) $(RM) $(LIB_FILE) $(OUTPUT)perf-archive $(OUTPUT)perf-with-kcore $(LANG_BINDINGS)
> > - $(Q)find . -name '*.o' -delete -o -name '\.*.cmd' -delete -o -name '\.*.d' -delete
> > + $(Q)find $(if $(OUTPUT),$(OUTPUT),.) -name '*.o' -delete -o -name '\.*.cmd' -delete -o -name '\.*.d' -delete
> > $(Q)$(RM) $(OUTPUT).config-detected
> > $(call QUIET_CLEAN, core-progs) $(RM) $(ALL_PROGRAMS) perf perf-read-vdso32 perf-read-vdsox32
> > $(call QUIET_CLEAN, core-gen) $(RM) *.spec *.pyc *.pyo */*.pyc */*.pyo $(OUTPUT)common-cmds.h TAGS tags cscope* $(OUTPUT)PERF-VERSION-FILE $(OUTPUT)FEATURE-DUMP $(OUTPUT)util/*-bison* $(OUTPUT)util/*-flex* \
> > - $(OUTPUT)util/intel-pt-decoder/inat-tables.c
> > + $(OUTPUT)util/intel-pt-decoder/inat-tables.c $(OUTPUT)fixdep \
> > + $(OUTPUT)tests/llvm-src-{base,kbuild,prologue}.c
> > $(QUIET_SUBDIR0)Documentation $(QUIET_SUBDIR1) clean
> > $(python-clean)
> >
> > --
> > 2.4.3
> >