trace-cmd: Fix make clean error

PATCH Applied Slavomir Kaslev 2 participants 2 messages Dec 3, 2018 – Dec 4, 2018 Kbuild

lore

Share & tools

lore

Slavomir Kaslev

author

2018-12-03 09:19 UTC #0 lore raw

PATCH 1/1 trace-cmd: Fix make clean error

Fix make clean failing when cmake hasn't generated Makefile for KernelShark:

    $ make clean
    # ...
    make -C /home/kaslevs/src/trace-cmd/kernel-shark-qt/build clean
    make[1]: *** No rule to make target 'clean'.  Stop.
    make: *** [Makefile:365: clean] Error 2

Signed-off-by Slavomir Kaslev <[email protected]>

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Makefile +2 -2

index 7ee9e0d..562afd1 100644
@@ -361,11 +361,11 @@ clean:
 	$(RM) tags TAGS cscope*
 	$(MAKE) -C $(src)/lib/traceevent clean
 	$(MAKE) -C $(src)/lib/trace-cmd clean
-	$(MAKE) -C $(src)/kernel-shark clean
-	$(MAKE) -C $(kshark-dir)/build clean
 	$(MAKE) -C $(src)/plugins clean
 	$(MAKE) -C $(src)/python clean
 	$(MAKE) -C $(src)/tracecmd clean
+	$(MAKE) -C $(src)/kernel-shark clean
+	if [ -f $(kshark-dir)/build/Makefile ]; then $(MAKE) -C $(kshark-dir)/build clean; fi
 
 
 ##### PYTHON STUFF #####

Signature · 1 line

2.19.1

Steven Rostedt

Applied

2018-12-04 05:56 UTC #1 lore raw

Quoted 9 lines · On Mon, 3 Dec 2018 11:19:36 +0200 Slavomir Kaslev <[email protected]> wrote:

Fix make clean failing when cmake hasn't generated Makefile for KernelShark:
    $ make clean
    # ...
    make -C /home/kaslevs/src/trace-cmd/kernel-shark-qt/build clean
    make[1]: *** No rule to make target 'clean'.  Stop.
    make: *** [Makefile:365: clean] Error 2
Signed-off-by Slavomir Kaslev <[email protected]>

Applied. Thanks Slavomir!

-- Steve