From 0f66da79e82bb9c7db5eaf9135a56cf0acd71b4e Mon Sep 17 00:00:00 2001
From: armatusmiles <akurotych@gmail.com>
Date: Sun, 15 Jul 2018 00:10:57 +0300
Subject: [PATCH] Fix compile errors. Rename client->dap_client

---
 core_server/CMakeLists.txt                    | 30 ++++++++-----------
 .../(DELETE)CMakeLists.txt                    |  0
 core_server/{client => dap_client}/client.pri |  0
 .../{client => dap_client}/dap_client.c       |  0
 .../{client => dap_client}/dap_client.h       |  0
 .../dap_client_internal.c                     |  0
 .../dap_client_internal.h                     |  0
 .../dap_client_remote.c                       |  0
 .../dap_client_remote.h                       |  0
 .../{client => dap_client}/sxmlc/sxmlc.c      |  0
 .../{client => dap_client}/sxmlc/sxmlc.h      |  0
 .../{client => dap_client}/sxmlc/sxmlsearch.c |  0
 .../{client => dap_client}/sxmlc/sxmlsearch.h |  0
 core_server/dap_server.h                      |  2 +-
 enc_server/CMakeLists.txt                     |  6 ++--
 http_server/CMakeLists.txt                    |  7 +++--
 http_server/dap_http.c                        |  3 +-
 http_server/dap_http.h                        |  2 +-
 udp_server/CMakeLists.txt                     | 13 ++------
 udp_server/dap_udp_client.h                   |  2 +-
 udp_server/dap_udp_server.h                   |  4 +--
 21 files changed, 30 insertions(+), 39 deletions(-)
 rename core_server/{client => dap_client}/(DELETE)CMakeLists.txt (100%)
 rename core_server/{client => dap_client}/client.pri (100%)
 rename core_server/{client => dap_client}/dap_client.c (100%)
 rename core_server/{client => dap_client}/dap_client.h (100%)
 rename core_server/{client => dap_client}/dap_client_internal.c (100%)
 rename core_server/{client => dap_client}/dap_client_internal.h (100%)
 rename core_server/{client => dap_client}/dap_client_remote.c (100%)
 rename core_server/{client => dap_client}/dap_client_remote.h (100%)
 rename core_server/{client => dap_client}/sxmlc/sxmlc.c (100%)
 rename core_server/{client => dap_client}/sxmlc/sxmlc.h (100%)
 rename core_server/{client => dap_client}/sxmlc/sxmlsearch.c (100%)
 rename core_server/{client => dap_client}/sxmlc/sxmlsearch.h (100%)

diff --git a/core_server/CMakeLists.txt b/core_server/CMakeLists.txt
index 9bf1a95..573aa3e 100644
--- a/core_server/CMakeLists.txt
+++ b/core_server/CMakeLists.txt
@@ -3,26 +3,22 @@ project (dap_core_server C)
 
 set(DAP_CORE_SERVER_SRCS
     dap_server.c
-    client/dap_client.c
-    client/dap_client_internal.c
-    client/dap_client_remote.c)
+    dap_client/dap_client.c
+    dap_client/dap_client_internal.c
+    dap_client/dap_client_remote.c)
 
-include_directories(client)
-include_directories("${INCLUDE_DIRECTORIES} ${dap_client_INCLUDE_DIRS}")
-include_directories("${INCLUDE_DIRECTORIES} ${dap_core_INCLUDE_DIRS}")
-include_directories("${INCLUDE_DIRECTORIES} ${dap_crypto_INCLUDE_DIRS}")
-include_directories("${INCLUDE_DIRECTORIES} ${dap_enc_server_INCLUDE_DIRS}")
+set(DAP_CORE_SERVER_HEADERS
+    dap_server.h
+    dap_client/dap_client.h
+    dap_client/dap_client_internal.h
+    dap_client/dap_client_remote.h)
 
-add_definitions ("${dap_client_DEFINITIONS}")
-add_definitions ("${dap_core_DEFINITIONS}")
-add_definitions ("${dap_crypto_DEFINITIONS}")
-add_definitions ("${dap_enc_server_DEFINITIONS}")
+include_directories(dap_client)
 
-add_library(${PROJECT_NAME} STATIC ${DAP_CORE_SERVER_SRCS})
+add_library(${PROJECT_NAME} STATIC ${DAP_CORE_SERVER_SRCS} ${DAP_CORE_SERVER_HEADERS})
+
+target_include_directories(dap_core_server INTERFACE .)
+target_include_directories(dap_core_server INTERFACE dap_client)
 
 target_link_libraries(dap_core_server dap_core)
 target_link_libraries(dap_core_server dap_crypto)
