From: Darren Hart <dvhltc@us.ibm.com>
To: rostedt@goodmis.org, linux-kernel@vger.kernel.org
Cc: dvhltc@us.ibm.com
Subject:
Date: Tue, 5 Jan 2010 09:02:31 -0800 [thread overview]
Message-ID: <1262710951-6614-1-git-send-email-dvhltc@us.ibm.com> (raw)
git://git.kernel.org/pub/scm/linux/kernel/git/dvhart/trace-cmd.git for-rostedt/trace-view
>From cacc655df9360e74a02561312da0bb78fdbae38c Mon Sep 17 00:00:00 2001
From: Darren Hart <dvhltc@us.ibm.com>
Date: Tue, 5 Jan 2010 08:53:12 -0800
Subject: [PATCH] trace-view: cleanup python make targets
Signed-off-by: Darren Hart <dvhltc@us.ibm.com>
---
Makefile | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/Makefile b/Makefile
index 3d17256..4826dd1 100644
--- a/Makefile
+++ b/Makefile
@@ -129,21 +129,24 @@ plugin_mac80211.so: plugin_mac80211.o
$(CC) -shared -nostartfiles -o $@ $<
-.PHONY: python
-python: $(TCMD_LIB_OBJS)
+PYTHON_INCLUDES = `python-config --includes`
+PYGTK_CFLAGS = `pkg-config --cflags pygtk-2.0`
+
+ctracecmd.so: $(TCMD_LIB_OBJS)
swig -Wall -python -noproxy ctracecmd.i
- #swig -Wall -python ctracecmd.i
- gcc -fpic -c `python-config --includes` ctracecmd_wrap.c
+ gcc -fpic -c $(PYTHON_INCLUDES) ctracecmd_wrap.c
$(CC) --shared $^ ctracecmd_wrap.o -o ctracecmd.so
- #$(CC) --shared $^ ctracecmd_wrap.o -o _ctracecmd.so
-.PHONY: python-gui
-python-gui: $(TRACE_VIEW_OBJS)
+ctracecmdgui.so: $(TRACE_VIEW_OBJS) $(LIB_FILE)
swig -Wall -python -noproxy ctracecmdgui.i
- # FIXME: where do we get the pygtk include from?
- gcc -fpic -c `python-config --includes` $(CFLAGS) $(INCLUDES) -I/usr/include/pygtk-2.0/ ctracecmdgui_wrap.c
+ gcc -fpic -c $(CFLAGS) $(INCLUDES) $(PYTHON_INCLUDES) $(PYGTK_CFLAGS) ctracecmdgui_wrap.c
$(CC) --shared $^ $(LIBS) $(CONFIG_LIBS) ctracecmdgui_wrap.o -o ctracecmdgui.so
+.PHONY: python
+python: ctracecmd.so
+
+.PHONY: python-gui
+python-gui: ctracecmd.so ctracecmdgui.so
.PHONY: force
force:
--
1.6.3.3
reply other threads:[~2010-01-05 17:03 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=1262710951-6614-1-git-send-email-dvhltc@us.ibm.com \
--to=dvhltc@us.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=rostedt@goodmis.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).