Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1535710

[PATCH 3/7] perf tools: Move install-gtk target into rules area

From Jiri Olsa <jolsa@kernel.org>
Newsgroups linux.kernel
Subject [PATCH 3/7] perf tools: Move install-gtk target into rules area
Date 2016-12-04 21:50 +0100
Message-ID <sKLTr-3vB-3@gated-at.bofh.it> (permalink)
References <sKLTr-3vB-1@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw


Following fixdep fix needs all targets at the same area,
so they'll fit under signal condition block.

Moving install-gtk target into rules section.

Link: http://lkml.kernel.org/n/tip-0xk7ca6fdvv6jg71lp40yj5x@git.kernel.org
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
 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 3cb1df43ad3e..2e95456108d7 100644
--- a/tools/perf/Makefile.perf
+++ b/tools/perf/Makefile.perf
@@ -325,11 +325,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
@@ -691,7 +686,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) \
-- 
2.7.4

Back to linux.kernel | Previous | NextPrevious in thread | Next in thread | Find similar | Unroll thread


Thread

[PATCH 0/7] perf tools: Force fixdep to be built first Jiri Olsa <jolsa@kernel.org> - 2016-12-04 21:50 +0100
  [PATCH 3/7] perf tools: Move install-gtk target into rules area Jiri Olsa <jolsa@kernel.org> - 2016-12-04 21:50 +0100
    [tip:perf/core] perf tools: Move install-gtk target into rules area tip-bot for Jiri Olsa <tipbot@zytor.com> - 2016-12-06 09:30 +0100
  [PATCH 6/7] perf tools: Add non config targets Jiri Olsa <jolsa@kernel.org> - 2016-12-04 21:50 +0100
    [tip:perf/core] perf tools: Add non config targets tip-bot for Jiri Olsa <tipbot@zytor.com> - 2016-12-06 09:40 +0100
  [PATCH 1/7] tools build: Make the .cmd file more readable Jiri Olsa <jolsa@kernel.org> - 2016-12-04 21:50 +0100
    [tip:perf/core] tools build: Make the .cmd file more readable tip-bot for Jiri Olsa <tipbot@zytor.com> - 2016-12-06 09:50 +0100
  [PATCH 2/7] tools build: Move tabs to spaces where suitable Jiri Olsa <jolsa@kernel.org> - 2016-12-04 21:50 +0100
    [tip:perf/core] tools build: Move tabs to spaces where suitable tip-bot for Jiri Olsa <tipbot@zytor.com> - 2016-12-06 09:30 +0100
  [PATCH 5/7] perf tools: Force fixdep compilation at the start of the build Jiri Olsa <jolsa@kernel.org> - 2016-12-04 21:50 +0100
    Re: [PATCH 5/7] perf tools: Force fixdep compilation at the start of  the build Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-12-05 21:10 +0100
      Re: [PATCH 5/7] perf tools: Force fixdep compilation at the start of  the build Jiri Olsa <jolsa@redhat.com> - 2016-12-06 11:50 +0100
  [PATCH 7/7] perf tools: Cleanup build directory before each test Jiri Olsa <jolsa@kernel.org> - 2016-12-04 21:50 +0100
    [tip:perf/core] perf tools: Cleanup build directory before each  test tip-bot for Jiri Olsa <tipbot@zytor.com> - 2016-12-06 09:30 +0100
  [PATCH 4/7] perf tools: Move python/perf.so target into rules area Jiri Olsa <jolsa@kernel.org> - 2016-12-04 21:50 +0100
    [tip:perf/core] perf tools: Move python/perf.so target into rules  area tip-bot for Jiri Olsa <tipbot@zytor.com> - 2016-12-06 09:30 +0100

csiph-web