From: David Goulet Date: Thu, 3 Nov 2011 15:42:17 +0000 (-0400) Subject: Fix tree after master branch merge X-Git-Url: http://git.lttng.org./?a=commitdiff_plain;h=0429cab2a0d6aa29491ffc132b2221ab76925691;p=lttng-tools.git Fix tree after master branch merge Signed-off-by: David Goulet --- diff --git a/benchmark/Makefile.am b/benchmark/Makefile.am index 59c88fe2f..ae66f87df 100644 --- 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 83c79c4fd..f56312e35 100644 --- a/benchmark/bench-sessions.c +++ b/benchmark/bench-sessions.c @@ -25,7 +25,7 @@ #include #include -#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 9496008b2..425a0d583 100644 --- 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