X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=src%2Fcli%2FMakefile.am;h=2428b489e62d6a9e320c05ec91ebd759ed5a2175;hp=e5567843fcba6266bf56e3f27795583f61788592;hb=0b0893d4a069f17d1326ebc3bfc9f9f987f411f3;hpb=5869b17917abc1d8db6b6c1696e00b5f2ec24eda

diff --git a/src/cli/Makefile.am b/src/cli/Makefile.am
index e5567843..2428b489 100644
--- a/src/cli/Makefile.am
+++ b/src/cli/Makefile.am
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: MIT
+
 PLUGINS_PATH = $(abs_top_builddir)/src/plugins
 LTTNG_UTILS_PLUGIN_PATH =
 
@@ -42,7 +44,7 @@ babeltrace2_bin_SOURCES = \
 # -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)
 
 # Add all the convenience libraries used by Babeltrace plugins and the
 # library. They will be used when embedding plugins (--enable-built-in-plugins),
@@ -52,14 +54,15 @@ babeltrace2_bin_LDFLAGS = $(LD_NO_AS_NEEDED)
 # not discard the plugins since the CLI does not use their symbols
 # directly).
 babeltrace2_bin_LDADD = \
-	$(top_builddir)/src/argpar/libbabeltrace2-argpar.la \
+	$(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/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/param-parse/libbabeltrace2-param-parse.la
+	$(top_builddir)/src/ctfser/libbabeltrace2-ctfser.la
 
 if ENABLE_BUILT_IN_PLUGINS
 # Takes a plugin name and outputs the needed LDFLAGS to embed it.