X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=converter%2FMakefile.am;h=482aec348a922fadf4002a63ce44f31fffb294e0;hp=794740d65f0099058223066678d2e7eb9d97aba6;hb=45b2e4ed4f35a6afe5cdba8043a620c847bcda38;hpb=0d0f514904a3ebb85775abceed30da0675f55cc6

diff --git a/converter/Makefile.am b/converter/Makefile.am
index 794740d6..482aec34 100644
--- a/converter/Makefile.am
+++ b/converter/Makefile.am
@@ -1,27 +1,30 @@
-AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include -lpopt
+AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include
+AM_LDFLAGS = -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 \
-	$(top_builddir)/lib/libprio_heap.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.
+babeltrace_LDFLAGS = -Wl,--no-as-needed
 babeltrace_LDADD = \
-	libbabeltrace.la \
-	$(top_builddir)/formats/libbabeltrace_registry.la
+	$(top_builddir)/lib/libbabeltrace.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)/formats/libbabeltrace_registry.la \
-	$(top_builddir)/formats/ctf/libctf.la
+	$(top_builddir)/lib/libbabeltrace.la \
+	$(top_builddir)/formats/ctf/libbabeltrace-ctf.la
+
+if BABELTRACE_BUILD_WITH_LIBUUID
+babeltrace_log_LDADD += -luuid
+endif
+if BABELTRACE_BUILD_WITH_LIBC_UUID
+babeltrace_log_LDADD += -lc
+endif