From: Steven Rostedt <rostedt@goodmis.org>
To: linux-trace-devel@vger.kernel.org
Subject: [PATCH 3/6] libtracefs: Use LIBTRACEFS_STATIC/SHARED instead of open coding them
Date: Tue, 08 Dec 2020 16:54:07 -0500 [thread overview]
Message-ID: <20201208215504.599269685@goodmis.org> (raw)
In-Reply-To: 20201208215404.135186972@goodmis.org
From: "Steven Rostedt (VMware)" <rostedt@goodmis.org>
The macros LIBTRACEFS_STATIC is defined as $(bdir)/libtracefs.a and
LIBTRACEFS_SHARED is defined as $(bdir)/libtracefs.so.$(TRACE_VERSION).
Instead of open coding them elsewhere in the file, simply use the defined
macros.
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
---
Makefile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index 5aa2ba4b5145..5a250eeb03b1 100644
--- a/Makefile
+++ b/Makefile
@@ -252,7 +252,7 @@ force:
# information in a variable so we can use it in if_changed and friends.
.PHONY: $(PHONY)
-DEFAULT_TARGET = $(bdir)/libtracefs.a
+DEFAULT_TARGET = $(LIBTRACEFS_STATIC)
OBJS =
OBJS += tracefs-utils.o
@@ -272,10 +272,10 @@ $(DEPS): | $(bdir)
LIBS = -L$(obj)/lib/traceevent -ltraceevent
-$(bdir)/libtracefs.a: $(OBJS)
+$(LIBTRACEFS_STATIC): $(OBJS)
$(Q)$(call do_build_static_lib)
-$(bdir)/libtracefs.so.$(TRACEFS_VERSION): $(OBJS)
+$(LIBTRACEFS_SHARED): $(OBJS)
$(Q)$(call do_compile_shared_library)
@ln -sf $(@F) $(bdir)/libtracefs.so
@ln -sf $(@F) $(bdir)/libtracefs.so.$(TFS_VERSION)
--
2.28.0
next prev parent reply other threads:[~2020-12-08 21:56 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-08 21:54 [PATCH 0/6] libtracefs: Clean up of the source directory Steven Rostedt
2020-12-08 21:54 ` [PATCH 1/6] libtracefs: Move features.mk into scripts directory Steven Rostedt
2020-12-08 21:54 ` [PATCH 2/6] libtracefs: Remove LIBTRACEFS_DIR as it is the same as bdir Steven Rostedt
2020-12-08 21:54 ` Steven Rostedt [this message]
2020-12-08 21:54 ` [PATCH 4/6] libtracefs: Move source files to new src/ directory Steven Rostedt
2020-12-08 21:54 ` [PATCH 5/6] libtracefs: Use pkg-config to find libtraceevent Steven Rostedt
2020-12-08 21:54 ` [PATCH 6/6] libtracefs: Have make clean remove the .so.X file Steven Rostedt
2020-12-09 14:49 ` [PATCH 0/6] libtracefs: Clean up of the source directory Tzvetomir Stoyanov
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=20201208215504.599269685@goodmis.org \
--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).