From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755459AbbBRSf3 (ORCPT ); Wed, 18 Feb 2015 13:35:29 -0500 Received: from terminus.zytor.com ([198.137.202.10]:41311 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752913AbbBRSfX (ORCPT ); Wed, 18 Feb 2015 13:35:23 -0500 Date: Wed, 18 Feb 2015 10:34:24 -0800 From: tip-bot for Jiri Olsa Message-ID: Cc: will.deacon@arm.com, acme@redhat.com, tglx@linutronix.de, jolsa@kernel.org, cjashfor@linux.vnet.ibm.com, fweisbec@gmail.com, namhyung@kernel.org, alexis.berlemont@gmail.com, mingo@kernel.org, dsahern@gmail.com, paulus@samba.org, peterz@infradead.org, linux-kernel@vger.kernel.org, hpa@zytor.com, bp@alien8.de, eranian@google.com, sukadev@linux.vnet.ibm.com Reply-To: will.deacon@arm.com, jolsa@kernel.org, acme@redhat.com, tglx@linutronix.de, namhyung@kernel.org, cjashfor@linux.vnet.ibm.com, fweisbec@gmail.com, alexis.berlemont@gmail.com, mingo@kernel.org, dsahern@gmail.com, paulus@samba.org, linux-kernel@vger.kernel.org, peterz@infradead.org, hpa@zytor.com, bp@alien8.de, sukadev@linux.vnet.ibm.com, eranian@google.com To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf build: Add ui objects building Git-Commit-ID: 3b939a631b53bdb1bf6826fca2a330b16e995fc2 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: 3b939a631b53bdb1bf6826fca2a330b16e995fc2 Gitweb: http://git.kernel.org/tip/3b939a631b53bdb1bf6826fca2a330b16e995fc2 Author: Jiri Olsa AuthorDate: Tue, 30 Dec 2014 00:16:01 +0100 Committer: Arnaldo Carvalho de Melo CommitDate: Thu, 12 Feb 2015 11:47:04 -0300 perf build: Add ui objects building Move the ui objects building under build framework to be included in the libperf build object. Signed-off-by: Jiri Olsa Tested-by: Sukadev Bhattiprolu Tested-by: Will Deacon Cc: Alexis Berlemont Cc: Borislav Petkov Cc: Corey Ashford Cc: David Ahern Cc: Frederic Weisbecker Cc: Namhyung Kim Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Link: http://lkml.kernel.org/n/tip-re5vuat8uu396n7hyor9b5ve@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/Build | 1 + tools/perf/Makefile.perf | 10 ---------- tools/perf/config/Makefile | 1 + tools/perf/ui/Build | 8 ++++++++ 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tools/perf/Build b/tools/perf/Build index 170e456..e84ced3 100644 --- a/tools/perf/Build +++ b/tools/perf/Build @@ -34,3 +34,4 @@ CFLAGS_builtin-timechart.o += $(paths) libperf-y += util/ libperf-y += arch/ +libperf-y += ui/ diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index 96e3cdc..c658fa6 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -327,13 +327,6 @@ LIB_H += util/data.h LIB_H += util/kvm-stat.h LIB_H += util/thread-stack.h -LIB_OBJS += $(OUTPUT)ui/setup.o -LIB_OBJS += $(OUTPUT)ui/helpline.o -LIB_OBJS += $(OUTPUT)ui/progress.o -LIB_OBJS += $(OUTPUT)ui/util.o -LIB_OBJS += $(OUTPUT)ui/hist.o -LIB_OBJS += $(OUTPUT)ui/stdio/hist.o - PERFLIBS = $(LIB_FILE) $(LIBAPIKFS) $(LIBTRACEEVENT) # We choose to avoid "if .. else if .. else .. endif endif" @@ -491,9 +484,6 @@ $(OUTPUT)%.o: %.S $(OUTPUT)%.s: %.S $(QUIET_CC)$(CC) -o $@ -E $(CFLAGS) $< -$(OUTPUT)ui/setup.o: ui/setup.c $(OUTPUT)PERF-CFLAGS - $(QUIET_CC)$(CC) -o $@ -c $(CFLAGS) -DLIBDIR='"$(libdir_SQ)"' $< - $(OUTPUT)ui/browser.o: ui/browser.c $(OUTPUT)PERF-CFLAGS $(QUIET_CC)$(CC) -o $@ -c $(CFLAGS) -DENABLE_SLFUTURE_CONST $< diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile index e55d811..0739138 100644 --- a/tools/perf/config/Makefile +++ b/tools/perf/config/Makefile @@ -844,3 +844,4 @@ $(call detected_var,mandir_SQ) $(call detected_var,ETC_PERFCONFIG_SQ) $(call detected_var,prefix_SQ) $(call detected_var,perfexecdir_SQ) +$(call detected_var,LIBDIR) diff --git a/tools/perf/ui/Build b/tools/perf/ui/Build new file mode 100644 index 0000000..077b6a4 --- /dev/null +++ b/tools/perf/ui/Build @@ -0,0 +1,8 @@ +libperf-y += setup.o +libperf-y += helpline.o +libperf-y += progress.o +libperf-y += util.o +libperf-y += hist.o +libperf-y += stdio/hist.o + +CFLAGS_setup.o += -DLIBDIR="BUILD_STR($(LIBDIR))"