[PATCH 0/2] libtracefs: Remove gui references and do not fail make clean

[PATCH 0/2] libtracefs: Remove gui references and do not fail make clean

[Steven Rostedt]

Steven Rostedt (VMware) (2):
      libtracefs: Remove Makfefile targets that reference "gui"
      libtracefs: Do not fail make on clean target

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

[PATCH 1/2] libtracefs: Remove Makfefile targets that reference "gui"

[Steven Rostedt]

From: "Steven Rostedt (VMware)" <rostedt@goodmis.org>

libtracefs was taken from trace-cmd which held kernelshark at the time, and
to build kernelshark, "make gui" and other targets were used. These were
mistakenly copied over to the Makefile to build the stand alone libtracefs.
Remove them.

Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
---
 Makefile | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/Makefile b/Makefile
index 47ac4f5e8c8c..daaf347966b9 100644
--- a/Makefile
+++ b/Makefile
@@ -253,19 +253,12 @@ install_pkgconfig: $(PKG_CONFIG_FILE)
 
 doc:
 	$(MAKE) -C $(src)/Documentation all
-doc_gui:
-	$(MAKE) -C $(kshark-dir)/Documentation all
-
 
 doc_clean:
 	$(MAKE) -C $(src)/Documentation clean
-doc_gui_clean:
-	$(MAKE) -C $(kshark-dir)/Documentation clean
 
 install_doc:
 	$(MAKE) -C $(src)/Documentation install
-install_doc_gui:
-	$(MAKE) -C $(kshark-dir)/Documentation install
 
 define build_uninstall_script
 	$(Q)mkdir $(BUILD_OUTPUT)/tmp_build
-- 
2.29.2

[PATCH 2/2] libtracefs: Do not fail make on clean target

[Steven Rostedt]

From: "Steven Rostedt (VMware)" <rostedt@goodmis.org>

"make clean" should not fail because libtraceevent is not installed on the
system.

Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
---
 Makefile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index daaf347966b9..e32bcaee3cba 100644
--- a/Makefile
+++ b/Makefile
@@ -65,8 +65,10 @@ pkgconfig_dir ?= $(word 1,$(shell $(PKG_CONFIG) 		\
 LIBTRACEEVENT_INCLUDES = $(shell $(PKG_CONFIG) --cflags libtraceevent)
 LIBTRACEEVENT_LIBS = $(shell $(PKG_CONFIG) --libs libtraceevent)
 
-ifeq ("$(LIBTRACEEVENT_INCLUDES)","")
-$(error libtraceevent.so not installed)
+ifneq ($(MAKECMDGOALS),clean)
+ ifeq ("$(LIBTRACEEVENT_INCLUDES)","")
+   $(error libtraceevent.so not installed)
+ endif
 endif
 
 etcdir ?= /etc
-- 
2.29.2