CTF IR -> Trace IR

[babeltrace.git] / lib / Makefile.am

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 4f89b42d9d468a163cfd98bc665b7d49d09cfa3f..04ece47438e82d2a1bb0ec1053775c610ad82446 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,8 +1,14 @@
-SUBDIRS = ctf-ir ctf-writer prio_heap plugin graph .
+SUBDIRS = trace-ir ctf-writer prio_heap plugin graph .
 
 lib_LTLIBRARIES = libbabeltrace.la libbabeltrace-ctf.la
 
-libbabeltrace_la_SOURCES = babeltrace.c values.c ref.c logging.c
+libbabeltrace_la_SOURCES = \
+       babeltrace.c \
+       values.c \
+       ref.c \
+       lib-logging.c \
+       logging.c \
+       object-pool.c
 libbabeltrace_la_LDFLAGS = $(LT_NO_UNDEFINED) \
                        -version-info $(BABELTRACE_LIBRARY_VERSION)
 
@@ -10,7 +16,7 @@ libbabeltrace_la_LIBADD = \
        prio_heap/libprio_heap.la \
        graph/libgraph.la \
        plugin/libplugin.la \
-       ctf-ir/libctf-ir.la \
+       trace-ir/libtrace-ir.la \
        ctf-writer/libctf-writer.la \
        $(top_builddir)/logging/libbabeltrace-logging.la \
        $(top_builddir)/common/libbabeltrace-common.la \
@@ -24,13 +30,13 @@ endif
 # CTF writer used to be in libbabeltrace-ctf in Babeltrace 1, so this
 # file must still exist. As of Babeltrace 2, CTF writer is implemented
 # in libbabeltrace.
-libbabeltrace_ctf_la_SOURCES = babeltrace.c values.c ref.c logging.c
+libbabeltrace_ctf_la_SOURCES = $(libbabeltrace_la_SOURCES)
 libbabeltrace_ctf_la_LDFLAGS = $(LT_NO_UNDEFINED) \
                        -version-info $(BABELTRACE_LIBRARY_VERSION)
 
 libbabeltrace_ctf_la_LIBADD = \
        graph/libgraph.la \
-       ctf-ir/libctf-ir.la \
+       trace-ir/libtrace-ir.la \
        ctf-writer/libctf-writer.la \
        $(top_builddir)/logging/libbabeltrace-logging.la \
        $(top_builddir)/common/libbabeltrace-common.la \