X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=converter%2FMakefile.am;h=389a9d98a84c8fe4e851334533266b443693f448;hp=9443c2148848d681d1817ba462f11ac1c9b2f44a;hb=30827463276bab779a0965e8adf271c451c2a28a;hpb=c34ea0fad3f9900c3b97efa229d221927422dacf

diff --git a/converter/Makefile.am b/converter/Makefile.am
index 9443c214..389a9d98 100644
--- a/converter/Makefile.am
+++ b/converter/Makefile.am
@@ -7,19 +7,16 @@ babeltrace_SOURCES = \
 
 # -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.
+# side-effects as dead code.
 babeltrace_LDFLAGS = -Wl,--no-as-needed
 babeltrace_LDADD = \
 	$(top_builddir)/lib/libbabeltrace.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
+	$(top_builddir)/formats/ctf/libbabeltrace-ctf.la \
+	$(top_builddir)/formats/ctf-text/libbabeltrace-ctf-text.la \
+	$(top_builddir)/formats/bt-dummy/libbabeltrace-dummy.la
 
 babeltrace_log_SOURCES = babeltrace-log.c
 
 babeltrace_log_LDADD = \
 	$(top_builddir)/lib/libbabeltrace.la \
-	$(top_builddir)/formats/ctf/libctf.la
+	$(top_builddir)/formats/ctf/libbabeltrace-ctf.la