-
-set(${PROJECT_NAME}_DEFINITIONS CACHE INTERNAL "${PROJECT_NAME}: Definitions" FORCE)
-
-set(${PROJECT_NAME}_INCLUDE_DIRS ${PROJECT_SOURCE_DIR} CACHE INTERNAL "${PROJECT_NAME}: Include Directories" FORCE)
diff --git a/core_server/client/(DELETE)CMakeLists.txt b/core_server/dap_client/(DELETE)CMakeLists.txt
similarity index 100%
rename from core_server/client/(DELETE)CMakeLists.txt
rename to core_server/dap_client/(DELETE)CMakeLists.txt
diff --git a/core_server/client/client.pri b/core_server/dap_client/client.pri
similarity index 100%
rename from core_server/client/client.pri
rename to core_server/dap_client/client.pri
diff --git a/core_server/client/dap_client.c b/core_server/dap_client/dap_client.c
similarity index 100%
rename from core_server/client/dap_client.c
rename to core_server/dap_client/dap_client.c
diff --git a/core_server/client/dap_client.h b/core_server/dap_client/dap_client.h
similarity index 100%
rename from core_server/client/dap_client.h
rename to core_server/dap_client/dap_client.h
diff --git a/core_server/client/dap_client_internal.c b/core_server/dap_client/dap_client_internal.c
similarity index 100%
rename from core_server/client/dap_client_internal.c
rename to core_server/dap_client/dap_client_internal.c
diff --git a/core_server/client/dap_client_internal.h b/core_server/dap_client/dap_client_internal.h
similarity index 100%
rename from core_server/client/dap_client_internal.h
rename to core_server/dap_client/dap_client_internal.h
diff --git a/core_server/client/dap_client_remote.c b/core_server/dap_client/dap_client_remote.c
similarity index 100%
rename from core_server/client/dap_client_remote.c
rename to core_server/dap_client/dap_client_remote.c
diff --git a/core_server/client/dap_client_remote.h b/core_server/dap_client/dap_client_remote.h
similarity index 100%
rename from core_server/client/dap_client_remote.h
rename to core_server/dap_client/dap_client_remote.h
diff --git a/core_server/client/sxmlc/sxmlc.c b/core_server/dap_client/sxmlc/sxmlc.c
similarity index 100%
rename from core_server/client/sxmlc/sxmlc.c
rename to core_server/dap_client/sxmlc/sxmlc.c
diff --git a/core_server/client/sxmlc/sxmlc.h b/core_server/dap_client/sxmlc/sxmlc.h
similarity index 100%
rename from core_server/client/sxmlc/sxmlc.h
rename to core_server/dap_client/sxmlc/sxmlc.h
diff --git a/core_server/client/sxmlc/sxmlsearch.c b/core_server/dap_client/sxmlc/sxmlsearch.c
similarity index 100%
rename from core_server/client/sxmlc/sxmlsearch.c
rename to core_server/dap_client/sxmlc/sxmlsearch.c
diff --git a/core_server/client/sxmlc/sxmlsearch.h b/core_server/dap_client/sxmlc/sxmlsearch.h
similarity index 100%
rename from core_server/client/sxmlc/sxmlsearch.h
rename to core_server/dap_client/sxmlc/sxmlsearch.h
diff --git a/core_server/dap_server.h b/core_server/dap_server.h
index b0932a7..2909b79 100644
--- a/core_server/dap_server.h
+++ b/core_server/dap_server.h
@@ -27,7 +27,7 @@
 #include <pthread.h>
 #include "uthash.h"
 
-#include "client/dap_client_remote.h"
+#include "dap_client_remote.h"
 
 typedef enum dap_server_type {DAP_SERVER_TCP} dap_server_type_t;
 
diff --git a/enc_server/CMakeLists.txt b/enc_server/CMakeLists.txt
index d389080..33101a4 100644
--- a/enc_server/CMakeLists.txt
+++ b/enc_server/CMakeLists.txt
@@ -20,8 +20,8 @@ add_definitions ("${dap_core_server_DEFINITIONS}")
 add_definitions ("${dap_http_server_DEFINITIONS}")
 
 add_library(${PROJECT_NAME} STATIC ${DAP_ENC_SERVER_SRCS})
-set(${PROJECT_NAME}_DEFINITIONS CACHE INTERNAL "${PROJECT_NAME}: Definitions" FORCE)
-
-set(${PROJECT_NAME}_INCLUDE_DIRS ${PROJECT_SOURCE_DIR} CACHE INTERNAL "${PROJECT_NAME}: Include Directories" FORCE)
 
+target_link_libraries(dap_enc_server dap_http_server)
 target_link_libraries(${PROJECT_NAME} dap_core dap_crypto dap_core_server dap_http_server)
+
+target_include_directories(dap_core_server INTERFACE .)
diff --git a/http_server/CMakeLists.txt b/http_server/CMakeLists.txt
index 9620a36..ea30109 100644
--- a/http_server/CMakeLists.txt
+++ b/http_server/CMakeLists.txt
@@ -29,8 +29,11 @@ add_definitions ("${dap_core_server_DEFINITIONS}")
 
 add_library(${PROJECT_NAME} STATIC ${HTTP_SERVER_SRCS})
 
