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 <[email protected]>
---
 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


_______________________________________________
lttng-dev mailing list
[email protected]
http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev

Reply via email to