move restd to library directory

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

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)

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