Commit-ID: e7b3ba6d8b29904c336e3e6a018bb80d1f63b1f4 Gitweb: http://git.kernel.org/tip/e7b3ba6d8b29904c336e3e6a018bb80d1f63b1f4 Author: Namhyung Kim <namhyung@xxxxxxxxx> AuthorDate: Wed, 4 Apr 2012 00:16:05 -0700 Committer: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx> CommitDate: Wed, 11 Apr 2012 17:18:31 -0300 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@xxxxxxx> Suggested-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxxxxxxxxxx> Acked-by: Pekka Enberg <penberg@xxxxxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxx> Cc: Namhyung Kim <namhyung.kim@xxxxxxx> Cc: Paul Mackerras <paulus@xxxxxxxxx> Cc: Pekka Enberg <penberg@xxxxxxxxxx> Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx Link: http://lkml.kernel.org/r/1333523765-12092-1-git-send-email-namhyung.kim@xxxxxxx Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx> --- tools/perf/Makefile | 4 ++-- tools/perf/{util => ui}/gtk/browser.c | 0 tools/perf/{util => ui}/gtk/gtk.h | 0 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/perf/Makefile b/tools/perf/Makefile index af6ccf8..e98e14c 100644 --- a/tools/perf/Makefile +++ b/tools/perf/Makefile @@ -493,7 +493,7 @@ else endif ifdef NO_GTK2 - BASIC_CFLAGS += -DNO_GTK2 + BASIC_CFLAGS += -DNO_GTK2_SUPPORT else FLAGS_GTK2=$(ALL_CFLAGS) $(ALL_LDFLAGS) $(EXTLIBS) $(shell pkg-config --libs --cflags gtk+-2.0) ifneq ($(call try-cc,$(SOURCE_GTK2),$(FLAGS_GTK2)),y) @@ -502,7 +502,7 @@ else else BASIC_CFLAGS += $(shell pkg-config --cflags gtk+-2.0) EXTLIBS += $(shell pkg-config --libs gtk+-2.0) - LIB_OBJS += $(OUTPUT)util/gtk/browser.o + LIB_OBJS += $(OUTPUT)ui/gtk/browser.o endif endif diff --git a/tools/perf/util/gtk/browser.c b/tools/perf/ui/gtk/browser.c similarity index 100% rename from tools/perf/util/gtk/browser.c rename to tools/perf/ui/gtk/browser.c diff --git a/tools/perf/util/gtk/gtk.h b/tools/perf/ui/gtk/gtk.h similarity index 100% rename from tools/perf/util/gtk/gtk.h rename to tools/perf/ui/gtk/gtk.h -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html