babeltrace(1): add --connect option and connection management

[babeltrace.git] / converter / Makefile.am

diff --git a/converter/Makefile.am b/converter/Makefile.am
index 6c8db944ab0923f0dd33f6b0520fbb066a605745..6cbe2ff92ad42cfb40e3dcd40c9af52732ced563 100644 (file)
--- a/converter/Makefile.am
+++ b/converter/Makefile.am
@@ -1,6 +1,6 @@
+PLUGINS_PATH = $(abs_top_builddir)/plugins
 AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include \
-               -DINSTALL_LIBDIR=\"$(libdir)\" \
-               -DCONFIG_IN_TREE_PLUGIN_DIR=\"$(abs_top_builddir)/plugins/\"
+               -DCONFIG_IN_TREE_PLUGIN_PATH=\"$(PLUGINS_PATH)/ctf:$(PLUGINS_PATH)/text:$(PLUGINS_PATH)/muxer:$(PLUGINS_PATH)/trimmer:$(PLUGINS_PATH)/writer\"
 AM_LDFLAGS = -lpopt
 
 bin_PROGRAMS = babeltrace.bin babeltrace-log
@@ -12,7 +12,9 @@ babeltrace_bin_SOURCES = \
        babeltrace-cfg.c \
        babeltrace-cfg.h \
        default-cfg.h \
-       default-cfg.c
+       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
@@ -25,7 +27,8 @@ babeltrace_bin_LDADD = \
        $(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)/formats/lttng-live/libbabeltrace-lttng-live.la \
+       $(top_builddir)/common/libbabeltrace-common.la
 
 if ENABLE_DEBUG_INFO
 babeltrace_bin_LDADD += $(top_builddir)/lib/libdebug-info.la