X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fplugins%2Flttng-utils%2FMakefile.am;h=db83d831905ccfe307ce473937906044983baffd;hb=86ef6105d1bdacc0d5e55661df85dfa759c03cba;hp=19cecac310319bdd689765181b82a470a00157de;hpb=0235b0db7de5bcacdb3650c92461f2ce5eb2143d;p=babeltrace.git

diff --git a/src/plugins/lttng-utils/Makefile.am b/src/plugins/lttng-utils/Makefile.am
index 19cecac3..db83d831 100644
--- a/src/plugins/lttng-utils/Makefile.am
+++ b/src/plugins/lttng-utils/Makefile.am
@@ -1,15 +1,5 @@
 # SPDX-License-Identifier: MIT
 
-SUBDIRS =
-
-babeltrace_plugin_lttng_utils_la_LIBADD =
-
-if ENABLE_DEBUG_INFO
-SUBDIRS += debug-info
-babeltrace_plugin_lttng_utils_la_LIBADD += \
-	debug-info/libdebug-info.la
-endif
-
 plugindir = "$(BABELTRACE_PLUGINS_DIR)"
 plugin_LTLIBRARIES = babeltrace-plugin-lttng-utils.la
 
@@ -17,14 +7,47 @@ babeltrace_plugin_lttng_utils_la_SOURCES = \
 	plugin.c
 
 babeltrace_plugin_lttng_utils_la_LDFLAGS = \
+	$(AM_LDFLAGS) \
 	$(LT_NO_UNDEFINED) \
-	-avoid-version -module \
+	-avoid-version -module $(LD_NOTEXT) \
 	$(ELFUTILS_LIBS)
 
+babeltrace_plugin_lttng_utils_la_LIBADD =
+
+if ENABLE_DEBUG_INFO
+noinst_LTLIBRARIES = debug-info/libdebug-info.la
+
+debug_info_libdebug_info_la_SOURCES = \
+	debug-info/bin-info.c \
+	debug-info/bin-info.h \
+	debug-info/crc32.c \
+	debug-info/crc32.h \
+	debug-info/debug-info.c \
+	debug-info/debug-info.h \
+	debug-info/dwarf.c \
+	debug-info/dwarf.h \
+	debug-info/trace-ir-data-copy.c \
+	debug-info/trace-ir-data-copy.h \
+	debug-info/trace-ir-mapping.c \
+	debug-info/trace-ir-mapping.h \
+	debug-info/trace-ir-metadata-copy.c \
+	debug-info/trace-ir-metadata-copy.h \
+	debug-info/trace-ir-metadata-field-class-copy.c \
+	debug-info/trace-ir-metadata-field-class-copy.h \
+	debug-info/utils.c \
+	debug-info/utils.h
+
+debug_info_libdebug_info_la_LIBADD = \
+	$(top_builddir)/src/fd-cache/libfd-cache.la
+
+babeltrace_plugin_lttng_utils_la_LIBADD += \
+	debug-info/libdebug-info.la
+endif
+
 if !ENABLE_BUILT_IN_PLUGINS
 babeltrace_plugin_lttng_utils_la_LIBADD += \
 	$(top_builddir)/src/lib/libbabeltrace2.la \
 	$(top_builddir)/src/common/libbabeltrace2-common.la \
-	$(top_builddir)/src/logging/libbabeltrace2-logging.la \
+	$(top_builddir)/src/logging/liblogging.la \
 	$(top_builddir)/src/plugins/common/param-validation/libbabeltrace2-param-validation.la
 endif