Fix: Windows DLL path lookup with Python >= 3.8

[babeltrace.git] / src / cli / Makefile.am

diff --git a/src/cli/Makefile.am b/src/cli/Makefile.am
index bfe868a18d23b3d953f428cae9fc3376e578bd5c..29a6478e8a5c7f4ee0bca258129cae0ca8e55d76 100644 (file)
--- a/src/cli/Makefile.am
+++ b/src/cli/Makefile.am
@@ -38,13 +38,15 @@ babeltrace2_bin_SOURCES = \
        babeltrace2-plugins.h \
        babeltrace2-query.c \
        babeltrace2-query.h \
-       logging.c \
+       logging.cpp \
        logging.h
 
 # -Wl,--no-as-needed is needed for recent gold linker who seems to think
 # it knows better and considers libraries with constructors having
 # side-effects as dead code.
-babeltrace2_bin_LDFLAGS = $(LD_NO_AS_NEEDED)
+babeltrace2_bin_LDFLAGS = $(AM_LDFLAGS) $(LD_NO_AS_NEEDED)
+
+EXTRA_babeltrace2_bin_DEPENDENCIES =
 
 # Add all the convenience libraries used by Babeltrace plugins and the
 # library. They will be used when embedding plugins (--enable-built-in-plugins),
@@ -86,9 +88,17 @@ babeltrace2_bin_LDFLAGS += $(call pluginarchive,ctf)
 babeltrace2_bin_LDFLAGS += $(call pluginarchive,text)
 babeltrace2_bin_LDFLAGS += $(call pluginarchive,utils)
 
+EXTRA_babeltrace2_bin_DEPENDENCIES += \
+       $(PLUGINS_PATH)/ctf/babeltrace-plugin-ctf.la \
+       $(PLUGINS_PATH)/text/babeltrace-plugin-text.la \
+       $(PLUGINS_PATH)/utils/babeltrace-plugin-utils.la
+
 if ENABLE_DEBUG_INFO
 babeltrace2_bin_LDFLAGS += $(call pluginarchive,lttng-utils)
 babeltrace2_bin_LDADD += $(ELFUTILS_LIBS)
+
+EXTRA_babeltrace2_bin_DEPENDENCIES += \
+       $(PLUGINS_PATH)/lttng-utils/babeltrace-plugin-lttng-utils.la
 endif
 endif
 
@@ -101,3 +111,4 @@ babeltrace2_SOURCES = $(babeltrace2_bin_SOURCES)
 babeltrace2_LDFLAGS = $(babeltrace2_bin_LDFLAGS)
 babeltrace2_LDADD = $(babeltrace2_bin_LDADD)
 babeltrace2_CFLAGS = $(AM_CFLAGS) -DBT_SET_DEFAULT_IN_TREE_CONFIGURATION
+EXTRA_babeltrace2_DEPENDENCIES = $(EXTRA_babeltrace2_bin_DEPENDENCIES)