Merge libclient and libapi.

monero-project · Jan 31, 2016 · e0f9c73 · e0f9c73
1 parent 5e826da
commit e0f9c73
Show file tree

Hide file tree

Showing 22 changed files with 21 additions and 34 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -194,7 +194,6 @@ message(STATUS "---------------------------------------")
 include(GNUInstallDirs)
 
 set(MAIN_NAME "${PROJECT_NAME}-main")
-set(API_NAME "${PROJECT_NAME}-api")
 set(CLIENT_NAME "${PROJECT_NAME}-client")
 set(CORE_NAME "${PROJECT_NAME}-core")
 set(TESTS_NAME "${PROJECT_NAME}-tests")

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -6,7 +6,6 @@ include_directories(
   "client"
   "core")
 
-add_subdirectory(api)
 add_subdirectory(client)
 add_subdirectory(core)
 add_subdirectory(tests)
@@ -15,7 +14,7 @@ if(WITH_BINARY)
   add_executable(${MAIN_NAME} ${MAIN_SRC})
   target_link_libraries(
     ${MAIN_NAME}
-    ${CLIENT_NAME} ${API_NAME} ${CORE_NAME}
+    ${CLIENT_NAME} ${CORE_NAME}
     ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
   if(NOT MSVC) # FIXME: incremental linker file name (.ilk) collision for dll & exe
     set_target_properties(

diff --git a/src/api/CMakeLists.txt b/src/api/CMakeLists.txt
diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt
@@ -1,4 +1,11 @@
 set(CLIENT_SRC
+  "Datagram.cpp"
+  "I2PControl/I2PControl.cpp"
+  "I2PControl/I2PControlServer.cpp"
+  "I2PTunnel/HTTPProxy.cpp"
+  "I2PTunnel/I2PTunnel.cpp"
+  "I2PTunnel/SOCKS.cpp"
+  "Streaming.cpp"
   "AddressBook.cpp"
   "Destination.cpp"
   "ClientContext.cpp"
@@ -28,7 +35,7 @@ endif()
 if(WITH_LIBRARY)
   add_library(${CLIENT_NAME} ${CLIENT_SRC})
   target_link_libraries(
-    ${CLIENT_NAME} ${API_NAME} ${CORE_NAME}
+    ${CLIENT_NAME} ${CORE_NAME}
     ${Boost_LIBRARIES} ${CRYPTO++_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
   install(
     TARGETS ${CLIENT_NAME}

diff --git a/src/client/ClientContext.h b/src/client/ClientContext.h
@@ -39,10 +39,10 @@
 
 #include "AddressBook.h"
 #include "Destination.h"
-#include "api/I2PControl/I2PControlServer.h"
-#include "api/I2PTunnel/HTTPProxy.h"
-#include "api/I2PTunnel/I2PTunnel.h"
-#include "api/I2PTunnel/SOCKS.h"
+#include "I2PControl/I2PControlServer.h"
+#include "I2PTunnel/HTTPProxy.h"
+#include "I2PTunnel/I2PTunnel.h"
+#include "I2PTunnel/SOCKS.h"
 
 namespace i2p {
 namespace client {

diff --git a/src/client/Daemon.cpp b/src/client/Daemon.cpp
@@ -40,7 +40,7 @@
 #include "RouterContext.h"
 #include "RouterInfo.h"
 #include "Version.h"
-#include "api/Streaming.h"
+#include "Streaming.h"
 #include "core/util/Log.h"
 #include "transport/NTCPSession.h"
 #include "transport/Transports.h"

diff --git a/src/api/Datagram.cpp → src/client/Datagram.cpp b/src/api/Datagram.cpp → src/client/Datagram.cpp
diff --git a/src/api/Datagram.h → src/client/Datagram.h b/src/api/Datagram.h → src/client/Datagram.h
diff --git a/src/client/Destination.h b/src/client/Destination.h
@@ -45,8 +45,8 @@
 #include "Identity.h"
 #include "LeaseSet.h"
 #include "NetworkDatabase.h"
-#include "api/Datagram.h"
-#include "api/Streaming.h"
+#include "Datagram.h"
+#include "Streaming.h"
 #include "crypto/CryptoConst.h"
 #include "tunnel/TunnelPool.h"
 

diff --git a/src/api/I2PControl/I2PControl.cpp → src/client/I2PControl/I2PControl.cpp b/src/api/I2PControl/I2PControl.cpp → src/client/I2PControl/I2PControl.cpp
diff --git a/src/api/I2PControl/I2PControl.h → src/client/I2PControl/I2PControl.h b/src/api/I2PControl/I2PControl.h → src/client/I2PControl/I2PControl.h
diff --git a/src/api/I2PControl/I2PControlServer.cpp → src/client/I2PControl/I2PControlServer.cpp b/src/api/I2PControl/I2PControlServer.cpp → src/client/I2PControl/I2PControlServer.cpp
diff --git a/src/api/I2PControl/I2PControlServer.h → src/client/I2PControl/I2PControlServer.h b/src/api/I2PControl/I2PControlServer.h → src/client/I2PControl/I2PControlServer.h
diff --git a/src/api/I2PTunnel/HTTPProxy.cpp → src/client/I2PTunnel/HTTPProxy.cpp b/src/api/I2PTunnel/HTTPProxy.cpp → src/client/I2PTunnel/HTTPProxy.cpp
@@ -40,7 +40,7 @@
 
 #include "I2PTunnel.h"
 #include "Identity.h"
-#include "api/Streaming.h"
+#include "Streaming.h"
 #include "client/ClientContext.h"
 #include "client/Destination.h"
 #include "util/HTTP.h"

diff --git a/src/api/I2PTunnel/HTTPProxy.h → src/client/I2PTunnel/HTTPProxy.h b/src/api/I2PTunnel/HTTPProxy.h → src/client/I2PTunnel/HTTPProxy.h
diff --git a/src/api/I2PTunnel/I2PTunnel.cpp → src/client/I2PTunnel/I2PTunnel.cpp b/src/api/I2PTunnel/I2PTunnel.cpp → src/client/I2PTunnel/I2PTunnel.cpp
diff --git a/src/api/I2PTunnel/I2PTunnel.h → src/client/I2PTunnel/I2PTunnel.h b/src/api/I2PTunnel/I2PTunnel.h → src/client/I2PTunnel/I2PTunnel.h
@@ -40,7 +40,7 @@
 #include <string>
 
 #include "Identity.h"
-#include "api/Streaming.h"
+#include "Streaming.h"
 #include "client/Destination.h"
 #include "client/I2PService.h"
 

diff --git a/src/api/I2PTunnel/SOCKS.cpp → src/client/I2PTunnel/SOCKS.cpp b/src/api/I2PTunnel/SOCKS.cpp → src/client/I2PTunnel/SOCKS.cpp
@@ -36,8 +36,8 @@
 #include <string>
 
 #include "Identity.h"
-#include "api/I2PTunnel/I2PTunnel.h"
-#include "api/Streaming.h"
+#include "I2PTunnel/I2PTunnel.h"
+#include "Streaming.h"
 #include "client/ClientContext.h"
 #include "client/Destination.h"
 #include "util/I2PEndian.h"

diff --git a/src/api/I2PTunnel/SOCKS.h → src/client/I2PTunnel/SOCKS.h b/src/api/I2PTunnel/SOCKS.h → src/client/I2PTunnel/SOCKS.h
diff --git a/src/api/Streaming.cpp → src/client/Streaming.cpp b/src/api/Streaming.cpp → src/client/Streaming.cpp
diff --git a/src/api/Streaming.h → src/client/Streaming.h b/src/api/Streaming.h → src/client/Streaming.h
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -90,7 +90,7 @@ add_subdirectory(crypto/ed25519)
 if(WITH_LIBRARY)
   add_library(${CORE_NAME} ${CORE_SRC} ${EDDSA_SRC})
   target_link_libraries(
-    ${CORE_NAME} ${API_NAME}
+    ${CORE_NAME}
     ${Boost_LIBRARIES} ${CRYPTO++_LIBRARIES} ${OPENSSL_LIBRARIES}
     ${DL_LIB})
   install(