Merge pull request #75 from jhunkeler/delivery-lib

Move delivery_*.c sources into their own library

12 files changed, 18 insertions, 6 deletions

diff --git a/src/cli/stasis/CMakeLists.txt b/src/cli/stasis/CMakeLists.txt
index ff7fd88..1996c4c 100644
--- a/src/cli/stasis/CMakeLists.txt
+++ b/src/cli/stasis/CMakeLists.txt
@@ -1,4 +1,3 @@
-include_directories(${CMAKE_SOURCE_DIR})
 add_executable(stasis
         stasis_main.c
         args.c
@@ -6,7 +5,15 @@ add_executable(stasis
         system_requirements.c
         tpl.c
 )
-target_link_libraries(stasis PRIVATE stasis_core)
+target_link_libraries(stasis PRIVATE
+        stasis_core
+        stasis_delivery
+)
+target_include_directories(stasis PRIVATE
+        ${core_INCLUDE}
+        ${delivery_INCLUDE}
+        ${CMAKE_CURRENT_SOURCE_DIR}/include
+)
 target_link_libraries(stasis PUBLIC LibXml2::LibXml2)
 
 install(TARGETS stasis RUNTIME)
diff --git a/src/cli/stasis/args.h b/src/cli/stasis/include/args.h
index 5bad752..5bad752 100644
--- a/src/cli/stasis/args.h
+++ b/src/cli/stasis/include/args.h
diff --git a/src/cli/stasis/callbacks.h b/src/cli/stasis/include/callbacks.h
index 369ce56..369ce56 100644
--- a/src/cli/stasis/callbacks.h
+++ b/src/cli/stasis/include/callbacks.h
diff --git a/src/cli/stasis/system_requirements.h b/src/cli/stasis/include/system_requirements.h
index ddc2705..ddc2705 100644
--- a/src/cli/stasis/system_requirements.h
+++ b/src/cli/stasis/include/system_requirements.h
diff --git a/src/cli/stasis/tpl.h b/src/cli/stasis/include/tpl.h
index 398f0fe..398f0fe 100644
--- a/src/cli/stasis/tpl.h
+++ b/src/cli/stasis/include/tpl.h
diff --git a/src/cli/stasis_indexer/CMakeLists.txt b/src/cli/stasis_indexer/CMakeLists.txt
index 1d4c658..8c00ce4 100644
--- a/src/cli/stasis_indexer/CMakeLists.txt
+++ b/src/cli/stasis_indexer/CMakeLists.txt
@@ -5,11 +5,16 @@ add_executable(stasis_indexer
         helpers.c
         junitxml_report.c
         website.c
-        website.h
         readmes.c
-        readmes.h
 )
-target_include_directories(stasis_indexer PRIVATE ${CMAKE_SOURCE_DIR})
-target_link_libraries(stasis_indexer PRIVATE stasis_core)
+target_include_directories(stasis_indexer PRIVATE
+        ${core_INCLUDE}
+        ${delivery_INCLUDE}
+        ${CMAKE_CURRENT_SOURCE_DIR}/include
+)
+target_link_libraries(stasis_indexer PRIVATE
+        stasis_core
+        stasis_delivery
+)
 
 install(TARGETS stasis_indexer RUNTIME)
diff --git a/src/cli/stasis_indexer/args.h b/src/cli/stasis_indexer/include/args.h
index 543aa4b..543aa4b 100644
--- a/src/cli/stasis_indexer/args.h
+++ b/src/cli/stasis_indexer/include/args.h
diff --git a/src/cli/stasis_indexer/callbacks.h b/src/cli/stasis_indexer/include/callbacks.h
index 7d95cbb..7d95cbb 100644
--- a/src/cli/stasis_indexer/callbacks.h
+++ b/src/cli/stasis_indexer/include/callbacks.h
diff --git a/src/cli/stasis_indexer/helpers.h b/src/cli/stasis_indexer/include/helpers.h
index d493f75..d493f75 100644
--- a/src/cli/stasis_indexer/helpers.h
+++ b/src/cli/stasis_indexer/include/helpers.h
diff --git a/src/cli/stasis_indexer/junitxml_report.h b/src/cli/stasis_indexer/include/junitxml_report.h
index 6d2a248..6d2a248 100644
--- a/src/cli/stasis_indexer/junitxml_report.h
+++ b/src/cli/stasis_indexer/include/junitxml_report.h
diff --git a/src/cli/stasis_indexer/readmes.h b/src/cli/stasis_indexer/include/readmes.h
index d4fa7ac..d4fa7ac 100644
--- a/src/cli/stasis_indexer/readmes.h
+++ b/src/cli/stasis_indexer/include/readmes.h
diff --git a/src/cli/stasis_indexer/website.h b/src/cli/stasis_indexer/include/website.h
index e67d58b..e67d58b 100644
--- a/src/cli/stasis_indexer/website.h
+++ b/src/cli/stasis_indexer/include/website.h