X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=converter%2FMakefile.am;h=6abe05fac01b1478a80a27ff80235f1c8edc9f38;hb=b545080b70920391f818116b481884d0260a313d;hp=389a9d98a84c8fe4e851334533266b443693f448;hpb=30827463276bab779a0965e8adf271c451c2a28a;p=babeltrace.git

diff --git a/converter/Makefile.am b/converter/Makefile.am
index 389a9d98..6abe05fa 100644
--- a/converter/Makefile.am
+++ b/converter/Makefile.am
@@ -1,22 +1,59 @@
-AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include -lpopt
+AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include \
+		-DINSTALL_LIBDIR=\"$(libdir)\"
+AM_LDFLAGS = -lpopt
 
 bin_PROGRAMS = babeltrace babeltrace-log
 
 babeltrace_SOURCES = \
-	babeltrace.c
+	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,--no-as-needed
+babeltrace_LDFLAGS = -Wl, $(LD_NO_AS_NEEDED), -export-dynamic
 babeltrace_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/bt-dummy/libbabeltrace-dummy.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
+
+if ENABLE_DEBUG_INFO
+babeltrace_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)/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
+endif
+
+if BABELTRACE_BUILD_WITH_MINGW
+babeltrace_log_LDADD += -lrpcrt4 -lintl -liconv -lole32 -lpopt -lpthread
+babeltrace_LDADD += -lrpcrt4 -lintl -liconv -lole32 -lpopt -lpthread
+endif
+
+check_SCRIPTS = babeltrace.wrapper
+
+all-local: $(PROGRAMS)
+	mv babeltrace babeltrace.libtool
+	cp babeltrace.wrapper babeltrace
+
+clean-local:
+	rm -f babeltrace.libtool