build: factor out `pluginarchive` function to `src/Makefile.common.inc`

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

diff --git a/src/cli/Makefile.am b/src/cli/Makefile.am
index bfe868a18d23b3d953f428cae9fc3376e578bd5c..4525487809ef4f7fc8643708d8c52a5a1aef6c3e 100644 (file)
--- a/src/cli/Makefile.am
+++ b/src/cli/Makefile.am
@@ -1,6 +1,8 @@
+# SPDX-FileCopyrightText: 2019-2023 EfficiOS, Inc.
 # SPDX-License-Identifier: MIT
 
-PLUGINS_PATH = $(abs_top_builddir)/src/plugins
+include $(top_srcdir)/src/Makefile.common.inc
+
 LTTNG_UTILS_PLUGIN_PATH =
 
 if ENABLE_DEBUG_INFO
@@ -38,13 +40,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),
@@ -55,40 +59,34 @@ babeltrace2_bin_LDFLAGS = $(LD_NO_AS_NEEDED)
 # 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/cpp-common/vendor/fmt/libfmt.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.
-#
-# The --whole-archive option is important here. From the GNU linker's
-# documentation:
-#
-#     For each archive mentioned on the command line after the
-#     --whole-archive option, include every object file in the archive in
-#     the link, rather than searching the archive for the required object
-#     files.
-#
-# In our case, we find the plugins thanks to special sections in the
-# binary that are filled by plugin objects. If the linker discards those
-# symbols because the CLI does not use them directly, the CLI reports
-# no plugins found (plugins are effectively not embedded).
-pluginarchive = $(LD_WHOLE_ARCHIVE)$(PLUGINS_PATH)/$(1)/.libs/babeltrace-plugin-$(1).a$(LD_NO_WHOLE_ARCHIVE)
 
 # Built-in plugins
 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 +99,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)