X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=converter%2FMakefile.am;h=47693f5af6fd6c016c7379b36a66cd0e164c4816;hp=374d1d47f11a5e3cfc8aa852dbd2baf98907b986;hb=bb35f032b52330cfb17c144bfed81f2b1569f308;hpb=4a74436710b248274ffe9e038da0bd41af8a3d8d

diff --git a/converter/Makefile.am b/converter/Makefile.am
index 374d1d47..47693f5a 100644
--- a/converter/Makefile.am
+++ b/converter/Makefile.am
@@ -9,7 +9,7 @@ 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 \
@@ -19,6 +19,10 @@ babeltrace_LDADD = \
 	$(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 = \