X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fcli%2FMakefile.am;h=ce4f246cac95439c7751346c0bc51fb396a238b7;hb=86ef6105d1bdacc0d5e55661df85dfa759c03cba;hp=ece7146bfb9a82cc144f6ae7619a50dcdf31c4f1;hpb=743138a3cca9770e8fae3f1399df20d087b378f2;p=babeltrace.git

diff --git a/src/cli/Makefile.am b/src/cli/Makefile.am
index ece7146b..ce4f246c 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 =
 
@@ -17,8 +19,8 @@ if ENABLE_PYTHON_PLUGINS
 AM_CPPFLAGS += '-DCONFIG_IN_TREE_PROVIDER_DIR="$(abs_top_builddir)/src/python-plugin-provider/.libs"'
 endif
 
-bin_PROGRAMS = babeltrace2.bin babeltrace2-log.bin
-noinst_PROGRAMS = babeltrace2 babeltrace2-log
+bin_PROGRAMS = babeltrace2.bin
+noinst_PROGRAMS = babeltrace2
 
 babeltrace2_bin_SOURCES = \
 	babeltrace2.c \
@@ -30,17 +32,21 @@ babeltrace2_bin_SOURCES = \
 	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 \
-	logging.c \
+	babeltrace2-query.c \
+	babeltrace2-query.h \
+	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),
@@ -50,12 +56,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/libargpar.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 \
-	$(POPT_LIBS)
+	$(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.
@@ -79,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
 
@@ -94,17 +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-log rules and config below
-babeltrace2_log_bin_SOURCES = babeltrace2-log.c
-babeltrace2_log_bin_LDADD = \
-	$(top_builddir)/src/compat/libcompat.la \
-	$(top_builddir)/src/common/libbabeltrace2-common.la \
-	$(top_builddir)/src/logging/libbabeltrace2-logging.la \
-	$(POPT_LIBS)
-babeltrace2_log_bin_CFLAGS = $(AM_CFLAGS) '-DBT_CLI_PATH="$(abs_top_builddir)/src/cli/babeltrace2$(EXEEXT)"'
-
-# Only used for in-tree execution and tests
-babeltrace2_log_SOURCES = $(babeltrace2_log_bin_SOURCES)
-babeltrace2_log_LDADD = $(babeltrace2_log_bin_LDADD)
-babeltrace2_log_CFLAGS = $(AM_CFLAGS) '-DBT_CLI_PATH="$(bindir)/babeltrace2$(EXEEXT)"'
+EXTRA_babeltrace2_DEPENDENCIES = $(EXTRA_babeltrace2_bin_DEPENDENCIES)