From b060669ea977dcb69d9923fa55d116358b926c6e Mon Sep 17 00:00:00 2001 From: David Goulet Date: Mon, 26 Mar 2012 17:02:15 -0400 Subject: [PATCH] Fix merge with master Signed-off-by: David Goulet --- benchmark/Makefile.am | 2 +- benchmark/bench-sessions.c | 4 ++-- src/bin/lttng-sessiond/Makefile.am | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) 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)"\" -- 2.34.1