Commit 58cabf6a authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Move gtk2 check config into config/Makefile 



Moving gtk2 check config into config/Makefile.

Signed-off-by: default avatarJiri Olsa <jolsa@redhat.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1369398928-9809-11-git-send-email-jolsa@redhat.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 4a8f888a

tools/perf/Makefile

+7 −18
Original line number Diff line number Diff line
@@ -521,16 +521,6 @@ 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
@@ -539,7 +529,6 @@ ifndef NO_GTK2 
	LIB_OBJS += $(OUTPUT)ui/gtk/progress.o

	LIB_OBJS += $(OUTPUT)ui/gtk/annotate.o

endif

endif



ifdef NO_LIBPERL

	BASIC_CFLAGS += -DNO_LIBPERL

tools/perf/config/Makefile

+15 −0
Original line number Diff line number Diff line
@@ -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

CRA Git | Maintained and supported by SUSTech CRA and CCSE