Move to kernel style SPDX license identifiers

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

diff --git a/src/cli/Makefile.am b/src/cli/Makefile.am
index 8c8717571aa9ef445cd94dac675bf4243fe71397..bfe868a18d23b3d953f428cae9fc3376e578bd5c 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 =
 
@@ -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,12 +32,12 @@ 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-cfg-src-auto-disc.c \
-       babeltrace2-cfg-src-auto-disc.h \
+       babeltrace2-log-level.c \
+       babeltrace2-log-level.h \
        babeltrace2-plugins.c \
        babeltrace2-plugins.h \
+       babeltrace2-query.c \
+       babeltrace2-query.h \
        logging.c \
        logging.h
 
@@ -52,12 +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/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 \
-       $(POPT_LIBS)
+       $(top_builddir)/src/ctfser/libbabeltrace2-ctfser.la
 
 if ENABLE_BUILT_IN_PLUGINS
 # Takes a plugin name and outputs the needed LDFLAGS to embed it.
@@ -96,17 +101,3 @@ 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)"'