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

diff --git a/converter/Makefile.am b/converter/Makefile.am
index e6c8dac8..35c64ec5 100644
--- a/converter/Makefile.am
+++ b/converter/Makefile.am
@@ -1,13 +1,18 @@
 AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include \
-		-DINSTALL_LIBDIR=\"$(libdir)\"
+		-DINSTALL_LIBDIR=\"$(libdir)\" \
+		-DCONFIG_IN_TREE_PLUGIN_DIR=\"$(abs_top_builddir)/plugins/\"
 AM_LDFLAGS = -lpopt
 
 bin_PROGRAMS = babeltrace.bin babeltrace-log
+noinst_PROGRAMS = babeltrace
+#check_PROGRAMS = babeltrace
 
 babeltrace_bin_SOURCES = \
 	babeltrace.c \
 	babeltrace-cfg.c \
-	babeltrace-cfg.h
+	babeltrace-cfg.h \
+	default-cfg.h \
+	default-cfg.c
 
 # -Wl,--no-as-needed is needed for recent gold linker who seems to think
 # it knows better and considers libraries with constructors having
@@ -20,7 +25,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
@@ -49,4 +55,8 @@ babeltrace_log_LDADD += -lrpcrt4 -lintl -liconv -lole32 -lpopt -lpthread
 babeltrace_bin_LDADD += -lrpcrt4 -lintl -liconv -lole32 -lpopt -lpthread
 endif
 
-check_SCRIPTS = babeltrace
+# 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