Fix tree after master branch merge

Signed-off-by: David Goulet <david.goulet@polymtl.ca>

diff --git a/benchmark/Makefile.am b/benchmark/Makefile.am
index 59c88fe2fd45bf418b6a0293d504032413379aec..ae66f87df1111de9d6e1d7d437c880fe63ade97a 100644 (file)
--- a/benchmark/Makefile.am
+++ b/benchmark/Makefile.am
@@ -5,7 +5,7 @@ noinst_LTLIBRARIES = liblttng-benchmark.la
 noinst_PROGRAMS = bench_sessions
 
 UTILS=utils.h
-SESSIONS=$(top_srcdir)/ltt-sessiond/session.c
+SESSIONS=$(top_srcdir)/lttng-sessiond/session.c
 
 liblttng_benchmark_la_SOURCES = benchmark.c benchmark.h cpu.c cpu.h
 

diff --git a/benchmark/bench-sessions.c b/benchmark/bench-sessions.c
index 83c79c4fd68c4562a313f732691fd7ec8ff3c14e..f56312e35d96231f8c2ba7a8bfab95c3cc5b9b7b 100644 (file)
--- a/benchmark/bench-sessions.c
+++ b/benchmark/bench-sessions.c
@@ -25,7 +25,7 @@
 #include <unistd.h>
 #include <time.h>
 
-#include "ltt-sessiond/session.h"
+#include "lttng-sessiond/session.h"
 #include "utils.h"
 #include "benchmark.h"
 

diff --git a/lttng-sessiond/Makefile.am b/lttng-sessiond/Makefile.am
index 9496008b2aafcc5ed5ad578def0b836df8256d71..425a0d58357809e06b5bf6c7eb75f722aa4fe618 100644 (file)
--- a/lttng-sessiond/Makefile.am
+++ b/lttng-sessiond/Makefile.am
@@ -38,7 +38,6 @@ lttng_sessiond_SOURCES += lttng-sessiond.h main.c
 lttng_sessiond_LDADD = -lrt -lurcu-cds -lurcu \
                 $(top_builddir)/liblttng-sessiond-comm/liblttng-sessiond-comm.la \
                 $(top_builddir)/libkernelctl/libkernelctl.la \
-                $(top_builddir)/libustctl/libustctl.la \
                 $(top_builddir)/liblttngctl/liblttngctl.la \
                 $(top_builddir)/benchmark/liblttng-benchmark.la