Fix: Use list rather than ptr array for trace streams

[babeltrace.git] / converter / Makefile.am

diff --git a/converter/Makefile.am b/converter/Makefile.am
index 389a9d98a84c8fe4e851334533266b443693f448..47693f5af6fd6c016c7379b36a66cd0e164c4816 100644 (file)
--- 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
 
@@ -8,15 +9,35 @@ 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.
-babeltrace_LDFLAGS = -Wl,--no-as-needed
+babeltrace_LDFLAGS = $(LD_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
+
+if ENABLE_DEBUG_INFO
+babeltrace_LDADD += $(top_builddir)/lib/libdebug-info.la
+endif
 
 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