X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=converter%2FMakefile.am;h=2b16f1e4baa93e3958ff6a9dd96a050dc5d7a306;hp=e7bcc690a6ef767e0e7be167d456fd75283219f2;hb=613f532b047a23c6916e2c08707b09296edbfcb2;hpb=1e3d1ceedd6d5deac1a652b9e8e2d4e0726c3163

diff --git a/converter/Makefile.am b/converter/Makefile.am
index e7bcc690..2b16f1e4 100644
--- a/converter/Makefile.am
+++ b/converter/Makefile.am
@@ -2,22 +2,22 @@ AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include -lpopt
 
 bin_PROGRAMS = babeltrace babeltrace-log
 
-lib_LTLIBRARIES = libbabeltrace.la
-
-libbabeltrace_la_SOURCES = \
-	babeltrace-lib.c
-
-libbabeltrace_la_LIBADD = \
-	$(top_builddir)/types/libbabeltrace_types.la \
-	$(top_builddir)/formats/ctf/libctf.la \
-	$(top_builddir)/formats/ctf-text/libctf-text.la
-
 babeltrace_SOURCES = \
 	babeltrace.c
 
+# -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. Note: we put plugin dependencies on the
+# executable rather than the library because libtool does not seem to
+# issue the LDFLAGS before the rpaths, which makes it useless.
+babeltrace_LDFLAGS = -Wl,--no-as-needed
 babeltrace_LDADD = \
-	libbabeltrace.la \
-	$(top_builddir)/formats/libbabeltrace_registry.la
+	$(top_builddir)/lib/libbabeltrace.la \
+	$(top_builddir)/formats/libbabeltrace_registry.la \
+	$(top_builddir)/formats/ctf/libctf.la \
+	$(top_builddir)/formats/ctf/metadata/libctf-ast.la \
+	$(top_builddir)/formats/ctf-text/libctf-text.la \
+	$(top_builddir)/formats/bt-dummy/libbt-dummy.la
 
 babeltrace_log_SOURCES = babeltrace-log.c