Completely rework configure.ac

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

diff --git a/plugins/lttng-utils/Makefile.am b/plugins/lttng-utils/Makefile.am
index 91bba11fb8304fa302d2df3587476ba00d035d4c..0a01610fd00b905232ea72c438fd10919112000d 100644 (file)
--- a/plugins/lttng-utils/Makefile.am
+++ b/plugins/lttng-utils/Makefile.am
@@ -1,12 +1,12 @@
-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
 
-libbabeltrace_plugin_lttng_utils_la_SOURCES = \
+babeltrace_plugin_lttng_utils_la_SOURCES = \
        plugin.c \
        debug-info.h \
        debug-info.c \
@@ -24,13 +24,13 @@ libbabeltrace_plugin_lttng_utils_la_SOURCES = \
        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 = \
+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 \