Fix: missing error code on signed clock value in trimmer

[babeltrace.git] / cli / Makefile.am

diff --git a/cli/Makefile.am b/cli/Makefile.am
index c1fce34ec5f8aa484e2ba1ab5f6e6e4b2417f509..2e82301a979cfbd6fbb3f4a7608ec59a64fe92ee 100644 (file)
--- a/cli/Makefile.am
+++ b/cli/Makefile.am
@@ -1,6 +1,6 @@
 PLUGINS_PATH = $(abs_top_builddir)/plugins
 AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include \
-               -DCONFIG_IN_TREE_PLUGIN_PATH=\"$(PLUGINS_PATH)/ctf:$(PLUGINS_PATH)/text:$(PLUGINS_PATH)/muxer:$(PLUGINS_PATH)/writer:$(PLUGINS_PATH)/utils\"
+               -DCONFIG_IN_TREE_PLUGIN_PATH=\"$(PLUGINS_PATH)/ctf:$(PLUGINS_PATH)/lttng-utils:$(PLUGINS_PATH)/text:$(PLUGINS_PATH)/writer:$(PLUGINS_PATH)/utils\"
 AM_LDFLAGS = -lpopt
 
 bin_PROGRAMS = babeltrace.bin
@@ -11,10 +11,13 @@ babeltrace_bin_SOURCES = \
        babeltrace.c \
        babeltrace-cfg.c \
        babeltrace-cfg.h \
-       default-cfg.h \
-       default-cfg.c \
-       babeltrace-cfg-connect.h \
-       babeltrace-cfg-connect.c
+       babeltrace-cfg-cli-args.c \
+       babeltrace-cfg-cli-args.h \
+       babeltrace-cfg-cli-args-connect.c \
+       babeltrace-cfg-cli-args-connect.h \
+       babeltrace-cfg-cli-args-default.h \
+       babeltrace-cfg-cli-args-default.c \
+       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
@@ -23,11 +26,8 @@ babeltrace_bin_LDFLAGS = -Wl, $(LD_NO_AS_NEEDED), -export-dynamic
 babeltrace_bin_LDADD = \
        $(top_builddir)/lib/libbabeltrace.la \
        $(top_builddir)/compat/libcompat.la \
-       $(top_builddir)/common/libbabeltrace-common.la
-
-if ENABLE_DEBUG_INFO
-babeltrace_bin_LDADD += $(top_builddir)/lib/libdebug-info.la
-endif
+       $(top_builddir)/common/libbabeltrace-common.la \
+       $(top_builddir)/logging/libbabeltrace-logging.la
 
 if BUILT_IN_PLUGINS
 babeltrace_bin_LDFLAGS += -Wl,--whole-archive,$(top_builddir)/plugins/ctf/.libs/libbabeltrace-plugin-ctf.a,$(top_builddir)/plugins/text/.libs/libbabeltrace-plugin-ctf-text.a,$(top_builddir)/plugins/muxer/.libs/libbabeltrace-plugin-muxer.a,$(top_builddir)/plugins/writer/.libs/libbabeltrace-plugin-ctf-writer.a,--no-whole-archive
@@ -38,7 +38,7 @@ babeltrace_bin_LDADD += -lrpcrt4 -lintl -liconv -lole32 -lpopt -lpthread
 endif
 
 # Only used for in-tree execution and tests
-babeltrace_SOURCES =   $(babeltrace_bin_SOURCES)
-babeltrace_LDFLAGS =   $(babeltrace_bin_LDFLAGS)
+babeltrace_SOURCES = $(babeltrace_bin_SOURCES)
+babeltrace_LDFLAGS = $(babeltrace_bin_LDFLAGS)
 babeltrace_LDADD =     $(babeltrace_bin_LDADD)
 babeltrace_CFLAGS =    $(AM_CFLAGS) -DBT_SET_DEFAULT_IN_TREE_CONFIGURATION