X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=converter%2FMakefile.am;h=c1fce34ec5f8aa484e2ba1ab5f6e6e4b2417f509;hb=dc3fffef7b84cc4af1a7c99828fd57a106cd2257;hp=794740d65f0099058223066678d2e7eb9d97aba6;hpb=0d0f514904a3ebb85775abceed30da0675f55cc6;p=babeltrace.git

diff --git a/converter/Makefile.am b/converter/Makefile.am
index 794740d6..c1fce34e 100644
--- a/converter/Makefile.am
+++ b/converter/Makefile.am
@@ -1,27 +1,44 @@
-AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include -lpopt
-
-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 \
-	$(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
+PLUGINS_PATH = $(abs_top_builddir)/plugins
+AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include \
+		-DCONFIG_IN_TREE_PLUGIN_PATH=\"$(PLUGINS_PATH)/ctf:$(PLUGINS_PATH)/text:$(PLUGINS_PATH)/muxer:$(PLUGINS_PATH)/writer:$(PLUGINS_PATH)/utils\"
+AM_LDFLAGS = -lpopt
+
+bin_PROGRAMS = babeltrace.bin
+noinst_PROGRAMS = babeltrace
+#check_PROGRAMS = babeltrace
+
+babeltrace_bin_SOURCES = \
+	babeltrace.c \
+	babeltrace-cfg.c \
+	babeltrace-cfg.h \
+	default-cfg.h \
+	default-cfg.c \
+	babeltrace-cfg-connect.h \
+	babeltrace-cfg-connect.c
+
+# -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_bin_LDFLAGS = -Wl, $(LD_NO_AS_NEEDED), -export-dynamic
+babeltrace_bin_LDADD = \
+	$(top_builddir)/lib/libbabeltrace.la \
+	$(top_builddir)/compat/libcompat.la \
+	$(top_builddir)/common/libbabeltrace-common.la
+
+if ENABLE_DEBUG_INFO
+babeltrace_bin_LDADD += $(top_builddir)/lib/libdebug-info.la
+endif
+
+if BUILT_IN_PLUGINS
+babeltrace_bin_LDFLAGS += -Wl,--whole-archive,$(top_builddir)/plugins/ctf/.libs/libbabeltrace-plugin-ctf.a,$(top_builddir)/plugins/text/.libs/libbabeltrace-plugin-ctf-text.a,$(top_builddir)/plugins/muxer/.libs/libbabeltrace-plugin-muxer.a,$(top_builddir)/plugins/writer/.libs/libbabeltrace-plugin-ctf-writer.a,--no-whole-archive
+endif
+
+if BABELTRACE_BUILD_WITH_MINGW
+babeltrace_bin_LDADD += -lrpcrt4 -lintl -liconv -lole32 -lpopt -lpthread
+endif
+
+# Only used for in-tree execution and tests
+babeltrace_SOURCES = 	$(babeltrace_bin_SOURCES)
+babeltrace_LDFLAGS = 	$(babeltrace_bin_LDFLAGS)
+babeltrace_LDADD = 	$(babeltrace_bin_LDADD)
+babeltrace_CFLAGS =	$(AM_CFLAGS) -DBT_SET_DEFAULT_IN_TREE_CONFIGURATION