From: Steven Rostedt <rostedt@goodmis.org>
To: Linux Trace Devel <linux-trace-devel@vger.kernel.org>
Subject: [PATCH] trace-cmd: Do not build or install traceevent plugins if libtraceevent exits
Date: Wed, 23 Dec 2020 11:33:00 -0500 [thread overview]
Message-ID: <20201223113300.6a284c7b@gandalf.local.home> (raw)
From: "Steven Rostedt (VMware)" <rostedt@goodmis.org>
The plugins for libtraceevent belong to libtraceevent. If libtraceevent is
installed on the system, then the plugins for libtraceevent should not be
built or installed by trace-cmd.
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
---
Makefile | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index eb833f67..eae1eb39 100644
--- a/Makefile
+++ b/Makefile
@@ -243,10 +243,14 @@ endif
ifeq ("$(TEST_LIBTRACEEVENT)", "y")
LIBTRACEEVENT_CFLAGS = $(shell sh -c "$(PKG_CONFIG) --cflags $(LIBTRACEEVENT)")
LIBTRACEEVENT_LDLAGS = $(shell sh -c "$(PKG_CONFIG) --libs $(LIBTRACEEVENT)")
+TRACEEVENT_PLUGINS =
+TRACEEVENT_PLUGINS_INSTALL =
else
LIBTRACEEVENT_CFLAGS = -I$(src)/include/traceevent -I$(src)/lib/traceevent/include
LIBTRACEEVENT_LDLAGS = -L$(LIBTRACEEVENT_DIR) -ltraceevent
LIBTRACEEVENT_STATIC_BUILD = $(LIBTRACEEVENT_STATIC)
+TRACEEVENT_PLUGINS = plugins_traceevent
+TRACEEVENT_PLUGINS_INSTALL = install_plugins_traceevent
endif
export LIBTRACEEVENT_CFLAGS LIBTRACEEVENT_LDLAGS
@@ -414,7 +418,7 @@ plugins_traceevent: force $(obj)/lib/traceevent/plugins/traceevent_plugin_dir \
plugins_tracecmd: force $(obj)/lib/trace-cmd/plugins/tracecmd_plugin_dir
$(Q)$(MAKE) -C $(src)/lib/trace-cmd/plugins
-plugins: plugins_traceevent plugins_tracecmd
+plugins: $(TRACEEVENT_PLUGINS) plugins_tracecmd
$(obj)/lib/traceevent/plugins/traceevent_plugin_dir: force
$(Q)$(MAKE) -C $(src)/lib/traceevent/plugins $@
@@ -454,7 +458,7 @@ install_plugins_traceevent: force
install_plugins_tracecmd: force
$(Q)$(MAKE) -C $(src)/lib/trace-cmd/plugins install_plugins
-install_plugins: install_plugins_traceevent install_plugins_tracecmd
+install_plugins: $(TRACEEVENT_PLUGINS_INSTALL) install_plugins_tracecmd
install_python: force
$(Q)$(MAKE) -C $(src)/python $@
--
2.25.4
reply other threads:[~2020-12-23 16:33 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201223113300.6a284c7b@gandalf.local.home \
--to=rostedt@goodmis.org \
--cc=linux-trace-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).