From: tip-bot for Jiri Olsa <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
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
Subject: [tip:perf/core] perf tools: Move install-gtk target into rules area
Date: Tue, 6 Dec 2016 00:28:08 -0800 [thread overview]
Message-ID: <tip-5c319a67b13da8323ec7bdb8d2ea729eb8a20735@git.kernel.org> (raw)
In-Reply-To: <1480884178-8072-4-git-send-email-jolsa@kernel.org>
Commit-ID: 5c319a67b13da8323ec7bdb8d2ea729eb8a20735
Gitweb: http://git.kernel.org/tip/5c319a67b13da8323ec7bdb8d2ea729eb8a20735
Author: Jiri Olsa <jolsa@kernel.org>
AuthorDate: Sun, 4 Dec 2016 21:42:54 +0100
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
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 <jolsa@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1480884178-8072-4-git-send-email-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
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) \
next prev parent reply other threads:[~2016-12-06 8:28 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-04 20:42 [PATCH 0/7] perf tools: Force fixdep to be built first Jiri Olsa
2016-12-04 20:42 ` [PATCH 1/7] tools build: Make the .cmd file more readable Jiri Olsa
2016-12-06 8:27 ` [tip:perf/core] " tip-bot for Jiri Olsa
2016-12-04 20:42 ` [PATCH 2/7] tools build: Move tabs to spaces where suitable Jiri Olsa
2016-12-06 8:27 ` [tip:perf/core] " tip-bot for Jiri Olsa
2016-12-04 20:42 ` [PATCH 3/7] perf tools: Move install-gtk target into rules area Jiri Olsa
2016-12-06 8:28 ` tip-bot for Jiri Olsa [this message]
2016-12-04 20:42 ` [PATCH 4/7] perf tools: Move python/perf.so " Jiri Olsa
2016-12-06 8:28 ` [tip:perf/core] " tip-bot for Jiri Olsa
2016-12-04 20:42 ` [PATCH 5/7] perf tools: Force fixdep compilation at the start of the build Jiri Olsa
2016-12-05 20:02 ` Arnaldo Carvalho de Melo
2016-12-06 10:47 ` Jiri Olsa
2016-12-04 20:42 ` [PATCH 6/7] perf tools: Add non config targets Jiri Olsa
2016-12-06 8:29 ` [tip:perf/core] " tip-bot for Jiri Olsa
2016-12-04 20:42 ` [PATCH 7/7] perf tools: Cleanup build directory before each test Jiri Olsa
2016-12-06 8:29 ` [tip:perf/core] " tip-bot for Jiri Olsa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-5c319a67b13da8323ec7bdb8d2ea729eb8a20735@git.kernel.org \
--to=tipbot@zytor.com \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@redhat.com \
--cc=dsahern@gmail.com \
--cc=hpa@zytor.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).