Move delivery_*.c sources into their own library

17 files changed, 30 insertions, 15 deletions

diff --git a/src/cli/stasis/CMakeLists.txt b/src/cli/stasis/CMakeLists.txt
index ff7fd88..da63d57 100644
--- a/src/cli/stasis/CMakeLists.txt
+++ b/src/cli/stasis/CMakeLists.txt
@@ -6,7 +6,10 @@ 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_link_libraries(stasis PUBLIC LibXml2::LibXml2)
 
 install(TARGETS stasis RUNTIME)
diff --git a/src/cli/stasis_indexer/CMakeLists.txt b/src/cli/stasis_indexer/CMakeLists.txt
index 1d4c658..b100925 100644
--- a/src/cli/stasis_indexer/CMakeLists.txt
+++ b/src/cli/stasis_indexer/CMakeLists.txt
@@ -10,6 +10,9 @@ add_executable(stasis_indexer
         readmes.h
 )
 target_include_directories(stasis_indexer PRIVATE ${CMAKE_SOURCE_DIR})
-target_link_libraries(stasis_indexer PRIVATE stasis_core)
+target_link_libraries(stasis_indexer PRIVATE
+        stasis_core
+        stasis_delivery
+)
 
 install(TARGETS stasis_indexer RUNTIME)
diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
index 82bfe4a..187ddb2 100644
--- a/src/lib/CMakeLists.txt
+++ b/src/lib/CMakeLists.txt
@@ -1 +1,2 @@
-add_subdirectory(core)
\ No newline at end of file
+add_subdirectory(core)
+add_subdirectory(delivery)
\ No newline at end of file
diff --git a/src/lib/core/CMakeLists.txt b/src/lib/core/CMakeLists.txt
index c569187..522f20f 100644
--- a/src/lib/core/CMakeLists.txt
+++ b/src/lib/core/CMakeLists.txt
@@ -10,17 +10,6 @@ add_library(stasis_core STATIC
         utils.c
         system.c
         download.c
-        delivery_postprocess.c
-        delivery_conda.c
-        delivery_docker.c
-        delivery_install.c
-        delivery_artifactory.c
-        delivery_test.c
-        delivery_build.c
-        delivery_show.c
-        delivery_populate.c
-        delivery_init.c
-        delivery.c
         recipe.c
         relocation.c
         wheel.c
diff --git a/src/lib/delivery/CMakeLists.txt b/src/lib/delivery/CMakeLists.txt
new file mode 100644
index 0000000..19e2c80
--- /dev/null
+++ b/src/lib/delivery/CMakeLists.txt
@@ -0,0 +1,16 @@
+include_directories(${PROJECT_BINARY_DIR})
+
+add_library(stasis_delivery STATIC
+        delivery_postprocess.c
+        delivery_conda.c
+        delivery_docker.c
+        delivery_install.c
+        delivery_artifactory.c
+        delivery_test.c
+        delivery_build.c
+        delivery_show.c
+        delivery_populate.c
+        delivery_init.c
+        delivery.c
+)
+target_link_libraries(stasis_delivery stasis_core)
\ No newline at end of file
diff --git a/src/lib/core/delivery.c b/src/lib/delivery/delivery.c
index aa3e51a..aa3e51a 100644
--- a/src/lib/core/delivery.c
+++ b/src/lib/delivery/delivery.c
diff --git a/src/lib/core/delivery_artifactory.c b/src/lib/delivery/delivery_artifactory.c
index 9ad5829..9ad5829 100644
--- a/src/lib/core/delivery_artifactory.c
+++ b/src/lib/delivery/delivery_artifactory.c
diff --git a/src/lib/core/delivery_build.c b/src/lib/delivery/delivery_build.c
index fa19f95..fa19f95 100644
--- a/src/lib/core/delivery_build.c
+++ b/src/lib/delivery/delivery_build.c
diff --git a/src/lib/core/delivery_conda.c b/src/lib/delivery/delivery_conda.c
index 8974ae8..8974ae8 100644
--- a/src/lib/core/delivery_conda.c
+++ b/src/lib/delivery/delivery_conda.c
diff --git a/src/lib/core/delivery_docker.c b/src/lib/delivery/delivery_docker.c
index 57015ad..57015ad 100644
--- a/src/lib/core/delivery_docker.c
+++ b/src/lib/delivery/delivery_docker.c
diff --git a/src/lib/core/delivery_init.c b/src/lib/delivery/delivery_init.c
index 2fced03..2fced03 100644
--- a/src/lib/core/delivery_init.c
+++ b/src/lib/delivery/delivery_init.c
diff --git a/src/lib/core/delivery_install.c b/src/lib/delivery/delivery_install.c
index a348346..a348346 100644
--- a/src/lib/core/delivery_install.c
+++ b/src/lib/delivery/delivery_install.c
diff --git a/src/lib/core/delivery_populate.c b/src/lib/delivery/delivery_populate.c
index c699545..c699545 100644
--- a/src/lib/core/delivery_populate.c
+++ b/src/lib/delivery/delivery_populate.c
diff --git a/src/lib/core/delivery_postprocess.c b/src/lib/delivery/delivery_postprocess.c
index 40ac43f..40ac43f 100644
--- a/src/lib/core/delivery_postprocess.c
+++ b/src/lib/delivery/delivery_postprocess.c
diff --git a/src/lib/core/delivery_show.c b/src/lib/delivery/delivery_show.c
index adfa1be..adfa1be 100644
--- a/src/lib/core/delivery_show.c
+++ b/src/lib/delivery/delivery_show.c
diff --git a/src/lib/core/delivery_test.c b/src/lib/delivery/delivery_test.c
index e80e0ec..e80e0ec 100644
--- a/src/lib/core/delivery_test.c
+++ b/src/lib/delivery/delivery_test.c
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index e35d88d..2564d03 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -36,7 +36,10 @@ foreach(source_file ${source_files})
     elseif (CMAKE_C_COMPILER_ID STREQUAL "MSVC")
         target_compile_options(${test_executable} PRIVATE ${win_cflags} ${win_msvc_cflags})
     endif()
-    target_link_libraries(${test_executable} PRIVATE stasis_core)
+    target_link_libraries(${test_executable} PRIVATE
+            stasis_core
+            stasis_delivery
+    )
     add_test(${test_executable} ${test_executable})
     set_tests_properties(${test_executable}
             PROPERTIES