Fix merge with master

Signed-off-by: David Goulet <dgoulet@efficios.com>

diff --git a/benchmark/Makefile.am b/benchmark/Makefile.am
index ae5bb91a9e5543ae832ec55b4494ef8a9de1f04d..c7a53afabe9fac3d6a81c981357575ea0bf2bb6f 100644 (file)
--- a/benchmark/Makefile.am
+++ b/benchmark/Makefile.am
@@ -12,6 +12,6 @@ liblttng_benchmark_la_SOURCES = benchmark.c benchmark.h cpu.c cpu.h
 bench_sessions_SOURCES = bench-sessions.c $(SESSIONS) $(UTILS)
 bench_sessions_LDADD = $(top_builddir)/benchmark/liblttng-benchmark.la \
                                           $(top_builddir)/src/common/libcommon.la
-
+#                                         $(top_builddir)/src/lib/lttng-ctl/liblttng-ctl.la
 bench:
        ./runall.sh

diff --git a/benchmark/bench-sessions.c b/benchmark/bench-sessions.c
index 440b26e787874ebbe92c06450d2afac8c3576647..19b30adf0b3be0d4f3dab2bce4cb7c8f435c5602 100644 (file)
--- a/benchmark/bench-sessions.c
+++ b/benchmark/bench-sessions.c
@@ -35,8 +35,8 @@
 #define PATH1 "/tmp/.test-junk-lttng"
 
 /* For lttngerr.h */
-int opt_quiet = 1;
-int opt_verbose = 0;
+int lttng_opt_quiet = 1;
+int lttng_opt_verbose = 0;
 
 static const char alphanum[] =
        "0123456789"

diff --git a/src/bin/lttng-sessiond/Makefile.am b/src/bin/lttng-sessiond/Makefile.am
index bc99f9b4a4e8d660fe9680e2543ee4dd12d32740..24ac2b889f2af44a420cede6cef063e71ab14859 100644 (file)
--- a/src/bin/lttng-sessiond/Makefile.am
+++ b/src/bin/lttng-sessiond/Makefile.am
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 AM_CPPFLAGS = -I$(top_srcdir)/benchmark \
                          -DINSTALL_BIN_PATH=\""$(lttnglibexecdir)"\" \
                          -DINSTALL_LIB_PATH=\""$(libdir)"\"