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

diff --git a/converter/Makefile.am b/converter/Makefile.am
index 389a9d98..374d1d47 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
 
@@ -12,11 +13,27 @@ babeltrace_LDFLAGS = -Wl,--no-as-needed
 babeltrace_LDADD = \
 	$(top_builddir)/lib/libbabeltrace.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/bt-dummy/libbabeltrace-dummy.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
 
 babeltrace_log_SOURCES = babeltrace-log.c
 
 babeltrace_log_LDADD = \
 	$(top_builddir)/lib/libbabeltrace.la \
-	$(top_builddir)/formats/ctf/libbabeltrace-ctf.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