X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=converter%2FMakefile.am;h=262214f7cc8999548395e59dcefc31c9028e04c1;hb=83968c1a34a9462c83da2ec5d73de8415ac49d7b;hp=1a6c0daff58c6f5794ce85973c9a835ffe4433ed;hpb=f3e4505ba1b7bacce5fc1cc942f4cfaa905b4e74;p=babeltrace.git

diff --git a/converter/Makefile.am b/converter/Makefile.am
index 1a6c0daf..262214f7 100644
--- a/converter/Makefile.am
+++ b/converter/Makefile.am
@@ -4,12 +4,14 @@ AM_LDFLAGS = -lpopt
 bin_PROGRAMS = babeltrace babeltrace-log
 
 babeltrace_SOURCES = \
-	babeltrace.c
+	babeltrace.c \
+	babeltrace-cfg.c \
+	babeltrace-cfg.h
 
 # -Wl,--no-as-needed is needed for recent gold linker who seems to think
 # it knows better and considers libraries with constructors having
 # side-effects as dead code.
-babeltrace_LDFLAGS = $(LD_NO_AS_NEEDED)
+babeltrace_LDFLAGS = -Wl, $(LD_NO_AS_NEEDED), -export-dynamic
 babeltrace_LDADD = \
 	$(top_builddir)/lib/libbabeltrace.la \
 	$(top_builddir)/formats/ctf/libbabeltrace-ctf.la \
@@ -17,13 +19,16 @@ babeltrace_LDADD = \
 	$(top_builddir)/formats/ctf-text/libbabeltrace-ctf-text.la \
 	$(top_builddir)/formats/ctf-metadata/libbabeltrace-ctf-metadata.la \
 	$(top_builddir)/formats/bt-dummy/libbabeltrace-dummy.la \
-	$(top_builddir)/formats/lttng-live/libbabeltrace-lttng-live.la \
-	$(top_builddir)/plugins/libbabeltrace-plugin.la
+	$(top_builddir)/formats/lttng-live/libbabeltrace-lttng-live.la
 
 if ENABLE_DEBUG_INFO
 babeltrace_LDADD += $(top_builddir)/lib/libdebug-info.la
 endif
 
+if BUILT_IN_PLUGINS
+babeltrace_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
+endif
+
 babeltrace_log_SOURCES = babeltrace-log.c
 
 babeltrace_log_LDADD = \