X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=plugins%2Ftext%2FMakefile.am;h=f7bfff8e900da02b176db1fe85d4207e97f2bf36;hp=105742b62542197f8ac4483cd4d4f479e9d6d801;hb=312c056ae3d374b253fa0cfe5ed576c0b0e5e569;hpb=3228cc1db0ba3ff2b9007de3872fe61b66502493

diff --git a/plugins/text/Makefile.am b/plugins/text/Makefile.am
index 105742b6..f7bfff8e 100644
--- a/plugins/text/Makefile.am
+++ b/plugins/text/Makefile.am
@@ -1,13 +1,23 @@
-AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/plugins
+AM_CPPFLAGS += -I$(top_srcdir)/plugins
 
-SUBDIRS = pretty .
+SUBDIRS = pretty dmesg
 
 plugindir = "$(PLUGINSDIR)"
-plugin_LTLIBRARIES = libbabeltrace-plugin-text.la
+plugin_LTLIBRARIES = babeltrace-plugin-text.la
 
-libbabeltrace_plugin_text_la_SOURCES = plugin.c
-libbabeltrace_plugin_text_la_LDFLAGS = \
-	-version-info $(BABELTRACE_LIBRARY_VERSION)
-libbabeltrace_plugin_text_la_LIBADD = \
+babeltrace_plugin_text_la_SOURCES = plugin.c
+babeltrace_plugin_text_la_LDFLAGS = \
+	$(LT_NO_UNDEFINED) \
+	-avoid-version -module
+
+babeltrace_plugin_text_la_LIBADD = \
+	pretty/libbabeltrace-plugin-text-pretty-cc.la \
+	dmesg/libbabeltrace-plugin-text-dmesg-cc.la
+
+if !ENABLE_BUILT_IN_PLUGINS
+babeltrace_plugin_text_la_LIBADD += \
 	$(top_builddir)/lib/libbabeltrace.la \
-	pretty/libbabeltrace-plugin-text-pretty-cc.la
+	$(top_builddir)/common/libbabeltrace-common.la \
+	$(top_builddir)/logging/libbabeltrace-logging.la \
+	$(top_builddir)/compat/libcompat.la
+endif