From 13ec125abb88a60fc5e11ff904b525e1f00a331b Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?= Date: Thu, 28 Nov 2013 13:19:10 -0500 Subject: [PATCH] Python-bindings fix: Out of tree build fails to find babeltrace.i MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Mathieu Desnoyers --- 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 29524541..0d967000 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 + 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 -- 2.34.1