From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752809AbcLFI3D (ORCPT ); Tue, 6 Dec 2016 03:29:03 -0500 Received: from terminus.zytor.com ([198.137.202.10]:42564 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752200AbcLFI2u (ORCPT ); Tue, 6 Dec 2016 03:28:50 -0500 Date: Tue, 6 Dec 2016 00:28:38 -0800 From: tip-bot for Jiri Olsa Message-ID: Cc: dsahern@gmail.com, tglx@linutronix.de, hpa@zytor.com, jolsa@kernel.org, a.p.zijlstra@chello.nl, linux-kernel@vger.kernel.org, mingo@kernel.org, acme@redhat.com, namhyung@kernel.org Reply-To: jolsa@kernel.org, a.p.zijlstra@chello.nl, hpa@zytor.com, tglx@linutronix.de, dsahern@gmail.com, namhyung@kernel.org, acme@redhat.com, mingo@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <1480884178-8072-5-git-send-email-jolsa@kernel.org> References: <1480884178-8072-5-git-send-email-jolsa@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf tools: Move python/perf.so target into rules area Git-Commit-ID: 0b4d4b076251542dc81d128f481c3d3b5fc24863 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: 0b4d4b076251542dc81d128f481c3d3b5fc24863 Gitweb: http://git.kernel.org/tip/0b4d4b076251542dc81d128f481c3d3b5fc24863 Author: Jiri Olsa AuthorDate: Sun, 4 Dec 2016 21:42:55 +0100 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 5 Dec 2016 16:11:50 -0300 perf tools: Move python/perf.so target into rules area Following fixdep fix needs all targets at the same area, so they'll fit under signal condition block. Moving python/perf.so target into rules section and intentionally removing the perl script related comment. Signed-off-by: Jiri Olsa Cc: David Ahern Cc: Namhyung Kim Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/1480884178-8072-5-git-send-email-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/Makefile.perf | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index 593d765..2784b58 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -268,17 +268,6 @@ python-clean := $(call QUIET_CLEAN, python) $(RM) -r $(PYTHON_EXTBUILD) $(OUTPUT PYTHON_EXT_SRCS := $(shell grep -v ^\# util/python-ext-sources) PYTHON_EXT_DEPS := util/python-ext-sources util/setup.py $(LIBTRACEEVENT) $(LIBAPI) -$(OUTPUT)python/perf.so: $(PYTHON_EXT_SRCS) $(PYTHON_EXT_DEPS) $(LIBTRACEEVENT_DYNAMIC_LIST) - $(QUIET_GEN)LDSHARED="$(CC) -pthread -shared" \ - CFLAGS='$(CFLAGS)' LDFLAGS='$(LDFLAGS) $(LIBTRACEEVENT_DYNAMIC_LIST_LDFLAGS)' \ - $(PYTHON_WORD) util/setup.py \ - --quiet build_ext; \ - mkdir -p $(OUTPUT)python && \ - cp $(PYTHON_EXTBUILD_LIB)perf.so $(OUTPUT)python/ -# -# No Perl scripts right now: -# - SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) PROGRAMS += $(OUTPUT)perf @@ -362,6 +351,14 @@ SHELL = $(SHELL_PATH) all: shell_compatibility_test $(ALL_PROGRAMS) $(LANG_BINDINGS) $(OTHER_PROGRAMS) +$(OUTPUT)python/perf.so: $(PYTHON_EXT_SRCS) $(PYTHON_EXT_DEPS) $(LIBTRACEEVENT_DYNAMIC_LIST) + $(QUIET_GEN)LDSHARED="$(CC) -pthread -shared" \ + CFLAGS='$(CFLAGS)' LDFLAGS='$(LDFLAGS) $(LIBTRACEEVENT_DYNAMIC_LIST_LDFLAGS)' \ + $(PYTHON_WORD) util/setup.py \ + --quiet build_ext; \ + mkdir -p $(OUTPUT)python && \ + cp $(PYTHON_EXTBUILD_LIB)perf.so $(OUTPUT)python/ + please_set_SHELL_PATH_to_a_more_modern_shell: $(Q)$$(:)