X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Flttng-utils%2FMakefile.am;h=f8262926617ae3f380b85a23789fffb824b38ffb;hb=77ca30962b076496a40eaf7d7bcc8269f838fdf5;hp=91bba11fb8304fa302d2df3587476ba00d035d4c;hpb=b415668e8f1a23a04e09ce7cd842cdff34becbc8;p=babeltrace.git

diff --git a/plugins/lttng-utils/Makefile.am b/plugins/lttng-utils/Makefile.am
index 91bba11f..f8262926 100644
--- a/plugins/lttng-utils/Makefile.am
+++ b/plugins/lttng-utils/Makefile.am
@@ -1,36 +1,40 @@
-AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/plugins \
+AM_CPPFLAGS += -I$(top_srcdir)/plugins \
 	    -I$(top_srcdir)/plugins/libctfcopytrace
 
-SUBDIRS = .
+noinst_LTLIBRARIES = libdebug-info.la
+libdebug_info_la_SOURCES = \
+	bin-info.c \
+	bin-info.h \
+	crc32.c \
+	crc32.h \
+	debug-info.c \
+	debug-info.h \
+	dwarf.c \
+	dwarf.h \
+	logging.c \
+	logging.h
 
 plugindir = "$(PLUGINSDIR)"
-plugin_LTLIBRARIES = libbabeltrace-plugin-lttng-utils.la
+plugin_LTLIBRARIES = babeltrace-plugin-lttng-utils.la
 
-libbabeltrace_plugin_lttng_utils_la_SOURCES = \
+babeltrace_plugin_lttng_utils_la_SOURCES = \
 	plugin.c \
-	debug-info.h \
-	debug-info.c \
-	bin-info.c \
-	dwarf.c \
-	crc32.c \
 	utils.c \
 	copy.c \
-	crc32.h \
-	debug-info.h \
-	dwarf.h \
-	bin-info.h \
 	utils.h \
 	copy.h \
-	logging.c \
 	logging.h
 
-libbabeltrace_plugin_lttng_utils_la_LDFLAGS = \
+babeltrace_plugin_lttng_utils_la_LIBADD = \
+	libdebug-info.la
+
+babeltrace_plugin_lttng_utils_la_LDFLAGS = \
 	$(LT_NO_UNDEFINED) \
-	-version-info $(BABELTRACE_LIBRARY_VERSION) \
-	-lelf -ldw
+	-avoid-version -module \
+	$(ELFUTILS_LIBS)
 
-if !BUILT_IN_PLUGINS
-libbabeltrace_plugin_lttng_utils_la_LIBADD = \
+if !ENABLE_BUILT_IN_PLUGINS
+babeltrace_plugin_lttng_utils_la_LIBADD += \
 	$(top_builddir)/lib/libbabeltrace.la \
 	$(top_builddir)/common/libbabeltrace-common.la \
 	$(top_builddir)/logging/libbabeltrace-logging.la \