From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S941125AbcJXSxG (ORCPT ); Mon, 24 Oct 2016 14:53:06 -0400 Received: from terminus.zytor.com ([198.137.202.10]:46342 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S941096AbcJXSxC (ORCPT ); Mon, 24 Oct 2016 14:53:02 -0400 Date: Mon, 24 Oct 2016 11:52:52 -0700 From: tip-bot for Jiri Olsa Message-ID: Cc: acme@redhat.com, tglx@linutronix.de, namhyung@kernel.org, rostedt@goodmis.org, hpa@zytor.com, mingo@kernel.org, jolsa@kernel.org, linux-kernel@vger.kernel.org Reply-To: mingo@kernel.org, jolsa@kernel.org, linux-kernel@vger.kernel.org, acme@redhat.com, tglx@linutronix.de, namhyung@kernel.org, rostedt@goodmis.org, hpa@zytor.com To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] tools lib traceevent: Rename LIB_FILE to LIB_TARGET Git-Commit-ID: 39944a768a6df73f8cdec0b5083b108af392df8e X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 39944a768a6df73f8cdec0b5083b108af392df8e Gitweb: http://git.kernel.org/tip/39944a768a6df73f8cdec0b5083b108af392df8e Author: Jiri Olsa AuthorDate: Mon, 1 Aug 2016 09:55:51 +0200 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 24 Oct 2016 11:07:32 -0300 tools lib traceevent: Rename LIB_FILE to LIB_TARGET To ease up following patch. Signed-off-by: Jiri Olsa Cc: Namhyung Kim Cc: Steven Rostedt Link: http://lkml.kernel.org/n/tip-zpv5gd8y7clwrhh6dq03ucd5@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/lib/traceevent/Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/lib/traceevent/Makefile b/tools/lib/traceevent/Makefile index deeae52..0d7e172 100644 --- a/tools/lib/traceevent/Makefile +++ b/tools/lib/traceevent/Makefile @@ -99,7 +99,7 @@ libdir_SQ = $(subst ','\'',$(libdir)) libdir_relative_SQ = $(subst ','\'',$(libdir_relative)) plugin_dir_SQ = $(subst ','\'',$(plugin_dir)) -LIB_FILE = libtraceevent.a libtraceevent.so +LIB_TARGET = libtraceevent.a libtraceevent.so CONFIG_INCLUDES = CONFIG_LIBS = @@ -156,11 +156,11 @@ PLUGINS += plugin_cfg80211.so PLUGINS := $(addprefix $(OUTPUT),$(PLUGINS)) PLUGINS_IN := $(PLUGINS:.so=-in.o) -TE_IN := $(OUTPUT)libtraceevent-in.o -LIB_FILE := $(addprefix $(OUTPUT),$(LIB_FILE)) +TE_IN := $(OUTPUT)libtraceevent-in.o +LIB_TARGET := $(addprefix $(OUTPUT),$(LIB_TARGET)) DYNAMIC_LIST_FILE := $(OUTPUT)libtraceevent-dynamic-list -CMD_TARGETS = $(LIB_FILE) $(PLUGINS) $(DYNAMIC_LIST_FILE) +CMD_TARGETS = $(LIB_TARGET) $(PLUGINS) $(DYNAMIC_LIST_FILE) TARGETS = $(CMD_TARGETS) @@ -261,8 +261,8 @@ define do_generate_dynamic_list_file endef install_lib: all_cmd install_plugins - $(call QUIET_INSTALL, $(LIB_FILE)) \ - $(call do_install,$(LIB_FILE),$(libdir_SQ)) + $(call QUIET_INSTALL, $(LIB_TARGET)) \ + $(call do_install,$(LIB_TARGET),$(libdir_SQ)) install_plugins: $(PLUGINS) $(call QUIET_INSTALL, trace_plugins) \