From: Jonathan Dieter <jdieter@gmail.com>
Date: Sat, 21 Apr 2018 11:25:04 +0000 (+0300)
Subject: Rework build files so we can do testing
X-Git-Tag: archive/raspbian/1.1.9+ds1-1+rpi1~1^2~302
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c64294b81049fa8bf9448da71fc6967fef5a256b;p=zchunk.git

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 0690aa0..a6edc00 100644
--- 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 0a5e5c3..6a310d9 100644
--- 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 2bd8b5b..13de59d 100644
--- 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 3e302be..eb8caf6 100644
--- 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 a70a9d7..661e94a 100644
--- 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 b75c4f7..cb912d4 100644
--- 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 c2c4b29..172caa9 100644
--- 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 6cc4999..45b81c9 100644
--- 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 ae05306..d719712 100644
--- 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,