X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=extras%2Fbindings%2Fswig%2Fpython%2FMakefile.am;h=15dea077dedce8cb3f99b3c57aa5dc4b7132459f;hb=4ae042345b4094e98611744d9ba6c92265058fdb;hp=bdecadcae2ef94967e95e44e068ce1ec0ec36f01;hpb=ab5be9fa2eb5ba9600a82cd18fd3cfcbac69169a;p=lttng-tools.git

diff --git a/extras/bindings/swig/python/Makefile.am b/extras/bindings/swig/python/Makefile.am
index bdecadcae..15dea077d 100644
--- a/extras/bindings/swig/python/Makefile.am
+++ b/extras/bindings/swig/python/Makefile.am
@@ -3,6 +3,13 @@
 lttng.i: lttng.i.in
 	$(SED) "s/LTTNG_VERSION_STR/LTTng $(PACKAGE_VERSION)/g" < $(srcdir)/lttng.i.in >lttng.i
 
+# 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.
+AM_CFLAGS += -Wno-shadow
+
 AM_CPPFLAGS += $(PYTHON_INCLUDE)
 
 EXTRA_DIST = lttng.i.in
@@ -14,8 +21,8 @@ MAINTAINERCLEANFILES = lttng_wrap.c lttng.py
 nodist__lttng_la_SOURCES = lttng_wrap.c
 _lttng_la_LDFLAGS = -module
 _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
+			$(top_builddir)/src/common/libsessiond-comm.la		\
+			$(top_builddir)/src/common/libcommon-gpl.la
 
 lttng_wrap.c: lttng.i
 	$(SWIG) -python -I. -I$(top_srcdir)/src/common/sessiond-comm lttng.i