Trimmer fix: don't emit end of trace on out-of-bound event

[babeltrace.git] / converter / Makefile.am

diff --git a/converter/Makefile.am b/converter/Makefile.am
index b7e126458b3c43d5ef09c5d6a71f136c207ef659..e6c8dac8a88ddb205031570fc604c886b9999b57 100644 (file)
--- a/converter/Makefile.am
+++ b/converter/Makefile.am
@@ -1,16 +1,19 @@
-AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include
+AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include \
+               -DINSTALL_LIBDIR=\"$(libdir)\"
 AM_LDFLAGS = -lpopt
 
-bin_PROGRAMS = babeltrace babeltrace-log
+bin_PROGRAMS = babeltrace.bin babeltrace-log
 
-babeltrace_SOURCES = \
-       babeltrace.c
+babeltrace_bin_SOURCES = \
+       babeltrace.c \
+       babeltrace-cfg.c \
+       babeltrace-cfg.h
 
 # -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 \
@@ -20,7 +23,11 @@ babeltrace_LDADD = \
        $(top_builddir)/formats/lttng-live/libbabeltrace-lttng-live.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_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
 
 babeltrace_log_SOURCES = babeltrace-log.c
@@ -39,5 +46,7 @@ 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
+
+check_SCRIPTS = babeltrace