Rework build files so we can do testing

Signed-off-by: Jonathan Dieter <jdieter@gmail.com>

diff --git a/src/lib/comp/meson.build b/src/lib/comp/meson.build
index 0690aa046243495084c47a868dfd6492be4050ef..a6edc00efe3e3f895759cdfa02b1f8d23c9b78a2 100644 (file)
--- a/src/lib/comp/meson.build
+++ b/src/lib/comp/meson.build
@@ -1,4 +1,4 @@
-sources += ['comp/comp.c']
+lib_sources += files('comp.c')
 if use_zstd == 'yes'
         subdir('zstd')
 endif

diff --git a/src/lib/comp/nocomp/meson.build b/src/lib/comp/nocomp/meson.build
index 0a5e5c329176ddc4050716518073b85ee8b9d0a9..6a310d9c9d617de3da9a806fb8ac3f791de7849f 100644 (file)
--- a/src/lib/comp/nocomp/meson.build
+++ b/src/lib/comp/nocomp/meson.build
@@ -1 +1 @@
-sources += ['comp/nocomp/nocomp.c']
+lib_sources += files('nocomp.c')

diff --git a/src/lib/comp/zstd/meson.build b/src/lib/comp/zstd/meson.build
index 2bd8b5bbe438cc9b200640a19697c6f5e2aa5350..13de59dfb47464dc9e0e9b705e2f8cfef6566bb9 100644 (file)
--- a/src/lib/comp/zstd/meson.build
+++ b/src/lib/comp/zstd/meson.build
@@ -1 +1 @@
-sources += ['comp/zstd/zstd.c']
+lib_sources += files('zstd.c')

diff --git a/src/lib/dl/meson.build b/src/lib/dl/meson.build
index 3e302bee9469e279c912ee78c95527168c8976e9..eb8caf64e373c590e7a4ee368a3fbf70763e3054 100644 (file)
--- a/src/lib/dl/meson.build
+++ b/src/lib/dl/meson.build
@@ -1 +1 @@
-sources += ['dl/range.c', 'dl/dl.c', 'dl/multipart.c']
+lib_sources += files(['range.c', 'dl.c', 'multipart.c'])

diff --git a/src/lib/hash/meson.build b/src/lib/hash/meson.build
index a70a9d7ecfd14c762e380f602c937192731901df..661e94a7e6ce1d9ed8fe725afa912ea8da4b362e 100644 (file)
--- a/src/lib/hash/meson.build
+++ b/src/lib/hash/meson.build
@@ -1,3 +1,3 @@
-sources += ['hash/hash.c']
+lib_sources += files('hash.c')
 subdir('sha1')
 subdir('sha2')

diff --git a/src/lib/hash/sha1/meson.build b/src/lib/hash/sha1/meson.build
index b75c4f75b05c2cea919ebd5c781534cfe311e194..cb912d4058187860da186fdedd8f24cecc27cc9f 100644 (file)
--- a/src/lib/hash/sha1/meson.build
+++ b/src/lib/hash/sha1/meson.build
@@ -1 +1 @@
-sources += ['hash/sha1/sha1.c']
+lib_sources += files('sha1.c')

diff --git a/src/lib/hash/sha2/meson.build b/src/lib/hash/sha2/meson.build
index c2c4b291b21daa00bde98aa9c86b1536c66d22f3..172caa9eab4c2994115634625b414b143e0eb01d 100644 (file)
--- a/src/lib/hash/sha2/meson.build
+++ b/src/lib/hash/sha2/meson.build
@@ -1 +1 @@
-sources += ['hash/sha2/sha2.c']
+lib_sources += files('sha2.c')

diff --git a/src/lib/index/meson.build b/src/lib/index/meson.build
index 6cc49992ffc1ad2c3c5d9848cdc6df104d79e28e..45b81c9f4c2887ba77ea0145f0f2319cdddd4389 100644 (file)
--- a/src/lib/index/meson.build
+++ b/src/lib/index/meson.build
@@ -1 +1 @@
-sources += ['index/index_create.c', 'index/index_read.c', 'index/index_common.c']
+lib_sources += files(['index_create.c', 'index_read.c', 'index_common.c'])

diff --git a/src/lib/meson.build b/src/lib/meson.build
index ae053066c0ae40d744d1a61cb327853c45d0b77f..d71971200f148f67966c45bf24f3195cecebdb4d 100644 (file)
--- a/src/lib/meson.build
+++ b/src/lib/meson.build
@@ -1,12 +1,12 @@
-sources = []
+lib_sources = files()
 add_global_arguments('-fvisibility=hidden', language : 'c')
 subdir('comp')
 subdir('hash')
 subdir('index')
 subdir('dl')
-sources += ['zck.c', 'header.c', 'io.c', 'log.c', 'compint.c']
+lib_sources += files('zck.c', 'header.c', 'io.c', 'log.c', 'compint.c')
 zcklib = shared_library('zck',
-                        sources,
+                        lib_sources,
                         include_directories: inc,
                         dependencies: [zstd_dep, curl_dep],
                         install: true,