X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=cli%2FMakefile.am;h=ef5a19aacac0ce2c6d69e6c9034aa7823a07356f;hb=2c212c058851bd675a5ff33ac0bff981458497be;hp=08d7252e434f6bfc28fbee6e30a9e66e3c2cb91c;hpb=05c031000c447ff01c8f23e1d0b5455a18b8dfc2;p=babeltrace.git

diff --git a/cli/Makefile.am b/cli/Makefile.am
index 08d7252e..ef5a19aa 100644
--- a/cli/Makefile.am
+++ b/cli/Makefile.am
@@ -12,7 +12,6 @@ IN_TREE_PLUGIN_PATH = $(PLUGINS_PATH)/ctf:$(PLUGINS_PATH)/text:$(PLUGINS_PATH)/u
 endif
 
 AM_CPPFLAGS += '-DCONFIG_IN_TREE_PLUGIN_PATH="$(IN_TREE_PLUGIN_PATH)"'
-AM_LDFLAGS = -lpopt
 
 bin_PROGRAMS = babeltrace.bin babeltrace-log.bin
 noinst_PROGRAMS = babeltrace babeltrace-log
@@ -35,7 +34,7 @@ babeltrace_bin_SOURCES = \
 babeltrace_bin_LDFLAGS = $(LD_NO_AS_NEEDED)
 
 # Add all the convenience libraries used by Babeltrace plugins and the
-# library. They will be used when embedding plugins (BUILT_IN_PLUGINS),
+# library. They will be used when embedding plugins (--enable-built-in-plugins),
 # otherwise we're looking after multiple definitions of the same symbols if
 # a plugin's archive (.a) includes the convenience library because
 # we're using --whole-archive below (needed to make sure the linker does
@@ -46,9 +45,10 @@ 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
+	$(top_builddir)/plugins/libctfcopytrace/libctfcopytrace.la \
+	$(POPT_LIBS)
 
-if BUILT_IN_PLUGINS
+if ENABLE_BUILT_IN_PLUGINS
 # Takes a plugin name and outputs the needed LDFLAGS to embed it.
 #
 # The --whole-archive option is important here. From the GNU linker's
@@ -63,7 +63,7 @@ if 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,11 +72,12 @@ babeltrace_bin_LDFLAGS += $(call pluginarchive,utils)
 
 if ENABLE_DEBUG_INFO
 babeltrace_bin_LDFLAGS += $(call pluginarchive,lttng-utils)
+babeltrace_bin_LDADD += $(ELFUTILS_LIBS)
 endif
 endif
 
 if BABELTRACE_BUILD_WITH_MINGW
-babeltrace_bin_LDADD += -lws2_32 -lrpcrt4 -lintl -liconv -lole32 -lpopt -lpthread
+babeltrace_bin_LDADD += -lws2_32 -lrpcrt4 -lintl -liconv -lole32 -lpthread
 endif
 
 # Only used for in-tree execution and tests
@@ -87,13 +88,12 @@ babeltrace_CFLAGS =	$(AM_CFLAGS) -DBT_SET_DEFAULT_IN_TREE_CONFIGURATION
 
 # babeltrace-log rules and config below
 babeltrace_log_bin_SOURCES = babeltrace-log.c
-babeltrace_log_bin_LDADD = $(top_builddir)/compat/libcompat.la
+babeltrace_log_bin_LDADD = \
+	$(top_builddir)/compat/libcompat.la \
+	$(POPT_LIBS)
 babeltrace_log_bin_CFLAGS = $(AM_CFLAGS) '-DBT_CLI_PATH="$(abs_top_builddir)/cli/babeltrace$(EXEEXT)"'
 
-if BABELTRACE_BUILD_WITH_MINGW
-babeltrace_log_bin_LDADD += -lpopt
-endif
-
+# Only used for in-tree execution and tests
 babeltrace_log_SOURCES = $(babeltrace_log_bin_SOURCES)
 babeltrace_log_LDADD = 	$(babeltrace_log_bin_LDADD)
 babeltrace_log_CFLAGS =	$(AM_CFLAGS) '-DBT_CLI_PATH="$(bindir)/babeltrace$(EXEEXT)"'