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

diff --git a/converter/Makefile.am b/converter/Makefile.am
index 389a9d98..de70313e 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
 
@@ -13,6 +14,7 @@ babeltrace_LDADD = \
 	$(top_builddir)/lib/libbabeltrace.la \
 	$(top_builddir)/formats/ctf/libbabeltrace-ctf.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
 
 babeltrace_log_SOURCES = babeltrace-log.c
@@ -20,3 +22,10 @@ babeltrace_log_SOURCES = babeltrace-log.c
 babeltrace_log_LDADD = \
 	$(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