X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=converter%2FMakefile.am;h=5e88fb0ba70039962cf6dc0703b511b24cb00c8f;hb=7d55361f7b41ed8d44a71c17dfeecd316ca77460;hp=35c64ec5df7a923bf24151410f0bb3c1f9043135;hpb=1670bffdf312795f277237062cca264967f13fd0;p=babeltrace.git

diff --git a/converter/Makefile.am b/converter/Makefile.am
index 35c64ec5..5e88fb0b 100644
--- 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)/writer:$(PLUGINS_PATH)/utils\"
 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