From ca3c5ac0cf100d80352a1a81936b5adc47942f35 Mon Sep 17 00:00:00 2001
From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Mon, 8 Aug 2011 20:41:06 -0400
Subject: [PATCH] Rename liblttsessiondcomm to liblttng-sessiond-comm, install
 it.

Install this library in the system, for UST.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---
 Makefile.am                                                | 2 +-
 configure.ac                                               | 2 +-
 liblttkconsumerd/Makefile.am                               | 4 ++--
 liblttng-sessiond-comm/Makefile.am                         | 5 +++++
 .../lttng-sessiond-comm.c                                  | 0
 liblttngctl/Makefile.am                                    | 4 ++--
 liblttsessiondcomm/Makefile.am                             | 7 -------
 ltt-kconsumerd/Makefile.am                                 | 4 ++--
 ltt-sessiond/Makefile.am                                   | 4 ++--
 9 files changed, 15 insertions(+), 17 deletions(-)
 create mode 100644 liblttng-sessiond-comm/Makefile.am
 rename liblttsessiondcomm/liblttsessiondcomm.c => liblttng-sessiond-comm/lttng-sessiond-comm.c (100%)
 delete mode 100644 liblttsessiondcomm/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 94b0c376d..df3067e02 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ACLOCAL_AMFLAGS = -I config
 
-SUBDIRS = liblttsessiondcomm \
+SUBDIRS = liblttng-sessiond-comm \
 		  libkernelctl \
 		  liblttkconsumerd \
 		  liblttngctl \
diff --git a/configure.ac b/configure.ac
index e65e18647..d737657f4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -45,7 +45,7 @@ AC_CONFIG_FILES([
 	libkernelctl/Makefile
 	liblttkconsumerd/Makefile
 	liblttngctl/Makefile
-	liblttsessiondcomm/Makefile
+	liblttng-sessiond-comm/Makefile
 	libustctl/Makefile
 	libustcomm/Makefile
 	ltt-kconsumerd/Makefile
diff --git a/liblttkconsumerd/Makefile.am b/liblttkconsumerd/Makefile.am
index 5594ee03b..4f08b4c67 100644
--- a/liblttkconsumerd/Makefile.am
+++ b/liblttkconsumerd/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/liblttkconsumerd -I$(top_srcdir)/liblttsessiondcomm -I$(top_srcdir)/libkernelctl
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/liblttkconsumerd -I$(top_srcdir)/libkernelctl
 
 lib_LTLIBRARIES = liblttkconsumerd.la
 
@@ -6,4 +6,4 @@ liblttkconsumerd_la_SOURCES = liblttkconsumerd.c liblttkconsumerd.h
 
 liblttkconsumerd_la_LIBADD = \
 		$(top_builddir)/libkernelctl/libkernelctl.la \
-		$(top_builddir)/liblttsessiondcomm/liblttsessiondcomm.la
+		$(top_builddir)/liblttng-sessiond-comm/liblttng-sessiond-comm.la
diff --git a/liblttng-sessiond-comm/Makefile.am b/liblttng-sessiond-comm/Makefile.am
new file mode 100644
index 000000000..47026836b
--- /dev/null
+++ b/liblttng-sessiond-comm/Makefile.am
@@ -0,0 +1,5 @@
+AM_CPPFLAGS = -I$(top_srcdir)/include
+
+lib_LTLIBRARIES = liblttng-sessiond-comm.la
+
+liblttng_sessiond_comm_la_SOURCES = lttng-sessiond-comm.c
diff --git a/liblttsessiondcomm/liblttsessiondcomm.c b/liblttng-sessiond-comm/lttng-sessiond-comm.c
similarity index 100%
rename from liblttsessiondcomm/liblttsessiondcomm.c
rename to liblttng-sessiond-comm/lttng-sessiond-comm.c
diff --git a/liblttngctl/Makefile.am b/liblttngctl/Makefile.am
index 6fa83f1c2..943295653 100644
--- a/liblttngctl/Makefile.am
+++ b/liblttngctl/Makefile.am
@@ -1,8 +1,8 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/liblttsessiondcomm
+AM_CPPFLAGS = -I$(top_srcdir)/include
 
 lib_LTLIBRARIES = liblttngctl.la
 
 liblttngctl_la_SOURCES = liblttngctl.c
 
 liblttngctl_la_LIBADD = \
-		$(top_builddir)/liblttsessiondcomm/liblttsessiondcomm.la
+		$(top_builddir)/liblttng-sessiond-comm/liblttng-sessiond-comm.la
diff --git a/liblttsessiondcomm/Makefile.am b/liblttsessiondcomm/Makefile.am
deleted file mode 100644
index 24437c7bf..000000000
--- a/liblttsessiondcomm/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include
-
-noinst_LTLIBRARIES = liblttsessiondcomm.la
-
-liblttsessiondcomm_la_SOURCES = \
-				liblttsessiondcomm.h \
-				liblttsessiondcomm.c
diff --git a/ltt-kconsumerd/Makefile.am b/ltt-kconsumerd/Makefile.am
index ddef5460c..ce75694d9 100644
--- a/ltt-kconsumerd/Makefile.am
+++ b/ltt-kconsumerd/Makefile.am
@@ -1,10 +1,10 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/liblttkconsumerd -I$(top_srcdir)/liblttsessiondcomm -I$(top_srcdir)/libkernelctl
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/liblttkconsumerd -I$(top_srcdir)/libkernelctl
 
 bin_PROGRAMS = ltt-kconsumerd
 
 ltt_kconsumerd_SOURCES = ltt-kconsumerd.c
 
 ltt_kconsumerd_LDADD = \
-		 $(top_builddir)/liblttsessiondcomm/liblttsessiondcomm.la \
+		 $(top_builddir)/liblttng-sessiond-comm/liblttng-sessiond-comm.la \
 		 $(top_builddir)/libkernelctl/libkernelctl.la \
 		 $(top_builddir)/liblttkconsumerd/liblttkconsumerd.la
diff --git a/ltt-sessiond/Makefile.am b/ltt-sessiond/Makefile.am
index 268617350..daa4265c1 100644
--- a/ltt-sessiond/Makefile.am
+++ b/ltt-sessiond/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/liblttsessiondcomm \
+AM_CPPFLAGS = -I$(top_srcdir)/include \
 			  -I$(top_srcdir)/libkernelctl -I$(top_srcdir)/libustctl \
 			  -DINSTALL_BIN_PATH=\"$(bindir)\"
 
@@ -13,7 +13,7 @@ ltt_sessiond_SOURCES = utils.c trace.c session.c traceable-app.c ust-ctl.c \
 
 # link on liblttngctl for check if sessiond is already alive.
 ltt_sessiond_LDADD = \
-		 $(top_builddir)/liblttsessiondcomm/liblttsessiondcomm.la \
+		 $(top_builddir)/liblttng-sessiond-comm/liblttng-sessiond-comm.la \
 		 $(top_builddir)/libkernelctl/libkernelctl.la \
 		 $(top_builddir)/libustctl/libustctl.la	\
 		 $(top_builddir)/liblttngctl/liblttngctl.la
-- 
2.34.1