diff mbox series

[11/13] trace-cmd: Do not install libtracefs nor libtraceevent libraries

Message ID 20201211171014.706323506@goodmis.org (mailing list archive)
State Accepted
Commit 23f3ced4157d51753bc397dcc8adf6237bb23b55
Headers show
Series trace-cmd: Clean ups to the Makefile for using external libraries | expand

Commit Message

Steven Rostedt Dec. 11, 2020, 5:08 p.m. UTC 
From: "Steven Rostedt (VMware)" <rostedt@goodmis.org>

Now that both libtraceevent and libtracefs have their own repos and are
packaged separately from trace-cmd, do not install the libraries even if
they do not exist on the system. Anything that depends on those libraries
are require to get them from their corresponding repos and not depend on
trace-cmd for them from now on.

Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
---
 Makefile | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)
diff mbox series

Patch

diff --git a/Makefile b/Makefile
index 30528952740d..737e54d82697 100644
--- a/Makefile
+++ b/Makefile
@@ -248,7 +248,6 @@  else
 LIBTRACEEVENT_CFLAGS = -I$(src)/include/traceevent -I$(src)/lib/traceevent/include
 LIBTRACEEVENT_LDLAGS = -L$(LIBTRACEEVENT_DIR) -ltraceevent
 LIBTRACEEVENT_STATIC_BUILD = $(LIBTRACEEVENT_STATIC)
-INSTALL_TRACEEVENT = install_traceevent
 endif
 
 export LIBTRACEEVENT_CFLAGS LIBTRACEEVENT_LDLAGS
@@ -260,7 +259,6 @@  else
 LIBTRACEFS_CFLAGS = -I$(src)/include/tracefs
 LIBTRACEFS_LDLAGS = -L$(LIBTRACEFS_DIR) -ltracefs
 LIBTRACEFS_STATIC_BUILD = $(LIBTRACEFS_STATIC)
-INSTALL_TRACEFS = install_tracefs
 endif
 
 export LIBTRACEFS_CFLAGS LIBTRACEFS_LDLAGS
@@ -471,16 +469,7 @@  install: install_cmd
 install_gui: install_cmd gui
 	$(Q)$(MAKE) $(S) -C $(kshark-dir)/build install
 
-install_traceevent: $(LIBTRACEEVENT_STATIC_BUILD)
-	$(Q)$(call do_install,$(LIBTRACEEVENT_SHARED),$(libdir_SQ)/traceevent)
-	$(Q)$(call do_install,$(src)/include/traceevent/event-parse.h,$(includedir_SQ)/traceevent)
-	$(Q)$(call do_install,$(src)/include/traceevent/trace-seq.h,$(includedir_SQ)/traceevent)
-
-install_tracefs: $(LIBTRACEFS_STATIC_BUILD)
-	$(Q)$(call do_install,$(LIBTRACEFS_SHARED),$(libdir_SQ)/tracefs)
-	$(Q)$(call do_install,$(src)/include/tracefs/tracefs.h,$(includedir_SQ)/tracefs)
-
-install_libs: libs $(INSTALL_TRACEEVENT) $(INSTALL_TRACEFS)
+install_libs: libs
 	$(Q)$(MAKE) -C $(src)/lib/trace-cmd/ $@
 
 doc: