Rename libraries' main.c files

11 files changed, 7 insertions, 8 deletions

diff --git a/libpiano/src/CMakeLists.txt b/libpiano/src/CMakeLists.txt
index 1344be2..8d1b77e 100644
--- a/libpiano/src/CMakeLists.txt
+++ b/libpiano/src/CMakeLists.txt
@@ -7,6 +7,6 @@ include_directories (${CMAKE_CURRENT_SOURCE_DIR}/../../libwaitress/src
         ${CMAKE_CURRENT_BINARY_DIR}
 	${CMAKE_CURRENT_SOURCE_DIR}/../../libezxml/src)
 
-add_library (piano STATIC crypt.c http.c main.c xml.c)
+add_library (piano STATIC crypt.c http.c piano.c xml.c)
 target_link_libraries (piano waitress ezxml)
 
diff --git a/libpiano/src/crypt.c b/libpiano/src/crypt.c
index 9b21516..9691aeb 100644
--- a/libpiano/src/crypt.c
+++ b/libpiano/src/crypt.c
@@ -28,7 +28,7 @@ THE SOFTWARE.
 
 #include "crypt_key_output.h"
 #include "crypt_key_input.h"
-#include "main.h"
+#include "piano_private.h"
 
 #define byteswap32(x) ((((x) >> 24) & 0x000000ff) | \
 		(((x) >> 8) & 0x0000ff00) | \
diff --git a/libpiano/src/http.c b/libpiano/src/http.c
index 4af5ccc..10de2a5 100644
--- a/libpiano/src/http.c
+++ b/libpiano/src/http.c
@@ -27,7 +27,7 @@ THE SOFTWARE.
 
 #include <waitress.h>
 
-#include "main.h"
+#include "piano_private.h"
 #include "crypt.h"
 #include "http.h"
 
diff --git a/libpiano/src/main.c b/libpiano/src/piano.c
index 2bf8426..43c675a 100644
--- a/libpiano/src/main.c
+++ b/libpiano/src/piano.c
@@ -28,7 +28,7 @@ THE SOFTWARE.
 #include <stdlib.h>
 #include <time.h>
 
-#include "main.h"
+#include "piano_private.h"
 #include "piano.h"
 #include "http.h"
 #include "xml.h"
diff --git a/libpiano/src/main.h b/libpiano/src/piano_private.h
index 6c8401e..6c8401e 100644
--- a/libpiano/src/main.h
+++ b/libpiano/src/piano_private.h
diff --git a/libpiano/src/xml.c b/libpiano/src/xml.c
index ad0cf7d..35a8606 100644
--- a/libpiano/src/xml.c
+++ b/libpiano/src/xml.c
@@ -31,7 +31,7 @@ THE SOFTWARE.
 #include "piano.h"
 #include "crypt.h"
 #include "config.h"
-#include "main.h"
+#include "piano_private.h"
 
 static void PianoXmlStructParser (const ezxml_t,
 		void (*callback) (const char *, const ezxml_t, void *), void *);
diff --git a/libwaitress/src/CMakeLists.txt b/libwaitress/src/CMakeLists.txt
index 8978a08..1985815 100644
--- a/libwaitress/src/CMakeLists.txt
+++ b/libwaitress/src/CMakeLists.txt
@@ -18,6 +18,6 @@ configure_file (${CMAKE_CURRENT_SOURCE_DIR}/config.h.in
 
 include_directories( ${CMAKE_CURRENT_BINARY_DIR} )
 
-add_library (waitress STATIC main.c)
+add_library (waitress STATIC waitress.c)
 target_link_libraries (waitress ${EXTRA_LIBS})
 
diff --git a/libwaitress/src/main.c b/libwaitress/src/waitress.c
index 545aa0a..545aa0a 100644
--- a/libwaitress/src/main.c
+++ b/libwaitress/src/waitress.c
diff --git a/libwardrobe/src/CMakeLists.txt b/libwardrobe/src/CMakeLists.txt
index d6bed82..32fbe00 100644
--- a/libwardrobe/src/CMakeLists.txt
+++ b/libwardrobe/src/CMakeLists.txt
@@ -6,5 +6,5 @@ configure_file (${CMAKE_CURRENT_SOURCE_DIR}/config.h.in
 include_directories (${CMAKE_CURRENT_SOURCE_DIR}/../../libwaitress/src
   ${CMAKE_CURRENT_BINARY_DIR} )
 
-add_library (wardrobe STATIC main.c md5.c)
+add_library (wardrobe STATIC wardrobe.c md5.c)
 target_link_libraries (wardrobe waitress)
diff --git a/libwardrobe/src/main.c b/libwardrobe/src/wardrobe.c
index d822aa5..d822aa5 100644
--- a/libwardrobe/src/main.c
+++ b/libwardrobe/src/wardrobe.c
diff --git a/src/main.c b/src/main.c
index bfe4965..426d566 100644
--- a/src/main.c
+++ b/src/main.c
@@ -49,7 +49,6 @@ THE SOFTWARE.
 
 #include "player.h"
 #include "settings.h"
-#include "main.h"
 #include "terminal.h"
 #include "config.h"
 #include "ui.h"