X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=converter%2FMakefile.am;h=47693f5af6fd6c016c7379b36a66cd0e164c4816;hp=578280a681e4427f8d0fd9e47b348aa0e69bef2e;hb=bb35f032b52330cfb17c144bfed81f2b1569f308;hpb=6f3077a2db5bfeb47ed75b1c7c731a5e8e60aa43

diff --git a/converter/Makefile.am b/converter/Makefile.am
index 578280a6..47693f5a 100644
--- a/converter/Makefile.am
+++ b/converter/Makefile.am
@@ -1,4 +1,5 @@
-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
 
@@ -7,19 +8,36 @@ 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.
-babeltrace_LDFLAGS = -Wl,--no-as-needed
+# side-effects as dead code.
+babeltrace_LDFLAGS = $(LD_NO_AS_NEEDED)
 babeltrace_LDADD = \
 	$(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/bt-dummy/libbt-dummy.la
+	$(top_builddir)/formats/ctf/libbabeltrace-ctf.la \
+	$(top_builddir)/compat/libcompat.la \
+	$(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
+
+if ENABLE_DEBUG_INFO
+babeltrace_LDADD += $(top_builddir)/lib/libdebug-info.la
+endif
 
 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 \
+	$(top_builddir)/compat/libcompat.la
+
+if BABELTRACE_BUILD_WITH_LIBUUID
+babeltrace_log_LDADD += -luuid
+endif
+if BABELTRACE_BUILD_WITH_LIBC_UUID
+babeltrace_log_LDADD += -lc
+endif
+
+if BABELTRACE_BUILD_WITH_MINGW
+babeltrace_log_LDADD += -lrpcrt4 -lintl -liconv -lole32 -lpopt -lpthread
+babeltrace_LDADD += -lrpcrt4 -lintl -liconv -lole32 -lpopt -lpthread
+endif