From 87aaacdb420341bf3619922332d58b95249971bc Mon Sep 17 00:00:00 2001
From: Florent Le Coz <louiz@louiz.org>
Date: Sun, 3 Nov 2013 00:22:32 +0100
Subject: [PATCH] Rename libirc and libxmpp to irc and xmpp

---
 CMakeLists.txt                      | 20 ++++++++++----------
 src/{libirc => irc}/irc_client.cpp  |  4 ++--
 src/{libirc => irc}/irc_client.hpp  |  2 +-
 src/{libirc => irc}/irc_message.cpp |  2 +-
 src/{libirc => irc}/irc_message.hpp |  0
 src/main.cpp                        |  2 +-
 6 files changed, 15 insertions(+), 15 deletions(-)
 rename src/{libirc => irc}/irc_client.cpp (95%)
 rename src/{libirc => irc}/irc_client.hpp (97%)
 rename src/{libirc => irc}/irc_message.cpp (97%)
 rename src/{libirc => irc}/irc_message.hpp (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 163e361..9f1eef6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,20 +20,20 @@ add_library(network STATIC ${source_network})
 #
 ## irclib
 #
-file(GLOB source_libirc
-  src/libirc/*.[hc]pp)
-add_library(libirc STATIC ${source_libirc})
-target_link_libraries(libirc network)
+file(GLOB source_irc
+  src/irc/*.[hc]pp)
+add_library(irc STATIC ${source_irc})
+target_link_libraries(irc network ${CRYPTO++_LIBRARIES})
 
 #
 ## xmpplib
 #
-file(GLOB source_libxmpp
-  src/libxmpp/*.[hc]pp)
-add_library(libxmpp STATIC ${source_libxmpp})
-target_link_libraries(libxmpp network)
+file(GLOB source_xmpp
+  src/xmpp/*.[hc]pp)
+add_library(xmpp STATIC ${source_xmpp})
+target_link_libraries(xmpp network )
 
 add_executable(${PROJECT_NAME} src/main.cpp)
 target_link_libraries(${PROJECT_NAME}
-  libxmpp
-  libirc)
\ No newline at end of file
+  xmpp
+  irc)
\ No newline at end of file
diff --git a/src/libirc/irc_client.cpp b/src/irc/irc_client.cpp
similarity index 95%
rename from src/libirc/irc_client.cpp
rename to src/irc/irc_client.cpp
index a427026..83d1b0d 100644
--- a/src/libirc/irc_client.cpp
+++ b/src/irc/irc_client.cpp
@@ -1,5 +1,5 @@
-#include <libirc/irc_client.hpp>
-#include <libirc/irc_message.hpp>
+#include <irc/irc_client.hpp>
+#include <irc/irc_message.hpp>
 
 #include <iostream>
 #include <stdexcept>
diff --git a/src/libirc/irc_client.hpp b/src/irc/irc_client.hpp
similarity index 97%
rename from src/libirc/irc_client.hpp
rename to src/irc/irc_client.hpp
index 9778876..e380f5b 100644
--- a/src/libirc/irc_client.hpp
+++ b/src/irc/irc_client.hpp
@@ -1,7 +1,7 @@
 #ifndef IRC_CLIENT_INCLUDED
 # define IRC_CLIENT_INCLUDED
 
-#include <libirc/irc_message.hpp>
+#include <irc/irc_message.hpp>
 
 #include <network/socket_handler.hpp>
 
diff --git a/src/libirc/irc_message.cpp b/src/irc/irc_message.cpp
similarity index 97%
rename from src/libirc/irc_message.cpp
rename to src/irc/irc_message.cpp
index fc691b4..18fa3ec 100644
--- a/src/libirc/irc_message.cpp
+++ b/src/irc/irc_message.cpp
@@ -1,4 +1,4 @@
-#include <libirc/irc_message.hpp>
+#include <irc/irc_message.hpp>
 #include <iostream>
 
 IrcMessage::IrcMessage(std::string&& line)
diff --git a/src/libirc/irc_message.hpp b/src/irc/irc_message.hpp
similarity index 100%
rename from src/libirc/irc_message.hpp
rename to src/irc/irc_message.hpp
diff --git a/src/main.cpp b/src/main.cpp
index aeeda34..fe3b2e5 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,4 +1,4 @@
-#include <libirc/irc_client.hpp>
+#include <irc/irc_client.hpp>
 #include <network/poller.hpp>
 
 int main()