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
# side-effects as dead code.
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),
# otherwise we're looking after multiple definitions of the same symbols if
# directly).
babeltrace2_bin_LDADD = \
$(top_builddir)/src/argpar/libargpar.la \
- $(top_builddir)/src/autodisc/libbabeltrace2-autodisc.la \
- $(top_builddir)/src/param-parse/libbabeltrace2-param-parse.la \
- $(top_builddir)/src/string-format/libbabeltrace2-string-format.la \
+ $(top_builddir)/src/autodisc/libautodisc.la \
+ $(top_builddir)/src/param-parse/libparam-parse.la \
+ $(top_builddir)/src/string-format/libstring-format.la \
$(top_builddir)/src/lib/libbabeltrace2.la \
$(top_builddir)/src/compat/libcompat.la \
- $(top_builddir)/src/common/libbabeltrace2-common.la \
- $(top_builddir)/src/logging/libbabeltrace2-logging.la \
- $(top_builddir)/src/ctfser/libbabeltrace2-ctfser.la
+ $(top_builddir)/src/common/libcommon.la \
+ $(top_builddir)/src/logging/liblogging.la \
+ $(top_builddir)/src/ctfser/libctfser.la
if ENABLE_BUILT_IN_PLUGINS
# Takes a plugin name and outputs the needed LDFLAGS to embed it.
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
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)