X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=converter%2FMakefile.am;h=578280a681e4427f8d0fd9e47b348aa0e69bef2e;hp=3aa7fc3d5a4efa24b11700929c88375056a2cbd4;hb=e8c92a62cb474a1bb64bcbfff47c17291751b959;hpb=0860ab483ea602b4ac8f60a7634b54c3923da1e6

diff --git a/converter/Makefile.am b/converter/Makefile.am
index 3aa7fc3d..578280a6 100644
--- a/converter/Makefile.am
+++ b/converter/Makefile.am
@@ -1,26 +1,25 @@
 AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include -lpopt
 
-bin_PROGRAMS = babeltrace
-
-#lib_LTLIBRARIES = libbabeltrace.la
-#
-#libbabeltrace_la_SOURCES = \
-#	babeltrace-lib.c
-#
-#libbabeltrace_la_LIBADD = \
-#	$(top_builddir)/types/libbabeltrace_types.la \
-#	$(top_builddir)/formats/libbabeltrace_registry.la \
-#	$(top_builddir)/formats/ctf/libctf.la \
-#	$(top_builddir)/formats/ctf-text/libctf-text.la
+bin_PROGRAMS = babeltrace babeltrace-log
 
 babeltrace_SOURCES = \
 	babeltrace.c
 
-#babeltrace_LDADD = \
-#	libbabeltrace.la
-
+# -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 = \
-	$(top_builddir)/types/libbabeltrace_types.la \
+	$(top_builddir)/lib/libbabeltrace.la \
 	$(top_builddir)/formats/libbabeltrace_registry.la \
 	$(top_builddir)/formats/ctf/libctf.la \
-	$(top_builddir)/formats/ctf-text/libctf-text.la
+	$(top_builddir)/formats/ctf-text/libctf-text.la \
+	$(top_builddir)/formats/bt-dummy/libbt-dummy.la
+
+babeltrace_log_SOURCES = babeltrace-log.c
+
+babeltrace_log_LDADD = \
+	$(top_builddir)/formats/libbabeltrace_registry.la \
+	$(top_builddir)/formats/ctf/libctf.la