kernel-shark-qt: Have "make install_gui" install the Qt KernelShark version

Commit Message

Steven Rostedt Nov. 28, 2018, 4:24 p.m. UTC

Now that the Qt version is the main version for KernelShark, have it be the
one that is installed when passing in the target "install_gui".

Suggested-by: Yordan Karadzhov <[e-mail]>
Signed-off-by: Steven Rostedt (VMware) <[e-mail]>
---
 Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Patch

diff --git a/Makefile b/Makefile
index d58ce0f2..7ee9e0d0 100644
--- a/Makefile
+++ b/Makefile
@@ -251,8 +251,10 @@  all_cmd: $(CMD_TARGETS)
 
 CMAKE_COMMAND = /usr/bin/cmake
 
-gui: force $(CMD_TARGETS)
+$(kshark-dir)/build/Makefile: $(kshark-dir)/CMakeLists.txt
 	$(Q) cd $(kshark-dir)/build && $(CMAKE_COMMAND) ..
+
+gui: force $(CMD_TARGETS) $(kshark-dir)/build/Makefile
 	$(Q)$(MAKE) $(S) -C $(kshark-dir)/build
 	echo "gui build complete"
 	echo "  kernelshark located at $(kshark-dir)/bin"
@@ -337,9 +339,7 @@  install: install_cmd
 	@echo "      to install man pages, type \"make install_doc\""
 
 install_gui: install_cmd gui
-	$(Q)$(call do_install,$(obj)/kernel-shark/trace-view,$(bindir_SQ))
-	$(Q)$(call do_install,$(obj)/kernel-shark/trace-graph,$(bindir_SQ))
-	$(Q)$(call do_install,$(obj)/kernel-shark/kernelshark,$(bindir_SQ))
+	$(Q)$(MAKE) $(S) -C $(kshark-dir)/build install
 
 install_libs: libs
 	$(Q)$(call do_install,$(LIBTRACECMD_SHARED),$(libdir_SQ))