Re: [PATCH v2 01/14] perf: Fix 'make clean'

[Josh Poimboeuf <jpoimboe@redhat.com>]

On Tue, Dec 08, 2015 at 06:40:12PM +0100, Jiri Olsa wrote:
> On Mon, Dec 07, 2015 at 10:21:39PM -0600, Josh Poimboeuf wrote:
> > Add some missing files to the 'make clean' target.
> > 
> > Reported-by: Jiri Olsa <jolsa@redhat.com>
> > Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
> > ---
> >  tools/perf/Makefile.perf | 13 +++++++++++--
> >  1 file changed, 11 insertions(+), 2 deletions(-)
> > 
> > diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf
> > index 929a32b..8b63dbd 100644
> > --- a/tools/perf/Makefile.perf
> > +++ b/tools/perf/Makefile.perf
> > @@ -584,13 +584,22 @@ config-clean:
> >  	$(call QUIET_CLEAN, config)
> >  	$(Q)$(MAKE) -C $(srctree)/tools/build/feature/ clean >/dev/null
> >  
> > -clean: $(LIBTRACEEVENT)-clean $(LIBAPI)-clean $(LIBBPF)-clean config-clean
> > +feature-clean:
> > +	$(call QUIET_CLEAN, feature)
> > +	$(Q)$(RM) -r $(OUTPUT)feature
> 
> that should be within feature dir

Ok, I'll try to figure out how to use the feature Makefile to do it.

> > +
> > +tests-clean:
> > +	$(call QUIET_CLEAN, tests)
> > +	$(Q)find $(OUTPUT)tests -name '*.o' -delete -o -name '\.*.cmd' -delete
> 
> hum, that'd be excuted twice (another one below)

True, though the "find" statement below doesn't touch $(OUTPUT).  I'll
get rid of this one and make the below one more universal.

> how about putting llvm-src* files under core-gen clean below

Ok.

> jirka
> 
> > +	$(Q)$(RM) $(OUTPUT)tests/llvm-src-{base,kbuild,prologue}.c
> > +
> > +clean: $(LIBTRACEEVENT)-clean $(LIBAPI)-clean $(LIBBPF)-clean config-clean feature-clean tests-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)$(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
> >  	$(QUIET_SUBDIR0)Documentation $(QUIET_SUBDIR1) clean
> >  	$(python-clean)
> 
> ---
> diff --git a/tools/build/feature/Makefile b/tools/build/feature/Makefile
> index cea04ce9f35c..b87427c4ca1e 100644
> --- a/tools/build/feature/Makefile
> +++ b/tools/build/feature/Makefile
> @@ -179,3 +179,6 @@ test-bpf.bin:
>  
>  clean:
>  	rm -f $(FILES) *.d $(FILES:.bin=.make.output)
> +ifdef OUTPUT
> +	rm -rf $(OUTPUT)feature
> +endif
> diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf
> index 929a32ba15f5..c80b74cc437d 100644
> --- a/tools/perf/Makefile.perf
> +++ b/tools/perf/Makefile.perf
> @@ -590,7 +590,8 @@ clean: $(LIBTRACEEVENT)-clean $(LIBAPI)-clean $(LIBBPF)-clean config-clean
>  	$(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)tests/llvm-src-{base,kbuild,prologue}.c
>  	$(QUIET_SUBDIR0)Documentation $(QUIET_SUBDIR1) clean
>  	$(python-clean)
>  

-- 
Josh