X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbindings%2Fpython%2Fbt2%2FMakefile.am;h=d89907ce7d323376ecbe54d600be999a875400b6;hb=afdd1f8201f579d81959ce85759dcc62fcc0a85d;hp=fe401978016b80e37d6bbbdba56616697fdfaa52;hpb=113353402ab17d0091d22fed07a7f6afad44886d;p=babeltrace.git

diff --git a/src/bindings/python/bt2/Makefile.am b/src/bindings/python/bt2/Makefile.am
index fe401978..d89907ce 100644
--- a/src/bindings/python/bt2/Makefile.am
+++ b/src/bindings/python/bt2/Makefile.am
@@ -17,6 +17,7 @@ SWIG_INTERFACE_FILES =					\
 	bt2/native_bt_component_class.i.h		\
 	bt2/native_bt_connection.i			\
 	bt2/native_bt_error.i				\
+	bt2/native_bt_error.i.h				\
 	bt2/native_bt_event.i				\
 	bt2/native_bt_event_class.i			\
 	bt2/native_bt_field.i				\
@@ -94,17 +95,27 @@ STATIC_LIBRARIES_DEPS = \
 	$(top_builddir)/src/autodisc/libbabeltrace2-autodisc.la \
 	$(top_builddir)/src/logging/libbabeltrace2-logging.la \
 	$(top_builddir)/src/common/libbabeltrace2-common.la \
-	$(top_builddir)/src/py-common/libbabeltrace2-py-common.la
+	$(top_builddir)/src/py-common/libbabeltrace2-py-common.la \
+	$(top_builddir)/src/string-format/libbabeltrace2-string-format.la
 
 GENERATED_BINDINGS_DEPS =	\
 	bt2/native_bt.c		\
 	bt2/version.py		\
 	setup.py
 
+# Some versions of SWIG (like 3.0.12) generate code where a parameter called
+# `swig_this` shadows a global of the same name.  Later versions (like 4.0.1)
+# have renamed this global to `Swig_This_global`.
+#
+# Disable -Wshadow for that file.
+WARN_CFLAGS = -Wno-shadow
+
+WARN_CFLAGS += -Wno-null-dereference
+
 BUILD_FLAGS=CC="$(CC)" \
-		CFLAGS="$(GLIB_CFLAGS) $(AM_CFLAGS) $(CFLAGS)" \
+		CFLAGS="$(GLIB_CFLAGS) $(AM_CFLAGS) $(CFLAGS) $(WARN_CFLAGS)" \
 		CPPFLAGS="$(AM_CPPFLAGS) $(CPPFLAGS) -I$(srcdir)/bt2" \
-		LDFLAGS="$(AM_LDFLAGS) $(LDFLAGS) $(GLIB_LIBS) $(LIBS)"
+		LDFLAGS="$(AM_LDFLAGS) $(LDFLAGS) $(GLIB_LIBS) $(PYTHON_LDFLAGS) $(LIBS)"
 
 all-local: build-python-bindings.stamp