Skip to content

Commit 363f4d9

Browse files
author
Martin Belanger
committed
meson: build libnvme directly instead of as a subproject
Change the build flow so that libnvme is no longer defined as a Meson subproject of nvme-cli. Instead, include libnvme's meson.build directly from the top-level meson.build. This allows sharing a common ccan directory between nvme-cli and libnvme, and generates a single configuration header, project-config.h (formerly config.h), used by all components. The old file name conflicted with plugins/solidigm/solidigm-telemetry/config.h, hence the rename. Also reformat all meson.build files to fix indentation inconsistencies and other cosmetic discrepancies. Signed-off-by: Martin Belanger <[email protected]>
1 parent 75ef834 commit 363f4d9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+1114
-3520
lines changed

Documentation/meson.build

Lines changed: 344 additions & 342 deletions
Large diffs are not rendered by default.
File renamed without changes.

libnvme/ccan/ccan/array_size/_info renamed to ccan/ccan/array_size/_info

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#include "config.h"
21
#include <stdio.h>
32
#include <string.h>
43

libnvme/ccan/ccan/array_size/array_size.h renamed to ccan/ccan/array_size/array_size.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
/* CC0 (Public domain) - see LICENSE file for details */
22
#ifndef CCAN_ARRAY_SIZE_H
33
#define CCAN_ARRAY_SIZE_H
4-
#include "config.h"
54
#include <ccan/build_assert/build_assert.h>
65

76
/**

ccan/ccan/check_type/check_type.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
/* CC0 (Public domain) - see LICENSE file for details */
22
#ifndef CCAN_CHECK_TYPE_H
33
#define CCAN_CHECK_TYPE_H
4-
#include "config.h"
54

65
/**
76
* check_type - issue a warning or build failure if type is not correct.

ccan/ccan/compiler/compiler.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
/* CC0 (Public domain) - see LICENSE file for details */
22
#ifndef CCAN_COMPILER_H
33
#define CCAN_COMPILER_H
4-
#include "config.h"
54

65
#ifndef COLD
76
#if HAVE_ATTRIBUTE_COLD

ccan/ccan/container_of/container_of.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
#define CCAN_CONTAINER_OF_H
44
#include <stddef.h>
55

6-
#include "config.h"
76
#include <ccan/check_type/check_type.h>
87

98
/**

ccan/ccan/endian/endian.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
#ifndef CCAN_ENDIAN_H
33
#define CCAN_ENDIAN_H
44
#include <stdint.h>
5-
#include "config.h"
65

76
/**
87
* BSWAP_16 - reverse bytes in a constant uint16_t value.

ccan/ccan/hash/hash.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
/* CC0 (Public domain) - see LICENSE file for details */
22
#ifndef CCAN_HASH_H
33
#define CCAN_HASH_H
4-
#include "config.h"
54
#include <stdint.h>
65
#include <stdlib.h>
76
#include <ccan/build_assert/build_assert.h>

ccan/ccan/htable/htable.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
/* Licensed under LGPLv2+ - see LICENSE file for details */
22
#ifndef CCAN_HTABLE_H
33
#define CCAN_HTABLE_H
4-
#include "config.h"
54
#include <ccan/str/str.h>
65
#include <stdint.h>
76
#include <stdbool.h>

0 commit comments

Comments
 (0)