All of lore.kernel.org
 help / color / mirror / Atom feed
From: Arnaldo Carvalho de Melo <acme@infradead.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org, Namhyung Kim <namhyung@gmail.com>,
	Namhyung Kim <namhyung.kim@lge.com>, Ingo Molnar <mingo@elte.hu>,
	Paul Mackerras <paulus@samba.org>,
	Pekka Enberg <penberg@kernel.org>,
	Peter@infradead.org, "Zijlstra <a.p.zijlstra"@chello.nl,
	Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 10/13] perf tools: Move GTK+ bits to tools/perf/ui/gtk directory
Date: Wed, 11 Apr 2012 18:05:22 -0300	[thread overview]
Message-ID: <1334178325-19148-11-git-send-email-acme@infradead.org> (raw)
In-Reply-To: <1334178325-19148-1-git-send-email-acme@infradead.org>

From: Namhyung Kim <namhyung@gmail.com>

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>
---
 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(-)
 rename tools/perf/{util => ui}/gtk/browser.c (100%)
 rename tools/perf/{util => ui}/gtk/gtk.h (100%)

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
-- 
1.7.9.2.358.g22243


  parent reply	other threads:[~2012-04-11 21:05 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-04-11 21:05 [GIT PULL 00/13] perf/core fixes and improvements Arnaldo Carvalho de Melo
2012-04-11 21:05 ` [PATCH 01/13] perf tools: Ignore auto-generated bison/flex files Arnaldo Carvalho de Melo
2012-04-11 21:05 ` [PATCH 02/13] tools: Add Makefile.include Arnaldo Carvalho de Melo
2012-04-11 21:05 ` [PATCH 03/13] tools: Cleanup EXTRA_WARNINGS Arnaldo Carvalho de Melo
2012-04-11 21:05 ` [PATCH 04/13] tools: Add a toplevel Makefile Arnaldo Carvalho de Melo
2012-04-11 21:05 ` [PATCH 05/13] tools: Add a help target Arnaldo Carvalho de Melo
2012-04-11 21:05 ` [PATCH 06/13] tools: Connect to the kernel build system Arnaldo Carvalho de Melo
2012-04-11 21:05 ` [PATCH 07/13] perf tools: Fix parsers' rules to dependencies Arnaldo Carvalho de Melo
2012-04-11 21:05 ` [PATCH 08/13] perf annotate: Fix a build error Arnaldo Carvalho de Melo
2012-04-11 21:05 ` [PATCH 09/13] perf tools: Move UI bits to tools/perf/ui directory Arnaldo Carvalho de Melo
2012-04-11 21:05 ` Arnaldo Carvalho de Melo [this message]
2012-04-11 21:05 ` [PATCH 11/13] perf stat: Declare some references static Arnaldo Carvalho de Melo
2012-04-11 21:05 ` [PATCH 12/13] perf tools: Fix thread map that is type pid_t Arnaldo Carvalho de Melo
2012-04-11 21:05 ` [PATCH 13/13] perf record: Use sw counter only if hw pmu is not detected Arnaldo Carvalho de Melo
2012-04-13  7:58 ` [GIT PULL 00/13] perf/core fixes and improvements Ingo Molnar

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=1334178325-19148-11-git-send-email-acme@infradead.org \
    --to=acme@infradead.org \
    --cc="Zijlstra <a.p.zijlstra"@chello.nl \
    --cc=Peter@infradead.org \
    --cc=acme@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=mingo@kernel.org \
    --cc=namhyung.kim@lge.com \
    --cc=namhyung@gmail.com \
    --cc=paulus@samba.org \
    --cc=penberg@kernel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.