configure: re-enable '-Wmissing-field-initializers'

[babeltrace.git] / src / bindings / python / bt2 / Makefile.am

diff --git a/src/bindings/python/bt2/Makefile.am b/src/bindings/python/bt2/Makefile.am
index 6b31a743391c52eae99f471cf9b3bb509c84fbb4..4be841442aa4134eea3979c21367e796ea09f5bd 100644 (file)
--- a/src/bindings/python/bt2/Makefile.am
+++ b/src/bindings/python/bt2/Makefile.am
@@ -94,11 +94,11 @@ STATIC_BINDINGS_DEPS =                                      \
 # Convenience static libraries on which the Python bindings library depends.
 # These are listed in the setup.py(.in) file.
 STATIC_LIBRARIES_DEPS = \
-       $(top_builddir)/src/autodisc/libbabeltrace2-autodisc.la \
-       $(top_builddir)/src/logging/libbabeltrace2-logging.la \
+       $(top_builddir)/src/autodisc/libautodisc.la \
+       $(top_builddir)/src/logging/liblogging.la \
        $(top_builddir)/src/common/libbabeltrace2-common.la \
-       $(top_builddir)/src/py-common/libbabeltrace2-py-common.la \
-       $(top_builddir)/src/string-format/libbabeltrace2-string-format.la
+       $(top_builddir)/src/py-common/libpy-common.la \
+       $(top_builddir)/src/string-format/libstring-format.la
 
 GENERATED_BINDINGS_DEPS =      \
        bt2/native_bt.c         \
@@ -122,6 +122,9 @@ WARN_CFLAGS += -Wno-deprecated-declarations
 # Python 3.11 + gcc 12.2.0 gave warnings of this kind in Python.h.
 WARN_CFLAGS += -Wno-redundant-decls
 
+# For SWIG generated code
+WARN_CFLAGS += -Wno-missing-field-initializers
+
 BUILD_FLAGS=CC="$(CC)" \
                CFLAGS="$(GLIB_CFLAGS) $(AM_CFLAGS) $(CFLAGS) $(WARN_CFLAGS)" \
                CPPFLAGS="$(AM_CPPFLAGS) $(CPPFLAGS) -I$(srcdir)/bt2" \
@@ -155,12 +158,21 @@ pyinstall_verbose = $(pyinstall_verbose_@AM_V@)
 pyinstall_verbose_ = $(pyinstall_verbose_@AM_DEFAULT_V@)
 pyinstall_verbose_0 = @
 
+# For Python < 3.12, force the use of distutils even if setuptools is
+# installed. For Python >= 3.12, set the externally managed option to allow
+# installation in a directory which isn't in the current PYTHONPATH.
+if HAVE_PYTHON_312_OR_GREATER
+PY_INSTALL_OPTS = --single-version-externally-managed
+else
+export SETUPTOOLS_USE_DISTUTILS=stdlib
+endif
+
 install-exec-local: build-python-bindings.stamp
        $(pyinstall_verbose)opts="--prefix=$(prefix) --exec-prefix=$(exec_prefix) --record $(INSTALLED_FILES) --verbose --no-compile $(DISTSETUPOPTS)"; \
        if [ "$(DESTDIR)" != "" ]; then \
                opts="$$opts --root=$(DESTDIR)"; \
        fi; \
-       $(PYTHON) $(builddir)/setup.py install $$opts;
+       $(PYTHON) $(builddir)/setup.py install $(PY_INSTALL_OPTS) $$opts;
 
 clean-local:
        rm -rf $(builddir)/build