From 5b97ec606d485e091cf2c2bc06b79f05d18212aa Mon Sep 17 00:00:00 2001
From: David Goulet <david.goulet@polymtl.ca>
Date: Tue, 3 May 2011 15:59:52 -0400
Subject: [PATCH] Rename liblttngctl.h to lttng.h

Signed-off-by: David Goulet <david.goulet@polymtl.ca>
---
 include/lttng/{liblttngctl.h => lttng.h} | 0
 liblttngctl/liblttngctl.c                | 2 +-
 ltt-sessiond/main.c                      | 2 +-
 ltt-sessiond/session.c                   | 2 --
 ltt-sessiond/session.h                   | 2 +-
 lttng/lttng.c                            | 2 +-
 6 files changed, 4 insertions(+), 6 deletions(-)
 rename include/lttng/{liblttngctl.h => lttng.h} (100%)

diff --git a/include/lttng/liblttngctl.h b/include/lttng/lttng.h
similarity index 100%
rename from include/lttng/liblttngctl.h
rename to include/lttng/lttng.h
diff --git a/liblttngctl/liblttngctl.c b/liblttngctl/liblttngctl.c
index bd02a13b2..76bdf5ffd 100644
--- a/liblttngctl/liblttngctl.c
+++ b/liblttngctl/liblttngctl.c
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <lttng/liblttngctl.h>
+#include <lttng/lttng.h>
 
 #include "liblttsessiondcomm.h"
 #include "lttngerr.h"
diff --git a/ltt-sessiond/main.c b/ltt-sessiond/main.c
index 150f211fb..2fd622299 100644
--- a/ltt-sessiond/main.c
+++ b/ltt-sessiond/main.c
@@ -35,7 +35,7 @@
 
 #include <urcu/list.h>		/* URCU list library (-lurcu) */
 #include <ust/ustctl.h>		/* UST control lib (-lust) */
-#include <lttng/liblttngctl.h>
+#include <lttng/lttng.h>
 
 #include "liblttsessiondcomm.h"
 #include "ltt-sessiond.h"
diff --git a/ltt-sessiond/session.c b/ltt-sessiond/session.c
index bf5f618a8..54e19669e 100644
--- a/ltt-sessiond/session.c
+++ b/ltt-sessiond/session.c
@@ -17,12 +17,10 @@
  */
 
 #define _GNU_SOURCE
-#include <lttng/liblttngctl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <urcu/list.h>
-#include <uuid/uuid.h>
 
 #include "lttngerr.h"
 #include "session.h"
diff --git a/ltt-sessiond/session.h b/ltt-sessiond/session.h
index 00e8ef1e7..4f58e9d9f 100644
--- a/ltt-sessiond/session.h
+++ b/ltt-sessiond/session.h
@@ -19,7 +19,7 @@
 #ifndef _LTT_SESSION_H
 #define _LTT_SESSION_H
 
-#include <lttng/liblttngctl.h>
+#include <lttng/lttng.h>
 #include <uuid/uuid.h>
 
 /* Global session list */
diff --git a/lttng/lttng.c b/lttng/lttng.c
index f6cad4243..a5569c9af 100644
--- a/lttng/lttng.c
+++ b/lttng/lttng.c
@@ -30,7 +30,7 @@
 #include <sys/wait.h>
 #include <unistd.h>
 
-#include <lttng/liblttngctl.h>
+#include <lttng/lttng.h>
 
 #include "lttng.h"
 #include "lttngerr.h"
-- 
2.34.1