aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorNamhyung Kim <namhyung@gmail.com>2012-04-04 03:16:05 -0400
committerArnaldo Carvalho de Melo <acme@redhat.com>2012-04-11 16:18:31 -0400
commite7b3ba6d8b29904c336e3e6a018bb80d1f63b1f4 (patch)
tree3b5199fd73a3b113aecc943ee8034c3592c0a2c5 /tools
parentaca7a94d6a59d6bf2600768e752f971c6cc0ab57 (diff)
perf tools: Move GTK+ bits to tools/perf/ui/gtk directory
Move those files to new directory in order to be prepared to further UI work. Makefile and header file pathes are adjusted accordingly. Also fix a build breakage if NO_GTK2=1 is given. Signed-off-by: Namhyung Kim <namhyung.kim@lge.com> Suggested-by: Arnaldo Carvalho de Melo <acme@ghostprotocols.net> Acked-by: Pekka Enberg <penberg@kernel.org> Cc: Ingo Molnar <mingo@elte.hu> Cc: Namhyung Kim <namhyung.kim@lge.com> Cc: Paul Mackerras <paulus@samba.org> Cc: Pekka Enberg <penberg@kernel.org> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl Link: http://lkml.kernel.org/r/1333523765-12092-1-git-send-email-namhyung.kim@lge.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/perf/Makefile4
-rw-r--r--tools/perf/ui/gtk/browser.c (renamed from tools/perf/util/gtk/browser.c)0
-rw-r--r--tools/perf/ui/gtk/gtk.h (renamed from tools/perf/util/gtk/gtk.h)0
3 files changed, 2 insertions, 2 deletions
diff --git a/tools/perf/Makefile b/tools/perf/Makefile
index af6ccf8d1499..e98e14c88532 100644
--- a/tools/perf/Makefile
+++ b/tools/perf/Makefile
@@ -493,7 +493,7 @@ else
493endif 493endif
494 494
495ifdef NO_GTK2 495ifdef NO_GTK2
496 BASIC_CFLAGS += -DNO_GTK2 496 BASIC_CFLAGS += -DNO_GTK2_SUPPORT
497else 497else
498 FLAGS_GTK2=$(ALL_CFLAGS) $(ALL_LDFLAGS) $(EXTLIBS) $(shell pkg-config --libs --cflags gtk+-2.0) 498 FLAGS_GTK2=$(ALL_CFLAGS) $(ALL_LDFLAGS) $(EXTLIBS) $(shell pkg-config --libs --cflags gtk+-2.0)
499 ifneq ($(call try-cc,$(SOURCE_GTK2),$(FLAGS_GTK2)),y) 499 ifneq ($(call try-cc,$(SOURCE_GTK2),$(FLAGS_GTK2)),y)
@@ -502,7 +502,7 @@ else
502 else 502 else
503 BASIC_CFLAGS += $(shell pkg-config --cflags gtk+-2.0) 503 BASIC_CFLAGS += $(shell pkg-config --cflags gtk+-2.0)
504 EXTLIBS += $(shell pkg-config --libs gtk+-2.0) 504 EXTLIBS += $(shell pkg-config --libs gtk+-2.0)
505 LIB_OBJS += $(OUTPUT)util/gtk/browser.o 505 LIB_OBJS += $(OUTPUT)ui/gtk/browser.o
506 endif 506 endif
507endif 507endif
508 508
diff --git a/tools/perf/util/gtk/browser.c b/tools/perf/ui/gtk/browser.c
index 258352a2356c..258352a2356c 100644
--- a/tools/perf/util/gtk/browser.c
+++ b/tools/perf/ui/gtk/browser.c
diff --git a/tools/perf/util/gtk/gtk.h b/tools/perf/ui/gtk/gtk.h
index 75177ee04032..75177ee04032 100644
--- a/tools/perf/util/gtk/gtk.h
+++ b/tools/perf/ui/gtk/gtk.h