[lttng-dev] [PATCH babeltrace stable-1.5] Fix: Add missing LIBS to python bindings

[Michael Jeanson]

Also move includes to CPPFLAGS.

Signed-off-by: Michael Jeanson <mjeanson at efficios.com>
---
 .gitignore                  | 1 +
 bindings/python/Makefile.am | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9259b6f..e3db41f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,5 +54,6 @@ bindings/python/babeltrace/__init__.py
 bindings/python/babeltrace/babeltrace.i
 bindings/python/babeltrace/babeltrace.py
 bindings/python/babeltrace/babeltrace_wrap.c
+bindings/python/build-python-bindings.stamp
 babeltrace.pc
 babeltrace-ctf.pc
diff --git a/bindings/python/Makefile.am b/bindings/python/Makefile.am
index 9e44127..f6806a8 100644
--- a/bindings/python/Makefile.am
+++ b/bindings/python/Makefile.am
@@ -23,9 +23,10 @@ BINDINGS_DEPS=setup.py \
 		babeltrace/python-complements.h
 
 BUILD_FLAGS=CC="$(CC)" \
-		CFLAGS="$(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(GLIB_CFLAGS) $(AM_CFLAGS)" \
-		CPPFLAGS="$(AM_CPPFLAGS) $(CPPFLAGS)" \
-		LDFLAGS="$(AM_LDFLAGS) $(LDFLAGS)"
+		CFLAGS="$(GLIB_CFLAGS) $(AM_CFLAGS) $(CFLAGS)" \
+		CPPFLAGS="$(DEFS) $(DEFAULT_INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS)" \
+		LDFLAGS="$(AM_LDFLAGS) $(LDFLAGS)" \
+		LIBS="$(GLIB_LIBS) $(LIBS)"
 
 build-python-bindings.stamp: $(BINDINGS_DEPS)
 	$(BUILD_FLAGS) $(PYTHON) $(builddir)/setup.py build_ext
-- 
2.7.4