From d01399dd7f14115352d42ea4a8ad4757c2d28344 Mon Sep 17 00:00:00 2001
From: NADAL Jean-Baptiste <jbnadal@awox.com>
Date: Thu, 20 Feb 2020 12:15:53 +0100
Subject: [PATCH] move restd to library directory

---
 CMakeLists.txt                    | 2 +-
 lib/CMakeLists.txt                | 6 +-----
 {src/rest => lib/include}/restd.h | 0
 {src/rest => lib/src}/restd.c     | 0
 src/CMakeLists.txt                | 4 ++--
 5 files changed, 4 insertions(+), 8 deletions(-)
 rename {src/rest => lib/include}/restd.h (100%)
 rename {src/rest => lib/src}/restd.c (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ddcf64a..51e86b1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,7 +30,7 @@ add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../qlibc ${CMAKE_CURRENT_BINARY_DIR
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../libevent ${CMAKE_CURRENT_BINARY_DIR}/libevent)
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../nats.c ${CMAKE_CURRENT_BINARY_DIR}/nats.c)
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../json-c ${CMAKE_CURRENT_BINARY_DIR}/json-c)
-
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/lib)
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/src)
 
 add_custom_target (static_analysis
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index c175995..6948171 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -12,8 +12,4 @@ include_directories (${CMAKE_BINARY_DIR}/libevent/include)
 include_directories (${CMAKE_SOURCE_DIR}/../qlibc/include)
 include_directories (${CMAKE_CURRENT_SOURCE_DIR}/include)
 
-add_library(restd-static STATIC 
-                src/restd_server.c
-                src/restd_http_handler.c
-                src/restd_rest_handler.c
-            )
+add_library(restd-static STATIC src/restd.c)
diff --git a/src/rest/restd.h b/lib/include/restd.h
similarity index 100%
rename from src/rest/restd.h
rename to lib/include/restd.h
diff --git a/src/rest/restd.c b/lib/src/restd.c
similarity index 100%
rename from src/rest/restd.c
rename to lib/src/restd.c
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8e3478d..a1dc04f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -31,7 +31,6 @@ file(
 	devices/outlet_dio.c
 	devices/shutter.c
 	devices/sprinkler.c
-	rest/restd.c
 	rest/rest_devices_handlers.c
 	rest/rest_server.c
 )
@@ -44,10 +43,10 @@ target_link_libraries (${PROJECT_NAME}
 	nats_static
 	qlibc-static
 	qlibcext-static
+	restd-static
 	json-c
 	event
 	event_pthreads
-
 )
 
 install (TARGETS ${PROJECT_NAME} DESTINATION local/bin)
@@ -70,6 +69,7 @@ add_executable (test_device tests/test_main.c ${source_files})
 target_link_libraries (test_device 
 	LINK_PUBLIC
 	nats_static
+	restd-static
 	qlibcext-static
 	qlibc-static
 	json-c