Fix merge with master

[lttng-tools.git] / benchmark / Makefile.am

diff --git a/benchmark/Makefile.am b/benchmark/Makefile.am
index 59c88fe2fd45bf418b6a0293d504032413379aec..c7a53afabe9fac3d6a81c981357575ea0bf2bb6f 100644 (file)
--- a/benchmark/Makefile.am
+++ b/benchmark/Makefile.am
@@ -1,16 +1,17 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src
 
 noinst_LTLIBRARIES = liblttng-benchmark.la
 
 noinst_PROGRAMS = bench_sessions
 
 UTILS=utils.h
-SESSIONS=$(top_srcdir)/ltt-sessiond/session.c
+SESSIONS=$(top_srcdir)/src/bin/lttng-sessiond/session.c
 
 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
-
+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