meson: build libnvme directly instead of as a subproject

Makefile

@@ -73,12 +73,11 @@ static:
 		--default-library=static \
 		--prefix=/usr \
 		-Dc_link_args="-static" \
-		-Dlibnvme:default_library=static \
-		-Dlibnvme:keyutils=disabled \
-		-Dlibnvme:liburing=disabled \
-		-Dlibnvme:python=disabled \
-		-Dlibnvme:openssl=disabled \
-		-Dlibnvme:tests=false \
-		-Dlibnvme:examples=false
+		-Dkeyutils=disabled \
+		-Dliburing=disabled \
+		-Dpython=disabled \
+		-Dopenssl=disabled \
+		-Dtests=false \
+		-Dexamples=false
 
 	meson compile -C ${BUILD-DIR}

libnvme/ccan/ccan/array_size/_info → ccan/ccan/array_size/_info

@@ -1,4 +1,3 @@
-#include "config.h"
 #include <stdio.h>
 #include <string.h>
 

libnvme/ccan/ccan/array_size/array_size.h → ccan/ccan/array_size/array_size.h

@@ -1,7 +1,6 @@
 /* CC0 (Public domain) - see LICENSE file for details */
 #ifndef CCAN_ARRAY_SIZE_H
 #define CCAN_ARRAY_SIZE_H
-#include "config.h"
 #include <ccan/build_assert/build_assert.h>
 
 /**

ccan/ccan/check_type/check_type.h

@@ -1,7 +1,6 @@
 /* CC0 (Public domain) - see LICENSE file for details */
 #ifndef CCAN_CHECK_TYPE_H
 #define CCAN_CHECK_TYPE_H
-#include "config.h"
 
 /**
  * check_type - issue a warning or build failure if type is not correct.

ccan/ccan/compiler/compiler.h

@@ -1,7 +1,6 @@
 /* CC0 (Public domain) - see LICENSE file for details */
 #ifndef CCAN_COMPILER_H
 #define CCAN_COMPILER_H
-#include "config.h"
 
 #ifndef COLD
 #if HAVE_ATTRIBUTE_COLD

ccan/ccan/container_of/container_of.h

@@ -3,7 +3,6 @@
 #define CCAN_CONTAINER_OF_H
 #include <stddef.h>
 
-#include "config.h"
 #include <ccan/check_type/check_type.h>
 
 /**

ccan/ccan/endian/endian.h

@@ -2,7 +2,6 @@
 #ifndef CCAN_ENDIAN_H
 #define CCAN_ENDIAN_H
 #include <stdint.h>
-#include "config.h"
 
 /**
  * BSWAP_16 - reverse bytes in a constant uint16_t value.

ccan/ccan/hash/hash.h

@@ -1,7 +1,6 @@
 /* CC0 (Public domain) - see LICENSE file for details */
 #ifndef CCAN_HASH_H
 #define CCAN_HASH_H
-#include "config.h"
 #include <stdint.h>
 #include <stdlib.h>
 #include <ccan/build_assert/build_assert.h>

ccan/ccan/htable/htable.h

@@ -1,7 +1,6 @@
 /* Licensed under LGPLv2+ - see LICENSE file for details */
 #ifndef CCAN_HTABLE_H
 #define CCAN_HTABLE_H
-#include "config.h"
 #include <ccan/str/str.h>
 #include <stdint.h>
 #include <stdbool.h>

ccan/ccan/htable/htable_type.h

@@ -3,7 +3,6 @@
 #define CCAN_HTABLE_TYPE_H
 #include <ccan/htable/htable.h>
 #include <ccan/compiler/compiler.h>
-#include "config.h"
 
 /**
  * HTABLE_DEFINE_TYPE - create a set of htable ops for a type

ccan/ccan/ilog/ilog.h

@@ -1,7 +1,6 @@
 /* CC0 (Public domain) - see LICENSE file for details */
 #if !defined(_ilog_H)
 # define _ilog_H (1)
-# include "config.h"
 # include <stdint.h>
 # include <limits.h>
 # include <ccan/compiler/compiler.h>

ccan/ccan/likely/likely.h

@@ -1,7 +1,6 @@
 /* CC0 (Public domain) - see LICENSE file for details */
 #ifndef CCAN_LIKELY_H
 #define CCAN_LIKELY_H
-#include "config.h"
 #include <stdbool.h>
 
 #ifndef CCAN_LIKELY_DEBUG

libnvme/ccan/ccan/minmax/_info → ccan/ccan/minmax/_info

@@ -1,4 +1,3 @@
-#include "config.h"
 #include <stdio.h>
 #include <string.h>
 

libnvme/ccan/ccan/minmax/minmax.h → ccan/ccan/minmax/minmax.h

@@ -2,7 +2,6 @@
 #ifndef CCAN_MINMAX_H
 #define CCAN_MINMAX_H
 
-#include "config.h"
 
 #include <ccan/build_assert/build_assert.h>
 

ccan/ccan/str/debug.c

@@ -1,5 +1,4 @@
 /* CC0 (Public domain) - see LICENSE file for details */
-#include "config.h"
 #include <ccan/str/str_debug.h>
 #include <assert.h>
 #include <ctype.h>

ccan/ccan/str/str.h

@@ -1,7 +1,6 @@
 /* CC0 (Public domain) - see LICENSE file for details */
 #ifndef CCAN_STR_H
 #define CCAN_STR_H
-#include "config.h"
 #include <string.h>
 #include <stdbool.h>
 #include <limits.h>

ccan/ccan/strset/strset.h

@@ -1,6 +1,5 @@
 #ifndef CCAN_STRSET_H
 #define CCAN_STRSET_H
-#include "config.h"
 #include <ccan/typesafe_cb/typesafe_cb.h>
 #include <stdlib.h>
 #include <stdbool.h>

ccan/ccan/typesafe_cb/typesafe_cb.h

@@ -1,7 +1,6 @@
 /* CC0 (Public domain) - see LICENSE file for details */
 #ifndef CCAN_TYPESAFE_CB_H
 #define CCAN_TYPESAFE_CB_H
-#include "config.h"
 
 #if HAVE_TYPEOF && HAVE_BUILTIN_CHOOSE_EXPR && HAVE_BUILTIN_TYPES_COMPATIBLE_P
 /**

ccan/meson.build

@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
-sources += files([
+sources = [
     'ccan/hash/hash.c',
     'ccan/htable/htable.c',
     'ccan/ilog/ilog.c',
@@ -9,9 +9,17 @@ sources += files([
     'ccan/str/debug.c',
     'ccan/str/str.c',
     'ccan/strset/strset.c',
-])
+]
 
 if get_option('buildtype') == 'debug'
     add_project_arguments('-DCCAN_LIST_DEBUG=1',  language : ['c'])
     add_project_arguments('-DCCAN_STR_DEBUG=1',  language : ['c'])
 endif
+
+libccan = static_library(
+    'ccan',
+    sources,
+    install: false,
+    include_directories: [incdir, ],
+    dependencies: [config_dep, ],
+)