From patchwork Tue Dec 8 21:54:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 11959845 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BED4EC1B0D9 for ; Tue, 8 Dec 2020 21:56:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 87DCC20C56 for ; Tue, 8 Dec 2020 21:56:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730400AbgLHVzq (ORCPT ); Tue, 8 Dec 2020 16:55:46 -0500 Received: from mail.kernel.org ([198.145.29.99]:43226 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730419AbgLHVzp (ORCPT ); Tue, 8 Dec 2020 16:55:45 -0500 Received: from gandalf.local.home (cpe-66-24-58-225.stny.res.rr.com [66.24.58.225]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 833BE22225 for ; Tue, 8 Dec 2020 21:55:05 +0000 (UTC) Received: from rostedt by gandalf.local.home with local (Exim 4.94) (envelope-from ) id 1kmkwq-003src-DX for linux-trace-devel@vger.kernel.org; Tue, 08 Dec 2020 16:55:04 -0500 Message-ID: <20201208215504.294115386@goodmis.org> User-Agent: quilt/0.66 Date: Tue, 08 Dec 2020 16:54:05 -0500 From: Steven Rostedt To: linux-trace-devel@vger.kernel.org Subject: [PATCH 1/6] libtracefs: Move features.mk into scripts directory References: <20201208215404.135186972@goodmis.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org From: "Steven Rostedt (VMware)" In order to clean up the directory structure, move the features.mk into the scripts directory. That's where the helper files for the Makefile should live anyway. Signed-off-by: Steven Rostedt (VMware) --- Makefile | 2 +- features.mk => scripts/features.mk | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename features.mk => scripts/features.mk (100%) diff --git a/Makefile b/Makefile index 284f8f2a17ab..e84b41408b54 100644 --- a/Makefile +++ b/Makefile @@ -142,7 +142,7 @@ include scripts/utils.mk INCLUDES = -I$(src)/include INCLUDES += -I$(src)/include/tracefs -include $(src)/features.mk +include $(src)/scripts/features.mk # Set compile option CFLAGS if not set elsewhere CFLAGS ?= -g -Wall diff --git a/features.mk b/scripts/features.mk similarity index 100% rename from features.mk rename to scripts/features.mk From patchwork Tue Dec 8 21:54:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 11959849 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 045B8C19437 for ; Tue, 8 Dec 2020 21:56:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BF311221E5 for ; Tue, 8 Dec 2020 21:56:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730429AbgLHVzq (ORCPT ); Tue, 8 Dec 2020 16:55:46 -0500 Received: from mail.kernel.org ([198.145.29.99]:43228 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730418AbgLHVzp (ORCPT ); Tue, 8 Dec 2020 16:55:45 -0500 Received: from gandalf.local.home (cpe-66-24-58-225.stny.res.rr.com [66.24.58.225]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 81B09221E5 for ; Tue, 8 Dec 2020 21:55:05 +0000 (UTC) Received: from rostedt by gandalf.local.home with local (Exim 4.94) (envelope-from ) id 1kmkwq-003ssA-IB for linux-trace-devel@vger.kernel.org; Tue, 08 Dec 2020 16:55:04 -0500 Message-ID: <20201208215504.451420772@goodmis.org> User-Agent: quilt/0.66 Date: Tue, 08 Dec 2020 16:54:06 -0500 From: Steven Rostedt To: linux-trace-devel@vger.kernel.org Subject: [PATCH 2/6] libtracefs: Remove LIBTRACEFS_DIR as it is the same as bdir References: <20201208215404.135186972@goodmis.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org From: "Steven Rostedt (VMware)" Remove the variable LIBTRACEFS_DIR as it is simply bdir, and makes the Makefile confusing. Simply use $(bdir) where $(LIBTRACEFS_DIR) is currently used. Signed-off-by: Steven Rostedt (VMware) --- Makefile | 11 +++++------ utest/Makefile | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index e84b41408b54..5aa2ba4b5145 100644 --- a/Makefile +++ b/Makefile @@ -123,16 +123,15 @@ src := $(srctree) obj := $(objtree) bdir := $(obj)/lib/tracefs -export prefix bindir src obj +export prefix bindir src obj bdir -LIBTRACEFS_DIR = $(obj)/lib/tracefs -LIBTRACEFS_STATIC = $(LIBTRACEFS_DIR)/libtracefs.a -LIBTRACEFS_SHARED = $(LIBTRACEFS_DIR)/libtracefs.so.$(TRACEFS_VERSION) +LIBTRACEFS_STATIC = $(bdir)/libtracefs.a +LIBTRACEFS_SHARED = $(bdir)/libtracefs.so.$(TRACEFS_VERSION) -TRACE_LIBS = -L$(LIBTRACEFS_DIR) -ltracefs +TRACE_LIBS = -L$(bdir) -ltracefs export LIBS TRACE_LIBS -export LIBTRACEFS_STATIC LIBTRACEFS_SHARED LIBTRACEFS_DIR +export LIBTRACEFS_STATIC LIBTRACEFS_SHARED export Q SILENT VERBOSE EXT diff --git a/utest/Makefile b/utest/Makefile index a26d7a9a24af..9f96c4e397c1 100644 --- a/utest/Makefile +++ b/utest/Makefile @@ -11,7 +11,7 @@ OBJS += tracefs-utest.o LIBS += -lcunit \ -ldl \ - -L$(LIBTRACEFS_DIR) -ltracefs + -L$(bdir) -ltracefs OBJS := $(OBJS:%.o=$(bdir)/%.o) DEPS := $(OBJS:$(bdir)/%.o=$(bdir)/.%.d) From patchwork Tue Dec 8 21:54:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 11959841 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C386FC2BB40 for ; Tue, 8 Dec 2020 21:56:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A044D22262 for ; Tue, 8 Dec 2020 21:56:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730419AbgLHVzq (ORCPT ); Tue, 8 Dec 2020 16:55:46 -0500 Received: from mail.kernel.org ([198.145.29.99]:43238 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730429AbgLHVzq (ORCPT ); Tue, 8 Dec 2020 16:55:46 -0500 Received: from gandalf.local.home (cpe-66-24-58-225.stny.res.rr.com [66.24.58.225]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id AFAEE22262 for ; Tue, 8 Dec 2020 21:55:05 +0000 (UTC) Received: from rostedt by gandalf.local.home with local (Exim 4.94) (envelope-from ) id 1kmkwq-003ssf-Np for linux-trace-devel@vger.kernel.org; Tue, 08 Dec 2020 16:55:04 -0500 Message-ID: <20201208215504.599269685@goodmis.org> User-Agent: quilt/0.66 Date: Tue, 08 Dec 2020 16:54:07 -0500 From: Steven Rostedt To: linux-trace-devel@vger.kernel.org Subject: [PATCH 3/6] libtracefs: Use LIBTRACEFS_STATIC/SHARED instead of open coding them References: <20201208215404.135186972@goodmis.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org From: "Steven Rostedt (VMware)" 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) --- 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) From patchwork Tue Dec 8 21:54:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 11959847 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1CEFCC2BB48 for ; Tue, 8 Dec 2020 21:56:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D5DFC20C56 for ; Tue, 8 Dec 2020 21:56:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730418AbgLHVzq (ORCPT ); Tue, 8 Dec 2020 16:55:46 -0500 Received: from mail.kernel.org ([198.145.29.99]:43256 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730397AbgLHVzq (ORCPT ); Tue, 8 Dec 2020 16:55:46 -0500 Received: from gandalf.local.home (cpe-66-24-58-225.stny.res.rr.com [66.24.58.225]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id DDE282226A for ; Tue, 8 Dec 2020 21:55:05 +0000 (UTC) Received: from rostedt by gandalf.local.home with local (Exim 4.94) (envelope-from ) id 1kmkwq-003st9-Uu for linux-trace-devel@vger.kernel.org; Tue, 08 Dec 2020 16:55:04 -0500 Message-ID: <20201208215504.757940690@goodmis.org> User-Agent: quilt/0.66 Date: Tue, 08 Dec 2020 16:54:08 -0500 From: Steven Rostedt To: linux-trace-devel@vger.kernel.org Subject: [PATCH 4/6] libtracefs: Move source files to new src/ directory References: <20201208215404.135186972@goodmis.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org From: "Steven Rostedt (VMware)" In cleaning up the directory structure, move the C files into their own "src/" directory. Signed-off-by: Steven Rostedt (VMware) --- Makefile | 28 ++++---------------- tracefs-events.c => src/tracefs-events.c | 0 tracefs-instance.c => src/tracefs-instance.c | 0 tracefs-utils.c => src/tracefs-utils.c | 0 4 files changed, 5 insertions(+), 23 deletions(-) rename tracefs-events.c => src/tracefs-events.c (100%) rename tracefs-instance.c => src/tracefs-instance.c (100%) rename tracefs-utils.c => src/tracefs-utils.c (100%) diff --git a/Makefile b/Makefile index 5a250eeb03b1..f6b6a9ede5c0 100644 --- a/Makefile +++ b/Makefile @@ -267,35 +267,17 @@ all: $(DEFAULT_TARGET) $(bdir): @mkdir -p $(bdir) -$(OBJS): | $(bdir) -$(DEPS): | $(bdir) - LIBS = -L$(obj)/lib/traceevent -ltraceevent -$(LIBTRACEFS_STATIC): $(OBJS) - $(Q)$(call do_build_static_lib) - -$(LIBTRACEFS_SHARED): $(OBJS) - $(Q)$(call do_compile_shared_library) - @ln -sf $(@F) $(bdir)/libtracefs.so - @ln -sf $(@F) $(bdir)/libtracefs.so.$(TFS_VERSION) - -$(bdir)/%.o: %.c - $(Q)$(call do_fpic_compile) - -$(DEPS): $(bdir)/.%.d: %.c - $(Q)$(CC) -M -MT $(bdir)/$*.o $(CPPFLAGS) $(CFLAGS) $< > $@ +$(LIBTRACEFS_STATIC): force + $(Q)$(MAKE) -C $(src)/src $@ -$(OBJS): $(bdir)/%.o : $(bdir)/.%.d - -dep_includes := $(wildcard $(DEPS)) - -ifneq ($(dep_includes),) - include $(dep_includes) -endif +$(bdir)/libtracefs.so.$(TRACEFS_VERSION): force + $(Q)$(MAKE) -C $(src)/src $@ clean: $(MAKE) -C $(src)/utest clean + $(MAKE) -C $(src)/src clean $(RM) $(TARGETS) $(bdir)/*.a $(bdir)/*.so $(bdir)/*.o $(bdir)/.*.d $(RM) $(PKG_CONFIG_FILE) diff --git a/tracefs-events.c b/src/tracefs-events.c similarity index 100% rename from tracefs-events.c rename to src/tracefs-events.c diff --git a/tracefs-instance.c b/src/tracefs-instance.c similarity index 100% rename from tracefs-instance.c rename to src/tracefs-instance.c diff --git a/tracefs-utils.c b/src/tracefs-utils.c similarity index 100% rename from tracefs-utils.c rename to src/tracefs-utils.c From patchwork Tue Dec 8 21:54:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 11959851 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F229BC433FE for ; Tue, 8 Dec 2020 21:56:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C570B221E5 for ; Tue, 8 Dec 2020 21:56:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729925AbgLHV40 (ORCPT ); Tue, 8 Dec 2020 16:56:26 -0500 Received: from mail.kernel.org ([198.145.29.99]:43334 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729429AbgLHV40 (ORCPT ); Tue, 8 Dec 2020 16:56:26 -0500 Received: from gandalf.local.home (cpe-66-24-58-225.stny.res.rr.com [66.24.58.225]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1481A2310E for ; Tue, 8 Dec 2020 21:55:06 +0000 (UTC) Received: from rostedt by gandalf.local.home with local (Exim 4.94) (envelope-from ) id 1kmkwr-003std-4G for linux-trace-devel@vger.kernel.org; Tue, 08 Dec 2020 16:55:05 -0500 Message-ID: <20201208215504.983661503@goodmis.org> User-Agent: quilt/0.66 Date: Tue, 08 Dec 2020 16:54:09 -0500 From: Steven Rostedt To: linux-trace-devel@vger.kernel.org Subject: [PATCH 5/6] libtracefs: Use pkg-config to find libtraceevent References: <20201208215404.135186972@goodmis.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org From: "Steven Rostedt (VMware)" As libtracefs is dependent on libtraceevent, use the proper pkg-config method to find where libtraceevent is installed. Signed-off-by: Steven Rostedt (VMware) --- Makefile | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index f6b6a9ede5c0..be57682d37c9 100644 --- a/Makefile +++ b/Makefile @@ -62,6 +62,13 @@ pkgconfig_dir ?= $(word 1,$(shell $(PKG_CONFIG) \ PKG_CONFIG_SOURCE_FILE = libtracefs.pc PKG_CONFIG_FILE := $(addprefix $(OUTPUT),$(PKG_CONFIG_SOURCE_FILE)) +LIBTRACEEVENT_INCLUDES = $(shell $(PKG_CONFIG) --cflags libtraceevent) +LIBTRACEEVENT_LIBS = $(shell $(PKG_CONFIG) --libs libtraceevent) + +ifeq ("$(LIBTRACEEVENT_INCLUDES)","") +$(error libtraceevent.so not installed) +endif + ifeq ($(prefix),/usr/local) etcdir ?= /etc else @@ -128,7 +135,7 @@ export prefix bindir src obj bdir LIBTRACEFS_STATIC = $(bdir)/libtracefs.a LIBTRACEFS_SHARED = $(bdir)/libtracefs.so.$(TRACEFS_VERSION) -TRACE_LIBS = -L$(bdir) -ltracefs +TRACE_LIBS = $(LIBTRACEEVENT_LIBS) export LIBS TRACE_LIBS export LIBTRACEFS_STATIC LIBTRACEFS_SHARED @@ -155,7 +162,7 @@ export CFLAGS export INCLUDES # Required CFLAGS -override CFLAGS += -D_GNU_SOURCE +override CFLAGS += -D_GNU_SOURCE $(LIBTRACEEVENT_INCLUDES) # Append required CFLAGS override CFLAGS += $(INCLUDES) From patchwork Tue Dec 8 21:54:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 11959853 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1794DC4361B for ; Tue, 8 Dec 2020 21:56:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E3BB622262 for ; Tue, 8 Dec 2020 21:56:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729429AbgLHV40 (ORCPT ); Tue, 8 Dec 2020 16:56:26 -0500 Received: from mail.kernel.org ([198.145.29.99]:43332 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729343AbgLHV40 (ORCPT ); Tue, 8 Dec 2020 16:56:26 -0500 Received: from gandalf.local.home (cpe-66-24-58-225.stny.res.rr.com [66.24.58.225]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4921223B23 for ; Tue, 8 Dec 2020 21:55:06 +0000 (UTC) Received: from rostedt by gandalf.local.home with local (Exim 4.94) (envelope-from ) id 1kmkwr-003su7-AB for linux-trace-devel@vger.kernel.org; Tue, 08 Dec 2020 16:55:05 -0500 Message-ID: <20201208215505.161440243@goodmis.org> User-Agent: quilt/0.66 Date: Tue, 08 Dec 2020 16:54:10 -0500 From: Steven Rostedt To: linux-trace-devel@vger.kernel.org Subject: [PATCH 6/6] libtracefs: Have make clean remove the .so.X file References: <20201208215404.135186972@goodmis.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org From: "Steven Rostedt (VMware)" "make clean" was leaving behind libtracefs.so.0, in the lib/tracefs directory. Add $(bdir)/*.so.* to the remove line to catch these files as well. Signed-off-by: Steven Rostedt (VMware) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index be57682d37c9..5d11abc82e6a 100644 --- a/Makefile +++ b/Makefile @@ -285,7 +285,7 @@ $(bdir)/libtracefs.so.$(TRACEFS_VERSION): force clean: $(MAKE) -C $(src)/utest clean $(MAKE) -C $(src)/src clean - $(RM) $(TARGETS) $(bdir)/*.a $(bdir)/*.so $(bdir)/*.o $(bdir)/.*.d + $(RM) $(TARGETS) $(bdir)/*.a $(bdir)/*.so $(bdir)/*.so.* $(bdir)/*.o $(bdir)/.*.d $(RM) $(PKG_CONFIG_FILE) .PHONY: clean