Link statically to internal libraries

[babeltrace.git] / converter / Makefile.am

diff --git a/converter/Makefile.am b/converter/Makefile.am
index 3aa7fc3d5a4efa24b11700929c88375056a2cbd4..389a9d98a84c8fe4e851334533266b443693f448 100644 (file)
--- a/converter/Makefile.am
+++ b/converter/Makefile.am
@@ -1,26 +1,22 @@
 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
 
 babeltrace_SOURCES = \
        babeltrace.c
 
-#babeltrace_LDADD = \
-#      libbabeltrace.la
-
+# -Wl,--no-as-needed is needed for recent gold linker who seems to think
+# it knows better and considers libraries with constructors having
+# side-effects as dead code.
+babeltrace_LDFLAGS = -Wl,--no-as-needed
 babeltrace_LDADD = \
-       $(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
+       $(top_builddir)/lib/libbabeltrace.la \
+       $(top_builddir)/formats/ctf/libbabeltrace-ctf.la \
+       $(top_builddir)/formats/ctf-text/libbabeltrace-ctf-text.la \
+       $(top_builddir)/formats/bt-dummy/libbabeltrace-dummy.la
+
+babeltrace_log_SOURCES = babeltrace-log.c
+
+babeltrace_log_LDADD = \
+       $(top_builddir)/lib/libbabeltrace.la \
+       $(top_builddir)/formats/ctf/libbabeltrace-ctf.la