Mirror of the lttng-dev mailing list
 help / color / mirror / Atom feed
From: jeremie.galarneau@efficios.com (Jérémie Galarneau)
Subject: [lttng-dev] [PATCH babeltrace python/bindings] Python-bindings fix: Out of tree build fails to find babeltrace.i
Date: Thu, 28 Nov 2013 13:19:10 -0500	[thread overview]
Message-ID: <1385662750-32501-1-git-send-email-jeremie.galarneau@efficios.com> (raw)
In-Reply-To: <414873996.74599.1385256701005.JavaMail.zimbra@efficios.com>

This fixes the out of tree builds by using the appropriate top_srcdir
and top_builddir variables in the bindings' Makefile.

Signed-off-by: J?r?mie Galarneau <jeremie.galarneau at efficios.com>
---
 bindings/python/Makefile.am | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/bindings/python/Makefile.am b/bindings/python/Makefile.am
index 2952454..0d96700 100644
--- a/bindings/python/Makefile.am
+++ b/bindings/python/Makefile.am
@@ -1,5 +1,7 @@
 babeltrace.i: babeltrace.i.in
-	sed "s/BABELTRACE_VERSION_STR/Babeltrace $(PACKAGE_VERSION)/g" <babeltrace.i.in >babeltrace.i
+	sed "s/BABELTRACE_VERSION_STR/Babeltrace $(PACKAGE_VERSION)/g" < \
+		$(top_srcdir)/bindings/python/babeltrace.i.in > \
+		$(top_builddir)/bindings/python/babeltrace.i
 
 AM_CFLAGS = $(PYTHON_INCLUDE) -I$(top_srcdir)/include/
 
@@ -17,11 +19,12 @@ _babeltrace_la_CFLAGS = $(GLIB_CFLAGS) $(AM_CFLAGS)
 
 _babeltrace_la_LIBS = $(GLIB_LIBS)
 
-_babeltrace_la_LIBADD = $(top_srcdir)/formats/ctf/libbabeltrace-ctf.la	\
-			$(top_srcdir)/formats/ctf-text/libbabeltrace-ctf-text.la
+_babeltrace_la_LIBADD = $(top_builddir)/formats/ctf/libbabeltrace-ctf.la \
+	$(top_builddir)/formats/ctf-text/libbabeltrace-ctf-text.la
 
 # SWIG 'warning md variable unused' fixed after SWIG build:
 babeltrace_wrap.c: babeltrace.i
-	$(SWIG) -python -Wall -I. -I$(top_srcdir)/include babeltrace.i
+	$(SWIG) -python -Wall -I. -I$(top_srcdir)/include \
+		$(top_builddir)/bindings/python/babeltrace.i
 
 CLEANFILES = babeltrace.i babeltrace.py babeltrace_wrap.c
-- 
1.8.4.2




  reply	other threads:[~2013-11-28 18:19 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-11-22 23:00 [lttng-dev] [PULL REQUEST babeltrace] Python bindings API refactoring Jérémie Galarneau
2013-11-23  3:29 ` Simon Marchi
2013-11-23  4:09   ` Simon Marchi
2013-11-23  6:15     ` Jérémie Galarneau
2013-11-23 15:26       ` Mathieu Desnoyers
2013-11-23 21:30         ` [lttng-dev] [PATCH babeltrace python/bindings] Python-bindings fix: outdated dist target babeltrace.i Jérémie Galarneau
2013-11-24  1:31           ` Mathieu Desnoyers
2013-11-28 18:19             ` Jérémie Galarneau [this message]
2013-11-29  6:21               ` [lttng-dev] [PATCH babeltrace python/bindings] Python-bindings fix: Out of tree build fails to find babeltrace.i Mathieu Desnoyers

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=1385662750-32501-1-git-send-email-jeremie.galarneau@efficios.com \
    --to=jeremie.galarneau@efficios.com \
    /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