Skip to contentSkip to conversation

libtracefs: Remove gui references and do not fail make clean

PATCH New Steven Rostedt 1 participant 3 messages Dec 16, 2020 Kbuild

lore
Share & tools
lore
#0 lore raw

cover libtracefs: Remove gui references and do not fail make clean

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(-)
#1 lore raw

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

From: "Steven Rostedt (VMware)" <[email protected]>

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.

---
 Makefile | 7 -------
 1 file changed, 7 deletions(-)
Makefile +0 -7
index 47ac4f5e8c8c..daaf347966b9 100644
@@ -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
Signature · 1 line
2.29.2
#2 lore raw

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

In reply to Steven Rostedt

From: "Steven Rostedt (VMware)" <[email protected]>

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

---
 Makefile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
Makefile +4 -2
index daaf347966b9..e32bcaee3cba 100644
@@ -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
Signature · 1 line
2.29.2