Re-implement BT_ASSERT without using the assert macro

[babeltrace.git] / cli / Makefile.am

diff --git a/cli/Makefile.am b/cli/Makefile.am
index 195c878ad0b748a001a8a0e62a352370c49bc8dd..ed309d026b2edbae589c175fcbfbc902c8b3278e 100644 (file)
--- a/cli/Makefile.am
+++ b/cli/Makefile.am
@@ -45,7 +45,6 @@ babeltrace_bin_LDADD = \
        $(top_builddir)/compat/libcompat.la \
        $(top_builddir)/common/libbabeltrace-common.la \
        $(top_builddir)/logging/libbabeltrace-logging.la \
-       $(top_builddir)/plugins/libctfcopytrace/libctfcopytrace.la \
        $(POPT_LIBS)
 
 if ENABLE_BUILT_IN_PLUGINS
@@ -72,6 +71,7 @@ babeltrace_bin_LDFLAGS += $(call pluginarchive,utils)
 
 if ENABLE_DEBUG_INFO
 babeltrace_bin_LDFLAGS += $(call pluginarchive,lttng-utils)
+babeltrace_bin_LDADD += $(ELFUTILS_LIBS)
 endif
 endif
 
@@ -89,6 +89,8 @@ babeltrace_CFLAGS =   $(AM_CFLAGS) -DBT_SET_DEFAULT_IN_TREE_CONFIGURATION
 babeltrace_log_bin_SOURCES = babeltrace-log.c
 babeltrace_log_bin_LDADD = \
        $(top_builddir)/compat/libcompat.la \
+       $(top_builddir)/common/libbabeltrace-common.la \
+       $(top_builddir)/logging/libbabeltrace-logging.la \
        $(POPT_LIBS)
 babeltrace_log_bin_CFLAGS = $(AM_CFLAGS) '-DBT_CLI_PATH="$(abs_top_builddir)/cli/babeltrace$(EXEEXT)"'