X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=converter%2FMakefile.am;h=c1fce34ec5f8aa484e2ba1ab5f6e6e4b2417f509;hb=dc3fffef7b84cc4af1a7c99828fd57a106cd2257;hp=262214f7cc8999548395e59dcefc31c9028e04c1;hpb=83968c1a34a9462c83da2ec5d73de8415ac49d7b;p=babeltrace.git

diff --git a/converter/Makefile.am b/converter/Makefile.am
index 262214f7..c1fce34e 100644
--- a/converter/Makefile.am
+++ b/converter/Makefile.am
@@ -1,49 +1,44 @@
-AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include
+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 babeltrace-log
+bin_PROGRAMS = babeltrace.bin
+noinst_PROGRAMS = babeltrace
+#check_PROGRAMS = babeltrace
 
-babeltrace_SOURCES = \
+babeltrace_bin_SOURCES = \
 	babeltrace.c \
 	babeltrace-cfg.c \
-	babeltrace-cfg.h
+	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_LDFLAGS = -Wl, $(LD_NO_AS_NEEDED), -export-dynamic
-babeltrace_LDADD = \
+babeltrace_bin_LDFLAGS = -Wl, $(LD_NO_AS_NEEDED), -export-dynamic
+babeltrace_bin_LDADD = \
 	$(top_builddir)/lib/libbabeltrace.la \
-	$(top_builddir)/formats/ctf/libbabeltrace-ctf.la \
 	$(top_builddir)/compat/libcompat.la \
-	$(top_builddir)/formats/ctf-text/libbabeltrace-ctf-text.la \
-	$(top_builddir)/formats/ctf-metadata/libbabeltrace-ctf-metadata.la \
-	$(top_builddir)/formats/bt-dummy/libbabeltrace-dummy.la \
-	$(top_builddir)/formats/lttng-live/libbabeltrace-lttng-live.la
+	$(top_builddir)/common/libbabeltrace-common.la
 
 if ENABLE_DEBUG_INFO
-babeltrace_LDADD += $(top_builddir)/lib/libdebug-info.la
+babeltrace_bin_LDADD += $(top_builddir)/lib/libdebug-info.la
 endif
 
 if BUILT_IN_PLUGINS
-babeltrace_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
-
-babeltrace_log_SOURCES = babeltrace-log.c
-
-babeltrace_log_LDADD = \
-	$(top_builddir)/lib/libbabeltrace.la \
-	$(top_builddir)/formats/ctf/libbabeltrace-ctf.la \
-	$(top_builddir)/compat/libcompat.la
-
-if BABELTRACE_BUILD_WITH_LIBUUID
-babeltrace_log_LDADD += -luuid
-endif
-if BABELTRACE_BUILD_WITH_LIBC_UUID
-babeltrace_log_LDADD += -lc
+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_log_LDADD += -lrpcrt4 -lintl -liconv -lole32 -lpopt -lpthread
-babeltrace_LDADD += -lrpcrt4 -lintl -liconv -lole32 -lpopt -lpthread
+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