+target_include_directories(dap_core_server INTERFACE . http_client)
+
 target_link_libraries(dap_http_server dap_core)
 target_link_libraries(dap_http_server dap_crypto)
+target_link_libraries(dap_http_server dap_core_server)
 
-set(${PROJECT_NAME}_DEFINITIONS CACHE INTERNAL "${PROJECT_NAME}: Definitions" FORCE)
-set(${PROJECT_NAME}_INCLUDE_DIRS ${PROJECT_SOURCE_DIR} CACHE INTERNAL "${PROJECT_NAME}: Include Directories" FORCE)
+#set(${PROJECT_NAME}_DEFINITIONS CACHE INTERNAL "${PROJECT_NAME}: Definitions" FORCE)
+#set(${PROJECT_NAME}_INCLUDE_DIRS ${PROJECT_SOURCE_DIR} CACHE INTERNAL "${PROJECT_NAME}: Include Directories" FORCE)
diff --git a/http_server/dap_http.c b/http_server/dap_http.c
index 025081f..ffc67af 100644
--- a/http_server/dap_http.c
+++ b/http_server/dap_http.c
@@ -37,7 +37,8 @@
 #include <netdb.h>
 
 #include "dap_common.h"
-#include "../core_server/client/dap_client.h"
+
+#include "dap_client.h"
 #include "dap_server.h"
 
 #include "dap_http.h"
diff --git a/http_server/dap_http.h b/http_server/dap_http.h
index ab55a27..52a92dc 100644
--- a/http_server/dap_http.h
+++ b/http_server/dap_http.h
@@ -21,7 +21,7 @@
 #ifndef _SERVER_HTTP_H_
 #define _SERVER_HTTP_H_
 #include "dap_server.h"
-#include "../core_server/client/dap_client.h"
+#include "dap_client.h"
 #include "http_client/dap_http_header.h"
 #include "http_client/dap_http_client.h"
 #include "uthash.h"
diff --git a/udp_server/CMakeLists.txt b/udp_server/CMakeLists.txt
index a15b916..c9e70e6 100644
--- a/udp_server/CMakeLists.txt
+++ b/udp_server/CMakeLists.txt
@@ -3,21 +3,12 @@ project (dap_udp_server C)
   
 set(DAP_UDP_SERVER_SRCS  dap_udp_server.c dap_udp_client.h dap_udp_client.c)
 
-include_directories("${INCLUDE_DIRECTORIES} ${dap_core_INCLUDE_DIRS}")
-include_directories("${INCLUDE_DIRECTORIES} ${dap_crypto_INCLUDE_DIRS}")
-include_directories("${INCLUDE_DIRECTORIES} ${dap_client_INCLUDE_DIRS}")
-
-
 add_definitions ("${dap_core_DEFINITIONS}")
 add_definitions ("${dap_crypto_DEFINITIONS}")
 add_definitions ("${dap_client_DEFINITIONS}")
 
-
 add_library(${PROJECT_NAME} STATIC ${DAP_UDP_SERVER_SRCS})
 
-target_link_libraries(dap_udp_server dap_core)
-#target_link_libraries(dap_http_server dap_crypto)
-
-set(${PROJECT_NAME}_DEFINITIONS CACHE INTERNAL "${PROJECT_NAME}: Definitions" FORCE)
+target_link_libraries(dap_udp_server dap_core dap_core_server)
 
-set(${PROJECT_NAME}_INCLUDE_DIRS ${PROJECT_SOURCE_DIR} CACHE INTERNAL "${PROJECT_NAME}: Include Directories" FORCE)
+target_include_directories(dap_core_server INTERFACE .)
diff --git a/udp_server/dap_udp_client.h b/udp_server/dap_udp_client.h
index 1206fc0..4f981d3 100644
--- a/udp_server/dap_udp_client.h
+++ b/udp_server/dap_udp_client.h
@@ -27,7 +27,7 @@
 #include <stdbool.h>
 #include <sys/queue.h>
 #include "uthash.h"
-#include "../core_server/client/dap_client_remote.h"
+#include "dap_client_remote.h"
 #include <ev.h>
 
 
diff --git a/udp_server/dap_udp_server.h b/udp_server/dap_udp_server.h
index 364e786..9aa180b 100644
--- a/udp_server/dap_udp_server.h
+++ b/udp_server/dap_udp_server.h
@@ -31,8 +31,8 @@
 #include <sys/select.h>
 #include <sys/queue.h>
 #include "dap_udp_client.h"
-#include "../../libdap-server/core_server/dap_server.h"
-#include "../core_server/client/dap_client_remote.h"
+#include "dap_server.h"
+#include "dap_client_remote.h"
 
 struct dap_udp_server;
 
-- 
GitLab