From: Daniel Wagner <dwagner@suse.de>
Date: Fri, 22 Oct 2021 07:15:39 +0000 (+0200)
Subject: ccan: Add *.c files to the build
X-Git-Tag: v1.0-rc0~64^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=b44bbc505a8f73dcb6d2cdbe21b935a4b16a74c0;p=users%2Fsagi%2Flibnvme.git

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 f24b94f5..7268710d 100644
--- 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 ea7c5165..74a89513 100644
--- 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 1fe04e7f..3651aa12 100644
--- 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',