X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=cli%2FMakefile.am;h=ed309d026b2edbae589c175fcbfbc902c8b3278e;hb=bf5464f870b0955639948b5e5691c7faf269a3a2;hp=3cd2a1168bf9c6aa760be97bb5d559672170d71a;hpb=de8bce8a6014b226e15a073f173f12d6eb2833d2;p=babeltrace.git

diff --git a/cli/Makefile.am b/cli/Makefile.am
index 3cd2a116..ed309d02 100644
--- 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
@@ -63,7 +62,7 @@ if ENABLE_BUILT_IN_PLUGINS
 # binary that are filled by plugin objects. If the linker discards those
 # symbols because the CLI does not use them directly, the CLI reports
 # no plugins found (plugins are effectively not embedded).
-pluginarchive = -Wl,--whole-archive,$(PLUGINS_PATH)/$(1)/.libs/babeltrace-plugin-$(1).a,--no-whole-archive
+pluginarchive = $(LD_WHOLE_ARCHIVE)$(PLUGINS_PATH)/$(1)/.libs/babeltrace-plugin-$(1).a$(LD_NO_WHOLE_ARCHIVE)
 
 # Built-in plugins
 babeltrace_bin_LDFLAGS += $(call pluginarchive,ctf)
@@ -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)"'