Fix: Don't override user variables within the build system

[babeltrace.git] / plugins / lttng-utils / Makefile.am

diff --git a/plugins/lttng-utils/Makefile.am b/plugins/lttng-utils/Makefile.am
index 8f0975d61fb26513eca15576c72464e217167e96..c1cac4fbc46d72faaf43c6ab99b15314944ef640 100644 (file)
--- a/plugins/lttng-utils/Makefile.am
+++ b/plugins/lttng-utils/Makefile.am
@@ -1,30 +1,38 @@
-AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/plugins \
+AM_CPPFLAGS += -I$(top_srcdir)/plugins \
            -I$(top_srcdir)/plugins/libctfcopytrace
 
 SUBDIRS = .
 
 plugindir = "$(PLUGINSDIR)"
-plugin_LTLIBRARIES = libbabeltrace-plugin-lttng-utils.la
+plugin_LTLIBRARIES = babeltrace-plugin-lttng-utils.la
 
-noinst_HEADERS = \
+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
-
-libbabeltrace_plugin_lttng_utils_la_SOURCES = \
-       plugin.c debug-info.h debug-info.c bin-info.c dwarf.c crc32.c utils.c \
-       copy.c
+       copy.h \
+       logging.c \
+       logging.h
 
-libbabeltrace_plugin_lttng_utils_la_LDFLAGS = \
+babeltrace_plugin_lttng_utils_la_LDFLAGS = \
        $(LT_NO_UNDEFINED) \
-       -version-info $(BABELTRACE_LIBRARY_VERSION) \
+       -avoid-version -module \
        -lelf -ldw
 
 if !BUILT_IN_PLUGINS
-libbabeltrace_plugin_lttng_utils_la_LIBADD = \
+babeltrace_plugin_lttng_utils_la_LIBADD = \
        $(top_builddir)/lib/libbabeltrace.la \
+       $(top_builddir)/common/libbabeltrace-common.la \
+       $(top_builddir)/logging/libbabeltrace-logging.la \
        $(top_builddir)/plugins/libctfcopytrace/libctfcopytrace.la
 endif