X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=lib%2FMakefile.am;h=26929ff32243d519824c08559559221c327f57f9;hb=dc3fffef7b84cc4af1a7c99828fd57a106cd2257;hp=9e14ea515ef4818e608dfce5c28a13ddee20c0a8;hpb=3b37d46561d6c6edba3b729f48a0f72699dcdc20;p=babeltrace.git

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 9e14ea51..26929ff3 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,25 +1,16 @@
-SUBDIRS = prio_heap plugin-system .
+SUBDIRS = ctf-ir ctf-writer prio_heap plugin component .
 
 AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include
 
 lib_LTLIBRARIES = libbabeltrace.la
 
-libbabeltrace_la_SOURCES = babeltrace.c \
-			   iterator.c \
-			   context.c \
-			   trace-handle.c \
-			   trace-collection.c \
-			   registry.c \
-			   values.c \
-			   ref.c
-
+libbabeltrace_la_SOURCES = babeltrace.c values.c ref.c
 libbabeltrace_la_LDFLAGS = -version-info $(BABELTRACE_LIBRARY_VERSION)
 
 if ENABLE_DEBUG_INFO
 noinst_LTLIBRARIES = libdebug-info.la
 
-libdebug_info_la_SOURCES = debug-info.c \
-			  bin-info.c \
+libdebug_info_la_SOURCES = bin-info.c \
 			  dwarf.c \
 			  crc32.c \
 			  utils.c
@@ -29,6 +20,13 @@ endif
 
 libbabeltrace_la_LIBADD = \
 	prio_heap/libprio_heap.la \
-	$(top_builddir)/types/libbabeltrace_types.la \
 	$(top_builddir)/compat/libcompat.la \
-	plugin-system/libplugin-system.la
+	component/libcomponent.la \
+	plugin/libplugin.la \
+	$(top_builddir)/common/libbabeltrace-common.la \
+	ctf-ir/libctf-ir.la \
+	ctf-writer/libctf-writer.la
+
+if BUILT_IN_PYTHON_PLUGIN_SUPPORT
+libbabeltrace_la_LIBADD += $(top_builddir)/python-plugin-provider/libbabeltrace-python-plugin-provider.la
+endif