aboutsummaryrefslogtreecommitdiffstats
path: root/tools/perf/Makefile
diff options
context:
space:
mode:
authorDavid Ahern <dsahern@gmail.com>2012-08-19 11:46:42 -0400
committerArnaldo Carvalho de Melo <acme@redhat.com>2012-08-20 08:33:29 -0400
commit1c09bf4a79e808c13c02d4ca8221fb2957bf3ccb (patch)
treeac684915cb897d070b6dfea4421495304de9bd61 /tools/perf/Makefile
parente8d0f400ee3247ad22faa6afabfa7022260ef7a5 (diff)
perf: silence GTK2 probing errors
If GTK2 development packages are not installed, make is rather noisy: $ make -C tools/perf O=/tmp/pbuild Package gtk+-2.0 was not found in the pkg-config search path. Perhaps you should add the directory containing `gtk+-2.0.pc' to the PKG_CONFIG_PATH environment variable No package 'gtk+-2.0' found make: Entering directory `/opt/sw/ahern/perf.git/tools/perf' Makefile:593: GTK2 not found, disables GTK2 support. Please install gtk2-devel or libgtk2.0-dev PERF_VERSION = 3.6.rc1.205.gdb146f.dirty make: Leaving directory `/opt/sw/ahern/perf.git/tools/perf' Package gtk+-2.0 was not found in the pkg-config search path. Perhaps you should add the directory containing `gtk+-2.0.pc' to the PKG_CONFIG_PATH environment variable No package 'gtk+-2.0' found make: Entering directory `/opt/sw/ahern/perf.git/tools/perf' Makefile:593: GTK2 not found, disables GTK2 support. Please install gtk2-devel or libgtk2.0-dev ... Silence the pkg-config errors. Aftewards: $ make -C tools/perf O=/tmp/pbuild make: Entering directory `/opt/sw/ahern/perf.git/tools/perf' Makefile:593: GTK2 not found, disables GTK2 support. Please install gtk2-devel or libgtk2.0-dev PERF_VERSION = 3.6.rc1.206.gd43ff9.dirty make: Leaving directory `/opt/sw/ahern/perf.git/tools/perf' make: Entering directory `/opt/sw/ahern/perf.git/tools/perf' Makefile:593: GTK2 not found, disables GTK2 support. Please install gtk2-devel or libgtk2.0-dev ... Signed-off-by: David Ahern <dsahern@gmail.com> Acked-by: Namhyung Kim <namhyung@kernel.org> Acked-by: Pekka Enberg <penberg@kernel.org> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Pekka Enberg <penberg@kernel.org> Link: http://lkml.kernel.org/r/1345391202-71865-1-git-send-email-dsahern@gmail.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/Makefile')
-rw-r--r--tools/perf/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/perf/Makefile b/tools/perf/Makefile
index 75af93dc52ad..8beff9944f44 100644
--- a/tools/perf/Makefile
+++ b/tools/perf/Makefile
@@ -587,7 +587,7 @@ endif
587ifdef NO_GTK2 587ifdef NO_GTK2
588 BASIC_CFLAGS += -DNO_GTK2_SUPPORT 588 BASIC_CFLAGS += -DNO_GTK2_SUPPORT
589else 589else
590 FLAGS_GTK2=$(ALL_CFLAGS) $(ALL_LDFLAGS) $(EXTLIBS) $(shell pkg-config --libs --cflags gtk+-2.0) 590 FLAGS_GTK2=$(ALL_CFLAGS) $(ALL_LDFLAGS) $(EXTLIBS) $(shell pkg-config --libs --cflags gtk+-2.0 2>/dev/null)
591 ifneq ($(call try-cc,$(SOURCE_GTK2),$(FLAGS_GTK2)),y) 591 ifneq ($(call try-cc,$(SOURCE_GTK2),$(FLAGS_GTK2)),y)
592 msg := $(warning GTK2 not found, disables GTK2 support. Please install gtk2-devel or libgtk2.0-dev); 592 msg := $(warning GTK2 not found, disables GTK2 support. Please install gtk2-devel or libgtk2.0-dev);
593 BASIC_CFLAGS += -DNO_GTK2_SUPPORT 593 BASIC_CFLAGS += -DNO_GTK2_SUPPORT
@@ -595,8 +595,8 @@ else
595 ifeq ($(call try-cc,$(SOURCE_GTK2_INFOBAR),$(FLAGS_GTK2)),y) 595 ifeq ($(call try-cc,$(SOURCE_GTK2_INFOBAR),$(FLAGS_GTK2)),y)
596 BASIC_CFLAGS += -DHAVE_GTK_INFO_BAR 596 BASIC_CFLAGS += -DHAVE_GTK_INFO_BAR
597 endif 597 endif
598 BASIC_CFLAGS += $(shell pkg-config --cflags gtk+-2.0) 598 BASIC_CFLAGS += $(shell pkg-config --cflags gtk+-2.0 2>/dev/null)
599 EXTLIBS += $(shell pkg-config --libs gtk+-2.0) 599 EXTLIBS += $(shell pkg-config --libs gtk+-2.0 2>/dev/null)
600 LIB_OBJS += $(OUTPUT)ui/gtk/browser.o 600 LIB_OBJS += $(OUTPUT)ui/gtk/browser.o
601 LIB_OBJS += $(OUTPUT)ui/gtk/setup.o 601 LIB_OBJS += $(OUTPUT)ui/gtk/setup.o
602 LIB_OBJS += $(OUTPUT)ui/gtk/util.o 602 LIB_OBJS += $(OUTPUT)ui/gtk/util.o