From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752640AbcLFI2s (ORCPT ); Tue, 6 Dec 2016 03:28:48 -0500 Received: from terminus.zytor.com ([198.137.202.10]:42536 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752237AbcLFI2n (ORCPT ); Tue, 6 Dec 2016 03:28:43 -0500 Date: Tue, 6 Dec 2016 00:28:08 -0800 From: tip-bot for Jiri Olsa Message-ID: Cc: tglx@linutronix.de, hpa@zytor.com, a.p.zijlstra@chello.nl, mingo@kernel.org, dsahern@gmail.com, jolsa@kernel.org, linux-kernel@vger.kernel.org, acme@redhat.com, namhyung@kernel.org Reply-To: a.p.zijlstra@chello.nl, hpa@zytor.com, tglx@linutronix.de, mingo@kernel.org, jolsa@kernel.org, linux-kernel@vger.kernel.org, dsahern@gmail.com, namhyung@kernel.org, acme@redhat.com In-Reply-To: <1480884178-8072-4-git-send-email-jolsa@kernel.org> References: <1480884178-8072-4-git-send-email-jolsa@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf tools: Move install-gtk target into rules area Git-Commit-ID: 5c319a67b13da8323ec7bdb8d2ea729eb8a20735 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: 5c319a67b13da8323ec7bdb8d2ea729eb8a20735 Gitweb: http://git.kernel.org/tip/5c319a67b13da8323ec7bdb8d2ea729eb8a20735 Author: Jiri Olsa AuthorDate: Sun, 4 Dec 2016 21:42:54 +0100 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 5 Dec 2016 16:06:50 -0300 perf tools: Move install-gtk target into rules area The upcoming fixdep fix needs all targets at the same area, so they'll fit under a signal condition block. Move install-gtk target into the rules section. Signed-off-by: Jiri Olsa Cc: David Ahern Cc: Namhyung Kim Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/1480884178-8072-4-git-send-email-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/Makefile.perf | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index dfb20dd..593d765 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -331,11 +331,6 @@ endif ifndef NO_GTK2 ALL_PROGRAMS += $(OUTPUT)libperf-gtk.so GTK_IN := $(OUTPUT)gtk-in.o - -install-gtk: $(OUTPUT)libperf-gtk.so - $(call QUIET_INSTALL, 'GTK UI') \ - $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(libdir_SQ)'; \ - $(INSTALL) $(OUTPUT)libperf-gtk.so '$(DESTDIR_SQ)$(libdir_SQ)' endif ifdef ASCIIDOC8 @@ -712,7 +707,14 @@ check: $(OUTPUT)common-cmds.h ### Installation rules +ifndef NO_GTK2 +install-gtk: $(OUTPUT)libperf-gtk.so + $(call QUIET_INSTALL, 'GTK UI') \ + $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(libdir_SQ)'; \ + $(INSTALL) $(OUTPUT)libperf-gtk.so '$(DESTDIR_SQ)$(libdir_SQ)' +else install-gtk: +endif install-tools: all install-gtk $(call QUIET_INSTALL, binaries) \