From: Jiri Olsa <jolsa@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: Jiri Olsa <jolsa@redhat.com>,
Arnaldo Carvalho de Melo <acme@ghostprotocols.net>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
Ingo Molnar <mingo@elte.hu>, Paul Mackerras <paulus@samba.org>,
Corey Ashford <cjashfor@linux.vnet.ibm.com>,
Frederic Weisbecker <fweisbec@gmail.com>,
Namhyung Kim <namhyung@kernel.org>,
Borislav Petkov <bp@alien8.de>,
Stephane Eranian <eranian@google.com>,
Sam Ravnborg <sam@ravnborg.org>, David Ahern <dsahern@gmail.com>
Subject: [PATCH 11/26] perf tools: Move gtk2 check config into config/Makefile
Date: Wed, 24 Apr 2013 11:37:38 +0200 [thread overview]
Message-ID: <1366796273-4780-12-git-send-email-jolsa@redhat.com> (raw)
In-Reply-To: <1366796273-4780-1-git-send-email-jolsa@redhat.com>
Moving gtk2 check config into config/Makefile.
Signed-off-by: Jiri Olsa <jolsa@redhat.com>
Cc: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Stephane Eranian <eranian@google.com>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: David Ahern <dsahern@gmail.com>
---
tools/perf/Makefile | 25 +++++++------------------
tools/perf/config/Makefile | 15 +++++++++++++++
2 files changed, 22 insertions(+), 18 deletions(-)
diff --git a/tools/perf/Makefile b/tools/perf/Makefile
index 2187a2c..7bf5c10 100644
--- a/tools/perf/Makefile
+++ b/tools/perf/Makefile
@@ -523,24 +523,13 @@ ifndef NO_SLANG
endif
ifndef NO_GTK2
- FLAGS_GTK2=$(ALL_CFLAGS) $(ALL_LDFLAGS) $(EXTLIBS) $(shell pkg-config --libs --cflags gtk+-2.0 2>/dev/null)
- ifneq ($(call try-cc,$(SOURCE_GTK2),$(FLAGS_GTK2),gtk2),y)
- msg := $(warning GTK2 not found, disables GTK2 support. Please install gtk2-devel or libgtk2.0-dev);
- else
- ifeq ($(call try-cc,$(SOURCE_GTK2_INFOBAR),$(FLAGS_GTK2),-DHAVE_GTK_INFO_BAR),y)
- BASIC_CFLAGS += -DHAVE_GTK_INFO_BAR
- endif
- BASIC_CFLAGS += -DGTK2_SUPPORT
- BASIC_CFLAGS += $(shell pkg-config --cflags gtk+-2.0 2>/dev/null)
- EXTLIBS += $(shell pkg-config --libs gtk+-2.0 2>/dev/null)
- LIB_OBJS += $(OUTPUT)ui/gtk/browser.o
- LIB_OBJS += $(OUTPUT)ui/gtk/hists.o
- LIB_OBJS += $(OUTPUT)ui/gtk/setup.o
- LIB_OBJS += $(OUTPUT)ui/gtk/util.o
- LIB_OBJS += $(OUTPUT)ui/gtk/helpline.o
- LIB_OBJS += $(OUTPUT)ui/gtk/progress.o
- LIB_OBJS += $(OUTPUT)ui/gtk/annotate.o
- endif
+ LIB_OBJS += $(OUTPUT)ui/gtk/browser.o
+ LIB_OBJS += $(OUTPUT)ui/gtk/hists.o
+ LIB_OBJS += $(OUTPUT)ui/gtk/setup.o
+ LIB_OBJS += $(OUTPUT)ui/gtk/util.o
+ LIB_OBJS += $(OUTPUT)ui/gtk/helpline.o
+ LIB_OBJS += $(OUTPUT)ui/gtk/progress.o
+ LIB_OBJS += $(OUTPUT)ui/gtk/annotate.o
endif
ifdef NO_LIBPERL
diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile
index 008b212..6fc2089 100644
--- a/tools/perf/config/Makefile
+++ b/tools/perf/config/Makefile
@@ -225,3 +225,18 @@ ifndef NO_SLANG
EXTLIBS += -lslang
endif
endif
+
+ifndef NO_GTK2
+ FLAGS_GTK2=$(ALL_CFLAGS) $(ALL_LDFLAGS) $(EXTLIBS) $(shell pkg-config --libs --cflags gtk+-2.0 2>/dev/null)
+ ifneq ($(call try-cc,$(SOURCE_GTK2),$(FLAGS_GTK2),gtk2),y)
+ msg := $(warning GTK2 not found, disables GTK2 support. Please install gtk2-devel or libgtk2.0-dev);
+ NO_GTK2 := 1
+ else
+ ifeq ($(call try-cc,$(SOURCE_GTK2_INFOBAR),$(FLAGS_GTK2),-DHAVE_GTK_INFO_BAR),y)
+ BASIC_CFLAGS += -DHAVE_GTK_INFO_BAR
+ endif
+ BASIC_CFLAGS += -DGTK2_SUPPORT
+ BASIC_CFLAGS += $(shell pkg-config --cflags gtk+-2.0 2>/dev/null)
+ EXTLIBS += $(shell pkg-config --libs gtk+-2.0 2>/dev/null)
+ endif
+endif
--
1.7.11.7
next prev parent reply other threads:[~2013-04-24 9:39 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-24 9:37 [PATCHv2 00/26] perf tools: Makefile changes Jiri Olsa
2013-04-24 9:37 ` [PATCH 01/26] perf tools: Add automated make test suite Jiri Olsa
2013-04-25 9:05 ` Namhyung Kim
2013-04-24 9:37 ` [PATCH 02/26] perf tools: Fix tab vs spaces issue in Makefile ifdef/endif Jiri Olsa
2013-05-31 11:29 ` [tip:perf/core] " tip-bot for Jiri Olsa
2013-04-24 9:37 ` [PATCH 03/26] perf tools: Move arch check into config/Makefile Jiri Olsa
2013-04-25 9:15 ` Namhyung Kim
2013-04-26 11:37 ` Jiri Olsa
2013-04-26 16:18 ` Jiri Olsa
2013-05-06 2:03 ` Namhyung Kim
2013-04-24 9:37 ` [PATCH 04/26] perf tools: Move programs " Jiri Olsa
2013-04-24 9:37 ` [PATCH 05/26] perf tools: Move compiler and linker flags " Jiri Olsa
2013-04-24 9:37 ` [PATCH 06/26] perf tools: Move libelf check config " Jiri Olsa
2013-04-24 9:37 ` [PATCH 07/26] perf tools: Move libdw " Jiri Olsa
2013-04-24 9:37 ` [PATCH 08/26] perf tools: Move libunwind " Jiri Olsa
2013-04-24 9:37 ` [PATCH 09/26] perf tools: Move libaudit " Jiri Olsa
2013-04-24 9:37 ` [PATCH 10/26] perf tools: Move slang " Jiri Olsa
2013-04-24 9:37 ` Jiri Olsa [this message]
2013-04-24 9:37 ` [PATCH 12/26] perf tools: Move libperl " Jiri Olsa
2013-04-24 9:37 ` [PATCH 13/26] perf tools: Move libpython " Jiri Olsa
2013-04-24 9:37 ` [PATCH 14/26] perf tools: Move libbfd " Jiri Olsa
2013-04-24 9:37 ` [PATCH 15/26] perf tools: Move stdlib " Jiri Olsa
2013-04-24 9:37 ` [PATCH 16/26] perf tools: Move libnuma " Jiri Olsa
2013-04-24 9:37 ` [PATCH 17/26] perf tools: Move paths " Jiri Olsa
2013-04-24 9:37 ` [PATCH 18/26] perf tools: Final touches for CHK config move Jiri Olsa
2013-04-24 9:37 ` [PATCH 19/26] perf tools: Merge all *CFLAGS* make variable into CFLAGS Jiri Olsa
2013-04-24 9:37 ` [PATCH 20/26] perf tools: Merge all *LDFLAGS* make variable into LDFLAGS Jiri Olsa
2013-04-24 9:37 ` [PATCH 21/26] perf tools: Switch to full patch C include directories Jiri Olsa
2013-04-26 16:26 ` David Ahern
2013-04-29 10:02 ` Jiri Olsa
2013-04-24 9:37 ` [PATCH 22/26] perf tools: Add NO_BIONIC variable to confiure bionic setup Jiri Olsa
2013-04-24 9:37 ` [PATCH 23/26] perf tools: Replace tabs with spaces for all non-commands statements Jiri Olsa
2013-04-24 9:37 ` [PATCH 24/26] perf tools: Replace multiple line assignment with multiple statements Jiri Olsa
2013-04-24 9:37 ` [PATCH 25/26] perf tools: Remove '?=' Makefile STRIP assignment Jiri Olsa
2013-04-24 9:37 ` [PATCH 26/26] perf tools: Add missing liblk.a dependency for python/perf.so 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=1366796273-4780-12-git-send-email-jolsa@redhat.com \
--to=jolsa@redhat.com \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@ghostprotocols.net \
--cc=bp@alien8.de \
--cc=cjashfor@linux.vnet.ibm.com \
--cc=dsahern@gmail.com \
--cc=eranian@google.com \
--cc=fweisbec@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=namhyung@kernel.org \
--cc=paulus@samba.org \
--cc=sam@ravnborg.org \
/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
all inboxes | Powered by JetHome®