X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Fctf%2FMakefile.am;h=f53a6ab34060b9fb59c888cc576e6eaf184262f3;hb=dc3fffef7b84cc4af1a7c99828fd57a106cd2257;hp=27227083838b8db8802cbf3cce530edacc78869d;hpb=3b37d46561d6c6edba3b729f48a0f72699dcdc20;p=babeltrace.git

diff --git a/plugins/ctf/Makefile.am b/plugins/ctf/Makefile.am
index 27227083..f53a6ab3 100644
--- a/plugins/ctf/Makefile.am
+++ b/plugins/ctf/Makefile.am
@@ -1,19 +1,17 @@
 AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include
 
-SUBDIRS = reader lttng-live
+SUBDIRS = common fs lttng-live
 
-lib_LTLIBRARIES = libbabeltrace-plugin-ctf.la
+plugindir = "$(PLUGINSDIR)"
+plugin_LTLIBRARIES = libbabeltrace-plugin-ctf.la
 
-# Plug-in system library
-libbabeltrace_plugin_ctf_la_SOURCES = symbols.c
+# ctf plugin
+libbabeltrace_plugin_ctf_la_SOURCES = plugin.c
 
-# Request that the linker keeps all static library objects.
 libbabeltrace_plugin_ctf_la_LDFLAGS = \
-	$(LD_NO_AS_NEEDED) -version-info $(BABELTRACE_LIBRARY_VERSION)
-#	-Wl,--whole-archive,reader/.libs/libbabeltrace-plugin-ctf-reader.a,--no-whole-archive
+	-version-info $(BABELTRACE_LIBRARY_VERSION)
 
 libbabeltrace_plugin_ctf_la_LIBADD = \
 	$(top_builddir)/lib/libbabeltrace.la \
-	$(top_builddir)/formats/ctf/libbabeltrace-ctf.la \
-	$(top_builddir)/plugins/ctf/reader/libbabeltrace-plugin-ctf-reader.la \
-	$(top_builddir)/plugins/ctf/lttng-live/libbabeltrace-plugin-ctf-lttng-live.la
+	fs/libbabeltrace-plugin-ctf-fs.la \
+	lttng-live/libbabeltrace-plugin-ctf-lttng-live.la