Skip to contentSkip to conversation

Python-bindings fix: Out of tree build fails to find babeltrace.i

PATCH New Jérémie Galarneau 2 participants 2 messages Nov 28, 2013 – Nov 29, 2013 2 messages not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw

PATCH 1/1 Python-bindings fix: Out of tree build fails to find babeltrace.i

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

---
 bindings/python/Makefile.am | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)
bindings/python/Makefile.am +7 -4
index 2952454..0d96700 100644
@@ -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
Signature · 7 lines
1.8.4.2


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

A message that is not in the archive (sent off-list or not yet received): [email protected]

#3 lore raw

----- Original Message -----

Quoted 8 lines

From: "Jérémie Galarneau" <[email protected]>
To: [email protected]
Sent: Thursday, November 28, 2013 7:19:10 PM
Subject: [lttng-dev] [PATCH babeltrace python/bindings] Python-bindings fix: Out of tree build fails to find
babeltrace.i

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

merged into bindings/python. I finally merged bindings/python into master, good job !!!

Thanks,

Mathieu

Quoted 45 lines
---
 bindings/python/Makefile.am | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)
bindings/python/Makefile.am +0 -1
index 2952454..0d96700 100644
@@ -1,5 +1,7 @@
 babeltrace.i: babeltrace.i.in
-	sed "s/BABELTRACE_VERSION_STR/Babeltrace $(PACKAGE_VERSION)/g"

<babeltrace.i.in >babeltrace.i

bindings/python/Makefile.am +7 -4
+	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

Signature · 8 lines
Mathieu Desnoyers
EfficiOS Inc.
http://www.efficios.com

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