From e88129fcabf35d124a7d97f6600350745dcbbb81 Mon Sep 17 00:00:00 2001
From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Thu, 11 Aug 2011 18:16:14 -0400
Subject: [PATCH] Privatize lttng-sessiond-comm

With the intent of keeping libust, which is really an instrumentation
library, stand-alone, we prefer not to make it depend on a library from
the lttng-tools tree. Therefore, we privatize lttng-sessiond-comm, and
both package will interact through a communication protocol rather than
a shared library.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---
 include/Makefile.am                          | 5 +++--
 include/lttng-kconsumerd.h                   | 2 +-
 include/{lttng => }/lttng-sessiond-comm.h    | 0
 liblttkconsumerd/lttkconsumerd.h             | 2 +-
 liblttng-sessiond-comm/Makefile.am           | 5 +++--
 liblttng-sessiond-comm/lttng-sessiond-comm.c | 2 +-
 liblttngctl/lttngctl.c                       | 2 +-
 ltt-sessiond/context.h                       | 2 +-
 ltt-sessiond/main.c                          | 2 +-
 ltt-sessiond/ust-ctl.c                       | 2 +-
 10 files changed, 13 insertions(+), 11 deletions(-)
 rename include/{lttng => }/lttng-sessiond-comm.h (100%)

diff --git a/include/Makefile.am b/include/Makefile.am
index 4d13e9cbe..dc3f0b553 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,3 +1,4 @@
-lttnginclude_HEADERS = lttng/lttng.h lttng/lttng-sessiond-comm.h
+lttnginclude_HEADERS = lttng/lttng.h
 
-noinst_HEADERS = lttngerr.h lttng-kernel.h lttng-kconsumerd.h lttng-share.h
+noinst_HEADERS = lttngerr.h lttng-kernel.h lttng-kconsumerd.h lttng-share.h \
+		lttng-sessiond-comm.h
diff --git a/include/lttng-kconsumerd.h b/include/lttng-kconsumerd.h
index 8dd57cff1..ec3a9e2b5 100644
--- a/include/lttng-kconsumerd.h
+++ b/include/lttng-kconsumerd.h
@@ -20,7 +20,7 @@
 #ifndef _LTTNG_KCONSUMERD_H
 #define _LTTNG_KCONSUMERD_H
 
-#include <lttng/lttng-sessiond-comm.h>
+#include <lttng-sessiond-comm.h>
 #include "lttng-share.h"
 
 /* Kernel consumer path */
diff --git a/include/lttng/lttng-sessiond-comm.h b/include/lttng-sessiond-comm.h
similarity index 100%
rename from include/lttng/lttng-sessiond-comm.h
rename to include/lttng-sessiond-comm.h
diff --git a/liblttkconsumerd/lttkconsumerd.h b/liblttkconsumerd/lttkconsumerd.h
index d085a7950..808f41438 100644
--- a/liblttkconsumerd/lttkconsumerd.h
+++ b/liblttkconsumerd/lttkconsumerd.h
@@ -19,7 +19,7 @@
 #ifndef _LIBLTTKCONSUMERD_H
 #define _LIBLTTKCONSUMERD_H
 
-#include <lttng/lttng-sessiond-comm.h>
+#include <lttng-sessiond-comm.h>
 #include "lttng-kconsumerd.h"
 
 /*
diff --git a/liblttng-sessiond-comm/Makefile.am b/liblttng-sessiond-comm/Makefile.am
index 47026836b..5ddd39ccd 100644
--- a/liblttng-sessiond-comm/Makefile.am
+++ b/liblttng-sessiond-comm/Makefile.am
@@ -1,5 +1,6 @@
 AM_CPPFLAGS = -I$(top_srcdir)/include
 
-lib_LTLIBRARIES = liblttng-sessiond-comm.la
+noinst_LTLIBRARIES = liblttng-sessiond-comm.la
 
-liblttng_sessiond_comm_la_SOURCES = lttng-sessiond-comm.c
+liblttng_sessiond_comm_la_SOURCES = lttng-sessiond-comm.c \
+				    lttng-sessiond-comm.h
diff --git a/liblttng-sessiond-comm/lttng-sessiond-comm.c b/liblttng-sessiond-comm/lttng-sessiond-comm.c
index cecd89d6a..e370fcd35 100644
--- a/liblttng-sessiond-comm/lttng-sessiond-comm.c
+++ b/liblttng-sessiond-comm/lttng-sessiond-comm.c
@@ -28,7 +28,7 @@
 #include <unistd.h>
 #include <assert.h>
 
-#include <lttng/lttng-sessiond-comm.h>
+#include <lttng-sessiond-comm.h>
 
 /*
  * Human readable error message.
diff --git a/liblttngctl/lttngctl.c b/liblttngctl/lttngctl.c
index ec01859a9..b266797bd 100644
--- a/liblttngctl/lttngctl.c
+++ b/liblttngctl/lttngctl.c
@@ -30,7 +30,7 @@
 
 #include <lttng/lttng.h>
 
-#include <lttng/lttng-sessiond-comm.h>
+#include <lttng-sessiond-comm.h>
 #include "lttngerr.h"
 #include "lttng-share.h"
 
diff --git a/ltt-sessiond/context.h b/ltt-sessiond/context.h
index b107c9c3c..28586521b 100644
--- a/ltt-sessiond/context.h
+++ b/ltt-sessiond/context.h
@@ -23,7 +23,7 @@
 #include <urcu/list.h>
 
 #include <lttng/lttng.h>
-#include <lttng/lttng-sessiond-comm.h>
+#include <lttng-sessiond-comm.h>
 
 #include "lttng-kernel.h"
 #include "kernel-ctl.h"
diff --git a/ltt-sessiond/main.c b/ltt-sessiond/main.c
index 36d4423ca..b1dbc8f97 100644
--- a/ltt-sessiond/main.c
+++ b/ltt-sessiond/main.c
@@ -41,7 +41,7 @@
 
 #include <urcu/list.h>		/* URCU list library (-lurcu) */
 #include <lttng/lttng.h>
-#include <lttng/lttng-sessiond-comm.h>
+#include <lttng-sessiond-comm.h>
 
 #include "context.h"
 #include "ltt-sessiond.h"
diff --git a/ltt-sessiond/ust-ctl.c b/ltt-sessiond/ust-ctl.c
index d9d4af51a..fe65fafe2 100644
--- a/ltt-sessiond/ust-ctl.c
+++ b/ltt-sessiond/ust-ctl.c
@@ -23,7 +23,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <lttng/lttng-sessiond-comm.h>
+#include <lttng-sessiond-comm.h>
 #include "lttngerr.h"
 #include "ust-ctl.h"
 
-- 
2.34.1