From e2ad251c620221af6108ea4d15f0c26cf5b587c1 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Tue, 14 Apr 2015 16:45:27 -0400 Subject: [PATCH] Fix python bindings' Makefile for out-of-tree builds MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The references to the built archives should use top_builddir and not top_srcdir, because that's where they are. And new in V2, I got a new error: lttng_wrap.c:2970:25: fatal error: lttng/lttng.h: No such file or directory #include I think we are missing the -I$(top_srcdir)/include. I had not noticed this previously, probably because I had an lttng/lttng.h in /usr/local/include or /usr/include. Also, the other includes seem unnecessary. The This is not really related to out-of-tree builds though. Signed-off-by: Simon Marchi Signed-off-by: Jérémie Galarneau --- extras/bindings/swig/python/Makefile.am | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/extras/bindings/swig/python/Makefile.am b/extras/bindings/swig/python/Makefile.am index ec3593054..35f28d5bc 100644 --- a/extras/bindings/swig/python/Makefile.am +++ b/extras/bindings/swig/python/Makefile.am @@ -1,8 +1,7 @@ lttng.i: lttng.i.in - sed "s/LTTNG_VERSION_STR/LTTng $(PACKAGE_VERSION)/g" lttng.i + sed "s/LTTNG_VERSION_STR/LTTng $(PACKAGE_VERSION)/g" < $(srcdir)/lttng.i.in >lttng.i -AM_CFLAGS = $(PYTHON_INCLUDE) -I$(top_srcdir)/lib/lttng-ctl -I../common \ - $(BUDDY_CFLAGS) +AM_CFLAGS = $(PYTHON_INCLUDE) -I$(top_srcdir)/include EXTRA_DIST = lttng.i.in nodist_python_PYTHON = lttng.py @@ -12,9 +11,9 @@ MAINTAINERCLEANFILES = lttng_wrap.c lttng.py nodist__lttng_la_SOURCES = lttng_wrap.c _lttng_la_LDFLAGS = -module -_lttng_la_LIBADD = $(top_srcdir)/src/lib/lttng-ctl/liblttng-ctl.la \ - $(top_srcdir)/src/common/sessiond-comm/libsessiond-comm.la \ - $(top_srcdir)/src/common/libcommon.la +_lttng_la_LIBADD = $(top_builddir)/src/lib/lttng-ctl/liblttng-ctl.la \ + $(top_builddir)/src/common/sessiond-comm/libsessiond-comm.la \ + $(top_builddir)/src/common/libcommon.la lttng_wrap.c: lttng.i $(SWIG) -python -I. -I$(top_srcdir)/src/common/sessiond-comm lttng.i -- 2.34.1