From 50ecdf72034d220d3b0300d0caa13e6946be555b Mon Sep 17 00:00:00 2001
From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Mon, 8 Aug 2011 20:46:35 -0400
Subject: [PATCH] Remove "lib" prefix from .c/.h file names

This is uncommon. "lib" prefix is only needed for the library name.
Let's keep the lib prefix for source tree directory names for clarity
though.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---
 libkernelctl/Makefile.am                                 | 2 +-
 libkernelctl/{libkernelctl.c => kernelctl.c}             | 2 +-
 libkernelctl/{libkernelctl.h => kernelctl.h}             | 0
 liblttkconsumerd/Makefile.am                             | 2 +-
 liblttkconsumerd/{liblttkconsumerd.c => lttkconsumerd.c} | 4 ++--
 liblttkconsumerd/{liblttkconsumerd.h => lttkconsumerd.h} | 0
 liblttngctl/Makefile.am                                  | 2 +-
 liblttngctl/{liblttngctl.c => lttngctl.c}                | 0
 ltt-kconsumerd/ltt-kconsumerd.c                          | 4 ++--
 ltt-sessiond/kernel-ctl.c                                | 2 +-
 10 files changed, 9 insertions(+), 9 deletions(-)
 rename libkernelctl/{libkernelctl.c => kernelctl.c} (99%)
 rename libkernelctl/{libkernelctl.h => kernelctl.h} (100%)
 rename liblttkconsumerd/{liblttkconsumerd.c => lttkconsumerd.c} (99%)
 rename liblttkconsumerd/{liblttkconsumerd.h => lttkconsumerd.h} (100%)
 rename liblttngctl/{liblttngctl.c => lttngctl.c} (100%)

diff --git a/libkernelctl/Makefile.am b/libkernelctl/Makefile.am
index dac301d39..97a2c9711 100644
--- a/libkernelctl/Makefile.am
+++ b/libkernelctl/Makefile.am
@@ -2,4 +2,4 @@ AM_CPPFLAGS = -I$(top_srcdir)/include
 
 noinst_LTLIBRARIES = libkernelctl.la
 
-libkernelctl_la_SOURCES = libkernelctl.c libkernelctl.h kernel-ioctl.h
+libkernelctl_la_SOURCES = kernelctl.c kernelctl.h kernel-ioctl.h
diff --git a/libkernelctl/libkernelctl.c b/libkernelctl/kernelctl.c
similarity index 99%
rename from libkernelctl/libkernelctl.c
rename to libkernelctl/kernelctl.c
index 47d749778..afb0e012b 100644
--- a/libkernelctl/libkernelctl.c
+++ b/libkernelctl/kernelctl.c
@@ -20,7 +20,7 @@
 #include <sys/ioctl.h>
 
 #include "kernel-ioctl.h"
-#include "libkernelctl.h"
+#include "kernelctl.h"
 
 int kernctl_create_session(int fd)
 {
diff --git a/libkernelctl/libkernelctl.h b/libkernelctl/kernelctl.h
similarity index 100%
rename from libkernelctl/libkernelctl.h
rename to libkernelctl/kernelctl.h
diff --git a/liblttkconsumerd/Makefile.am b/liblttkconsumerd/Makefile.am
index 4f08b4c67..a685221c8 100644
--- a/liblttkconsumerd/Makefile.am
+++ b/liblttkconsumerd/Makefile.am
@@ -2,7 +2,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/liblttkconsumerd -I$(top_s
 
 lib_LTLIBRARIES = liblttkconsumerd.la
 
-liblttkconsumerd_la_SOURCES = liblttkconsumerd.c liblttkconsumerd.h
+liblttkconsumerd_la_SOURCES = lttkconsumerd.c lttkconsumerd.h
 
 liblttkconsumerd_la_LIBADD = \
 		$(top_builddir)/libkernelctl/libkernelctl.la \
diff --git a/liblttkconsumerd/liblttkconsumerd.c b/liblttkconsumerd/lttkconsumerd.c
similarity index 99%
rename from liblttkconsumerd/liblttkconsumerd.c
rename to liblttkconsumerd/lttkconsumerd.c
index 9ad380c8d..5c22d5ec5 100644
--- a/liblttkconsumerd/liblttkconsumerd.c
+++ b/liblttkconsumerd/lttkconsumerd.c
@@ -30,8 +30,8 @@
 #include <urcu/list.h>
 #include <assert.h>
 
-#include "libkernelctl.h"
-#include "liblttkconsumerd.h"
+#include "kernelctl.h"
+#include "lttkconsumerd.h"
 #include "lttngerr.h"
 
 static
diff --git a/liblttkconsumerd/liblttkconsumerd.h b/liblttkconsumerd/lttkconsumerd.h
similarity index 100%
rename from liblttkconsumerd/liblttkconsumerd.h
rename to liblttkconsumerd/lttkconsumerd.h
diff --git a/liblttngctl/Makefile.am b/liblttngctl/Makefile.am
index 943295653..87b94dc86 100644
--- a/liblttngctl/Makefile.am
+++ b/liblttngctl/Makefile.am
@@ -2,7 +2,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include
 
 lib_LTLIBRARIES = liblttngctl.la
 
-liblttngctl_la_SOURCES = liblttngctl.c
+liblttngctl_la_SOURCES = lttngctl.c
 
 liblttngctl_la_LIBADD = \
 		$(top_builddir)/liblttng-sessiond-comm/liblttng-sessiond-comm.la
diff --git a/liblttngctl/liblttngctl.c b/liblttngctl/lttngctl.c
similarity index 100%
rename from liblttngctl/liblttngctl.c
rename to liblttngctl/lttngctl.c
diff --git a/ltt-kconsumerd/ltt-kconsumerd.c b/ltt-kconsumerd/ltt-kconsumerd.c
index 4180f8901..1e2841c01 100644
--- a/ltt-kconsumerd/ltt-kconsumerd.c
+++ b/ltt-kconsumerd/ltt-kconsumerd.c
@@ -38,8 +38,8 @@
 #include <sys/mman.h>
 
 #include "lttngerr.h"
-#include "libkernelctl.h"
-#include "liblttkconsumerd.h"
+#include "kernelctl.h"
+#include "lttkconsumerd.h"
 
 /* the two threads (receive fd and poll) */
 pthread_t threads[2];
diff --git a/ltt-sessiond/kernel-ctl.c b/ltt-sessiond/kernel-ctl.c
index 419d1af7b..cfea8942d 100644
--- a/ltt-sessiond/kernel-ctl.c
+++ b/ltt-sessiond/kernel-ctl.c
@@ -25,7 +25,7 @@
 #include <unistd.h>
 
 #include "lttngerr.h"
-#include "libkernelctl.h"
+#include "kernelctl.h"
 #include "kernel-ctl.h"
 
 /*
-- 
2.34.1