X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=cli%2FMakefile.am;h=6a7cc8816d19cf77eb92b4b8f4282c47db0293f6;hb=40392cf153f947f694d16de043bc8c6fa952a0a9;hp=195c878ad0b748a001a8a0e62a352370c49bc8dd;hpb=11cc4f3de6f143b1d4d5e71338269d54660c60b6;p=babeltrace.git

diff --git a/cli/Makefile.am b/cli/Makefile.am
index 195c878a..6a7cc881 100644
--- a/cli/Makefile.am
+++ b/cli/Makefile.am
@@ -13,25 +13,25 @@ endif
 
 AM_CPPFLAGS += '-DCONFIG_IN_TREE_PLUGIN_PATH="$(IN_TREE_PLUGIN_PATH)"'
 
-bin_PROGRAMS = babeltrace.bin babeltrace-log.bin
-noinst_PROGRAMS = babeltrace babeltrace-log
+bin_PROGRAMS = babeltrace2.bin babeltrace2-log.bin
+noinst_PROGRAMS = babeltrace2 babeltrace2-log
 
-babeltrace_bin_SOURCES = \
-	babeltrace.c \
-	babeltrace-cfg.c \
-	babeltrace-cfg.h \
-	babeltrace-cfg-cli-args.c \
-	babeltrace-cfg-cli-args.h \
-	babeltrace-cfg-cli-args-connect.c \
-	babeltrace-cfg-cli-args-connect.h \
-	babeltrace-cfg-cli-args-default.h \
-	babeltrace-cfg-cli-args-default.c \
+babeltrace2_bin_SOURCES = \
+	babeltrace2.c \
+	babeltrace2-cfg.c \
+	babeltrace2-cfg.h \
+	babeltrace2-cfg-cli-args.c \
+	babeltrace2-cfg-cli-args.h \
+	babeltrace2-cfg-cli-args-connect.c \
+	babeltrace2-cfg-cli-args-connect.h \
+	babeltrace2-cfg-cli-args-default.h \
+	babeltrace2-cfg-cli-args-default.c \
 	logging.c logging.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_bin_LDFLAGS = $(LD_NO_AS_NEEDED)
+babeltrace2_bin_LDFLAGS = $(LD_NO_AS_NEEDED)
 
 # Add all the convenience libraries used by Babeltrace plugins and the
 # library. They will be used when embedding plugins (--enable-built-in-plugins),
@@ -40,12 +40,11 @@ babeltrace_bin_LDFLAGS = $(LD_NO_AS_NEEDED)
 # we're using --whole-archive below (needed to make sure the linker does
 # not discard the plugins since the CLI does not use their symbols
 # directly).
-babeltrace_bin_LDADD = \
-	$(top_builddir)/lib/libbabeltrace.la \
+babeltrace2_bin_LDADD = \
+	$(top_builddir)/lib/libbabeltrace2.la \
 	$(top_builddir)/compat/libcompat.la \
-	$(top_builddir)/common/libbabeltrace-common.la \
-	$(top_builddir)/logging/libbabeltrace-logging.la \
-	$(top_builddir)/plugins/libctfcopytrace/libctfcopytrace.la \
+	$(top_builddir)/common/libbabeltrace2-common.la \
+	$(top_builddir)/logging/libbabeltrace2-logging.la \
 	$(POPT_LIBS)
 
 if ENABLE_BUILT_IN_PLUGINS
@@ -66,33 +65,36 @@ if ENABLE_BUILT_IN_PLUGINS
 pluginarchive = $(LD_WHOLE_ARCHIVE)$(PLUGINS_PATH)/$(1)/.libs/babeltrace-plugin-$(1).a$(LD_NO_WHOLE_ARCHIVE)
 
 # Built-in plugins
-babeltrace_bin_LDFLAGS += $(call pluginarchive,ctf)
-babeltrace_bin_LDFLAGS += $(call pluginarchive,text)
-babeltrace_bin_LDFLAGS += $(call pluginarchive,utils)
+babeltrace2_bin_LDFLAGS += $(call pluginarchive,ctf)
+babeltrace2_bin_LDFLAGS += $(call pluginarchive,text)
+babeltrace2_bin_LDFLAGS += $(call pluginarchive,utils)
 
 if ENABLE_DEBUG_INFO
-babeltrace_bin_LDFLAGS += $(call pluginarchive,lttng-utils)
+babeltrace2_bin_LDFLAGS += $(call pluginarchive,lttng-utils)
+babeltrace2_bin_LDADD += $(ELFUTILS_LIBS)
 endif
 endif
 
 if BABELTRACE_BUILD_WITH_MINGW
-babeltrace_bin_LDADD += -lws2_32 -lrpcrt4 -lintl -liconv -lole32 -lpthread
+babeltrace2_bin_LDADD += -lws2_32 -lrpcrt4 -lintl -liconv -lole32 -lpthread
 endif
 
 # 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
+babeltrace2_SOURCES = $(babeltrace2_bin_SOURCES)
+babeltrace2_LDFLAGS = $(babeltrace2_bin_LDFLAGS)
+babeltrace2_LDADD = $(babeltrace2_bin_LDADD)
+babeltrace2_CFLAGS = $(AM_CFLAGS) -DBT_SET_DEFAULT_IN_TREE_CONFIGURATION
 
-# babeltrace-log rules and config below
-babeltrace_log_bin_SOURCES = babeltrace-log.c
-babeltrace_log_bin_LDADD = \
+# babeltrace2-log rules and config below
+babeltrace2_log_bin_SOURCES = babeltrace2-log.c
+babeltrace2_log_bin_LDADD = \
 	$(top_builddir)/compat/libcompat.la \
+	$(top_builddir)/common/libbabeltrace2-common.la \
+	$(top_builddir)/logging/libbabeltrace2-logging.la \
 	$(POPT_LIBS)
-babeltrace_log_bin_CFLAGS = $(AM_CFLAGS) '-DBT_CLI_PATH="$(abs_top_builddir)/cli/babeltrace$(EXEEXT)"'
+babeltrace2_log_bin_CFLAGS = $(AM_CFLAGS) '-DBT_CLI_PATH="$(abs_top_builddir)/cli/babeltrace2$(EXEEXT)"'
 
 # Only used for in-tree execution and tests
-babeltrace_log_SOURCES = $(babeltrace_log_bin_SOURCES)
-babeltrace_log_LDADD = 	$(babeltrace_log_bin_LDADD)
-babeltrace_log_CFLAGS =	$(AM_CFLAGS) '-DBT_CLI_PATH="$(bindir)/babeltrace$(EXEEXT)"'
+babeltrace2_log_SOURCES = $(babeltrace2_log_bin_SOURCES)
+babeltrace2_log_LDADD = $(babeltrace2_log_bin_LDADD)
+babeltrace2_log_CFLAGS = $(AM_CFLAGS) '-DBT_CLI_PATH="$(bindir)/babeltrace2$(EXEEXT)"'