-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
+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