Skip to content

Commit 8ebfcfe

Browse files
committed
build: Use _dep postfix for all dependency objects
Use consistently _dep postfix for all dependency objects. Signed-off-by: Daniel Wagner <[email protected]>
1 parent 809e00b commit 8ebfcfe

3 files changed

Lines changed: 7 additions & 7 deletions

File tree

meson.build

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ pkgconfiglibdir = get_option('pkgconfiglibdir') == '' ? join_paths(libdir, 'pkgc
3434
conf = configuration_data()
3535

3636
# Check for libuuid availability
37-
libuuid = dependency('uuid', required: true)
38-
conf.set('CONFIG_LIBUUID', libuuid.found(), description: 'Is libuuid required?')
37+
libuuid_dep = dependency('uuid', required: true)
38+
conf.set('CONFIG_LIBUUID', libuuid_dep.found(), description: 'Is libuuid required?')
3939

4040
# Check for json-c availability
41-
json_c = dependency('json-c', version: '>=0.13', fallback : ['json-c', 'json_c_dep'])
42-
conf.set('CONFIG_JSONC', json_c.found(), description: 'Is json-c required?')
41+
json_c_dep = dependency('json-c', version: '>=0.13', fallback : ['json-c', 'json_c_dep'])
42+
conf.set('CONFIG_JSONC', json_c_dep.found(), description: 'Is json-c required?')
4343

4444
# local (cross-compilable) implementations of ccan configure steps
4545
conf.set10(

src/meson.build

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ if conf.get('CONFIG_JSONC')
2121
endif
2222

2323
deps = [
24-
libuuid,
25-
json_c,
24+
libuuid_dep,
25+
json_c_dep,
2626
]
2727

2828
source_dir = meson.current_source_dir()

test/meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
main = executable(
99
'main-test',
1010
['test.c'],
11-
dependencies: libuuid,
11+
dependencies: libuuid_dep,
1212
link_with: libnvme,
1313
include_directories: [incdir, internal_incdir]
1414
)

0 commit comments

Comments
 (0)