X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=converter%2FMakefile.am;h=794740d65f0099058223066678d2e7eb9d97aba6;hp=3aa7fc3d5a4efa24b11700929c88375056a2cbd4;hb=bc7eb6c8e743cd6ae2c653fc957d19dfaf3fc200;hpb=0860ab483ea602b4ac8f60a7634b54c3923da1e6

diff --git a/converter/Makefile.am b/converter/Makefile.am
index 3aa7fc3d..794740d6 100644
--- a/converter/Makefile.am
+++ b/converter/Makefile.am
@@ -1,26 +1,27 @@
 AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include -lpopt
 
-bin_PROGRAMS = babeltrace
-
-#lib_LTLIBRARIES = libbabeltrace.la
-#
-#libbabeltrace_la_SOURCES = \
-#	babeltrace-lib.c
-#
-#libbabeltrace_la_LIBADD = \
-#	$(top_builddir)/types/libbabeltrace_types.la \
-#	$(top_builddir)/formats/libbabeltrace_registry.la \
-#	$(top_builddir)/formats/ctf/libctf.la \
-#	$(top_builddir)/formats/ctf-text/libctf-text.la
+bin_PROGRAMS = babeltrace babeltrace-log
+
+lib_LTLIBRARIES = libbabeltrace.la
+
+libbabeltrace_la_SOURCES = \
+	babeltrace-lib.c
+
+libbabeltrace_la_LIBADD = \
+	$(top_builddir)/types/libbabeltrace_types.la \
+	$(top_builddir)/formats/ctf/libctf.la \
+	$(top_builddir)/formats/ctf-text/libctf-text.la \
+	$(top_builddir)/lib/libprio_heap.la
 
 babeltrace_SOURCES = \
 	babeltrace.c
 
-#babeltrace_LDADD = \
-#	libbabeltrace.la
-
 babeltrace_LDADD = \
-	$(top_builddir)/types/libbabeltrace_types.la \
+	libbabeltrace.la \
+	$(top_builddir)/formats/libbabeltrace_registry.la
+
+babeltrace_log_SOURCES = babeltrace-log.c
+
+babeltrace_log_LDADD = \
 	$(top_builddir)/formats/libbabeltrace_registry.la \
-	$(top_builddir)/formats/ctf/libctf.la \
-	$(top_builddir)/formats/ctf-text/libctf-text.la
+	$(top_builddir)/formats/ctf/libctf.la