From patchwork Wed Dec 16 21:57:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 11978629 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,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 B8CA3C1B0D8 for ; Wed, 16 Dec 2020 21:58:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8A8FA235F8 for ; Wed, 16 Dec 2020 21:58:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729967AbgLPV6o (ORCPT ); Wed, 16 Dec 2020 16:58:44 -0500 Received: from mail.kernel.org ([198.145.29.99]:40806 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729960AbgLPV6o (ORCPT ); Wed, 16 Dec 2020 16:58:44 -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 A00EE23426 for ; Wed, 16 Dec 2020 21:58:05 +0000 (UTC) Received: from rostedt by gandalf.local.home with local (Exim 4.94) (envelope-from ) id 1kpeo8-000weT-Hn for linux-trace-devel@vger.kernel.org; Wed, 16 Dec 2020 16:58:04 -0500 Message-ID: <20201216215804.410318118@goodmis.org> User-Agent: quilt/0.66 Date: Wed, 16 Dec 2020 16:57:38 -0500 From: Steven Rostedt To: linux-trace-devel@vger.kernel.org Subject: [PATCH 1/2] libtracefs: Remove Makfefile targets that reference "gui" References: <20201216215737.396368358@goodmis.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org From: "Steven Rostedt (VMware)" 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. Signed-off-by: Steven Rostedt (VMware) --- Makefile | 7 ------- 1 file changed, 7 deletions(-) diff --git a/Makefile b/Makefile index 47ac4f5e8c8c..daaf347966b9 100644 --- a/Makefile +++ b/Makefile @@ -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 From patchwork Wed Dec 16 21:57:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 11978633 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,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 C5C68C0018C for ; Wed, 16 Dec 2020 21:58:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9F25E23788 for ; Wed, 16 Dec 2020 21:58:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729960AbgLPV6o (ORCPT ); Wed, 16 Dec 2020 16:58:44 -0500 Received: from mail.kernel.org ([198.145.29.99]:40792 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729966AbgLPV6o (ORCPT ); Wed, 16 Dec 2020 16:58:44 -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 AD9CD23434 for ; Wed, 16 Dec 2020 21:58:05 +0000 (UTC) Received: from rostedt by gandalf.local.home with local (Exim 4.94) (envelope-from ) id 1kpeo8-000wex-NC for linux-trace-devel@vger.kernel.org; Wed, 16 Dec 2020 16:58:04 -0500 Message-ID: <20201216215804.585750593@goodmis.org> User-Agent: quilt/0.66 Date: Wed, 16 Dec 2020 16:57:39 -0500 From: Steven Rostedt To: linux-trace-devel@vger.kernel.org Subject: [PATCH 2/2] libtracefs: Do not fail make on clean target References: <20201216215737.396368358@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" should not fail because libtraceevent is not installed on the system. Signed-off-by: Steven Rostedt (VMware) --- Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index daaf347966b9..e32bcaee3cba 100644 --- a/Makefile +++ b/Makefile @@ -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