ccan: Add *.c files to the build

We are missing the *.c files from the ccan code base in the build.
As we currently don't use any function implemented in the *.c files
all just works.

Signed-off-by: Daniel Wagner <dwagner@suse.de>

diff --git a/ccan/meson.build b/ccan/meson.build
index f24b94f5b9452e92e13c021051e3107e02280f8b..7268710da6fa1f856c3b460bc2f8ae0cacf6d77d 100644 (file)
--- a/ccan/meson.build
+++ b/ccan/meson.build
@@ -5,6 +5,13 @@
 #
 # Authors: Martin Belanger <Martin.Belanger@dell.com>
 #
+
+sources += files([
+    'ccan/list/list.c',
+    'ccan/str/debug.c',
+    'ccan/str/str.c',
+])
+
 configurator = executable(
     'configurator',
     ['tools/configurator/configurator.c'],

diff --git a/meson.build b/meson.build
index ea7c51651586d1fed60ab44158c3ee84725259f6..74a89513cb5ff9750e298cc50972966729f41634 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -208,6 +208,8 @@ add_project_arguments(['-fomit-frame-pointer', '-D_GNU_SOURCE', '-include', 'con
 incdir = include_directories(['.', 'ccan', 'src'])
 
 ################################################################################
+sources = []
+subdir('ccan')
 subdir('src')
 subdir('pynvme')
 subdir('test')

diff --git a/src/meson.build b/src/meson.build
index 1fe04e7fe4ebde630410a1f1c1996b1999a7497e..3651aa12c94eab80ea89d17d0713672f6efb1c9c 100644 (file)
--- a/src/meson.build
+++ b/src/meson.build
@@ -5,7 +5,7 @@
 #
 # Authors: Martin Belanger <Martin.Belanger@dell.com>
 #
-sources = [
+sources += [
     'nvme/cleanup.c',
     'nvme/fabrics.c',
     'nvme/filters.c',