2015-06-18 12:52:37

by Riku Voipio

[permalink] [raw]
Subject: [PATCH] tools/lib: improve clean target

From: Riku Voipio <[email protected]>

The clean targets miss some .cmd and .d files.

Signed-off-by: Riku Voipio <[email protected]>
---
tools/lib/api/Makefile | 2 +-
tools/lib/traceevent/Makefile | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/lib/api/Makefile b/tools/lib/api/Makefile
index 8bd9606..fe1b02c 100644
--- a/tools/lib/api/Makefile
+++ b/tools/lib/api/Makefile
@@ -36,7 +36,7 @@ $(LIBFILE): $(API_IN)

clean:
$(call QUIET_CLEAN, libapi) $(RM) $(LIBFILE); \
- find $(if $(OUTPUT),$(OUTPUT),.) -name \*.o | xargs $(RM)
+ find $(if $(OUTPUT),$(OUTPUT),.) -name \*.o -or -name \*.o.cmd -or -name \*.o.d | xargs $(RM)

FORCE:

diff --git a/tools/lib/traceevent/Makefile b/tools/lib/traceevent/Makefile
index 6daaff6..7851df1 100644
--- a/tools/lib/traceevent/Makefile
+++ b/tools/lib/traceevent/Makefile
@@ -268,7 +268,7 @@ install: install_lib

clean:
$(call QUIET_CLEAN, libtraceevent) \
- $(RM) *.o *~ $(TARGETS) *.a *.so $(VERSION_FILES) .*.d \
+ $(RM) *.o *~ $(TARGETS) *.a *.so $(VERSION_FILES) .*.d .*.cmd \
$(RM) TRACEEVENT-CFLAGS tags TAGS

PHONY += force plugins
--
2.1.4


2015-07-08 18:22:26

by Riku Voipio

[permalink] [raw]
Subject: Re: [PATCH] tools/lib: improve clean target

On 18 June 2015 at 15:52, <[email protected]> wrote:
> From: Riku Voipio <[email protected]>
>
> The clean targets miss some .cmd and .d files.

Is this patch slipping through cracks?

> Signed-off-by: Riku Voipio <[email protected]>
> ---
> tools/lib/api/Makefile | 2 +-
> tools/lib/traceevent/Makefile | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/tools/lib/api/Makefile b/tools/lib/api/Makefile
> index 8bd9606..fe1b02c 100644
> --- a/tools/lib/api/Makefile
> +++ b/tools/lib/api/Makefile
> @@ -36,7 +36,7 @@ $(LIBFILE): $(API_IN)
>
> clean:
> $(call QUIET_CLEAN, libapi) $(RM) $(LIBFILE); \
> - find $(if $(OUTPUT),$(OUTPUT),.) -name \*.o | xargs $(RM)
> + find $(if $(OUTPUT),$(OUTPUT),.) -name \*.o -or -name \*.o.cmd -or -name \*.o.d | xargs $(RM)
>
> FORCE:
>
> diff --git a/tools/lib/traceevent/Makefile b/tools/lib/traceevent/Makefile
> index 6daaff6..7851df1 100644
> --- a/tools/lib/traceevent/Makefile
> +++ b/tools/lib/traceevent/Makefile
> @@ -268,7 +268,7 @@ install: install_lib
>
> clean:
> $(call QUIET_CLEAN, libtraceevent) \
> - $(RM) *.o *~ $(TARGETS) *.a *.so $(VERSION_FILES) .*.d \
> + $(RM) *.o *~ $(TARGETS) *.a *.so $(VERSION_FILES) .*.d .*.cmd \
> $(RM) TRACEEVENT-CFLAGS tags TAGS
>
> PHONY += force plugins
> --
> 2.1.4
>

2015-07-08 20:57:36

by Arnaldo Carvalho de Melo

[permalink] [raw]
Subject: Re: [PATCH] tools/lib: improve clean target

Em Wed, Jul 08, 2015 at 09:22:23PM +0300, Riku Voipio escreveu:
> On 18 June 2015 at 15:52, <[email protected]> wrote:
> > From: Riku Voipio <[email protected]>
> >
> > The clean targets miss some .cmd and .d files.
>
> Is this patch slipping through cracks?

Not anymore, applied to my perf/urgent branch, will go soon to Ingo,
piggybacking on some more urgent stuff.

- Arnaldo

Subject: [tip:perf/urgent] tools lib: Improve clean target

Commit-ID: c867b150de8514d8682978d8e8874c3940ae781b
Gitweb: http://git.kernel.org/tip/c867b150de8514d8682978d8e8874c3940ae781b
Author: Riku Voipio <[email protected]>
AuthorDate: Thu, 18 Jun 2015 15:52:18 +0300
Committer: Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Wed, 8 Jul 2015 17:56:13 -0300

tools lib: Improve clean target

The clean targets miss some .cmd and .d files.

Signed-off-by: Riku Voipio <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: [email protected]
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
---
tools/lib/api/Makefile | 2 +-
tools/lib/traceevent/Makefile | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/lib/api/Makefile b/tools/lib/api/Makefile
index 8bd9606..fe1b02c 100644
--- a/tools/lib/api/Makefile
+++ b/tools/lib/api/Makefile
@@ -36,7 +36,7 @@ $(LIBFILE): $(API_IN)

clean:
$(call QUIET_CLEAN, libapi) $(RM) $(LIBFILE); \
- find $(if $(OUTPUT),$(OUTPUT),.) -name \*.o | xargs $(RM)
+ find $(if $(OUTPUT),$(OUTPUT),.) -name \*.o -or -name \*.o.cmd -or -name \*.o.d | xargs $(RM)

FORCE:

diff --git a/tools/lib/traceevent/Makefile b/tools/lib/traceevent/Makefile
index 6daaff6..7851df1 100644
--- a/tools/lib/traceevent/Makefile
+++ b/tools/lib/traceevent/Makefile
@@ -268,7 +268,7 @@ install: install_lib

clean:
$(call QUIET_CLEAN, libtraceevent) \
- $(RM) *.o *~ $(TARGETS) *.a *.so $(VERSION_FILES) .*.d \
+ $(RM) *.o *~ $(TARGETS) *.a *.so $(VERSION_FILES) .*.d .*.cmd \
$(RM) TRACEEVENT-CFLAGS tags TAGS

PHONY += force plugins