projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix: add dependency between cli bin and plugins when built-in
[babeltrace.git]
/
src
/
cli
/
Makefile.am
diff --git
a/src/cli/Makefile.am
b/src/cli/Makefile.am
index 56e2a899e7cf1260a1ef22821432bded3fb0fddb..adbf2bb06b271911cf25e392a7e4650f1b57e6af 100644
(file)
--- 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 =
PLUGINS_PATH = $(abs_top_builddir)/src/plugins
LTTNG_UTILS_PLUGIN_PATH =
@@
-30,8
+32,8
@@
babeltrace2_bin_SOURCES = \
babeltrace2-cfg-cli-args-connect.h \
babeltrace2-cfg-cli-args-default.h \
babeltrace2-cfg-cli-args-default.c \
babeltrace2-cfg-cli-args-connect.h \
babeltrace2-cfg-cli-args-default.h \
babeltrace2-cfg-cli-args-default.c \
- babeltrace2-
cfg-cli-params-arg
.c \
- babeltrace2-
cfg-cli-params-arg
.h \
+ babeltrace2-
log-level
.c \
+ babeltrace2-
log-level
.h \
babeltrace2-plugins.c \
babeltrace2-plugins.h \
babeltrace2-query.c \
babeltrace2-plugins.c \
babeltrace2-plugins.h \
babeltrace2-query.c \
@@
-42,7
+44,9
@@
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.
# -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),
# Add all the convenience libraries used by Babeltrace plugins and the
# library. They will be used when embedding plugins (--enable-built-in-plugins),
@@
-52,8
+56,10
@@
babeltrace2_bin_LDFLAGS = $(LD_NO_AS_NEEDED)
# not discard the plugins since the CLI does not use their symbols
# directly).
babeltrace2_bin_LDADD = \
# not discard the plugins since the CLI does not use their symbols
# directly).
babeltrace2_bin_LDADD = \
- $(top_builddir)/src/argpar/lib
babeltrace2-
argpar.la \
+ $(top_builddir)/src/argpar/libargpar.la \
$(top_builddir)/src/autodisc/libbabeltrace2-autodisc.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/lib/libbabeltrace2.la \
$(top_builddir)/src/compat/libcompat.la \
$(top_builddir)/src/common/libbabeltrace2-common.la \
@@
-82,9
+88,17
@@
babeltrace2_bin_LDFLAGS += $(call pluginarchive,ctf)
babeltrace2_bin_LDFLAGS += $(call pluginarchive,text)
babeltrace2_bin_LDFLAGS += $(call pluginarchive,utils)
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)
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
endif
endif
@@
-97,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
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)
This page took
0.024357 seconds
and
4
git commands to generate.