From: David Goulet <dgoulet@efficios.com>
Date: Mon, 26 Mar 2012 21:02:15 +0000 (-0400)
Subject: Fix merge with master
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=b060669ea977dcb69d9923fa55d116358b926c6e;p=lttng-tools.git

Fix merge with master

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

diff --git a/benchmark/Makefile.am b/benchmark/Makefile.am
index ae5bb91a9..c7a53afab 100644
--- 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 440b26e78..19b30adf0 100644
--- 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 bc99f9b4a..24ac2b889 100644
--- 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)"\"