aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--block/meson.build18
1 files changed, 9 insertions, 9 deletions
diff --git a/block/meson.build b/block/meson.build
index e687c54dbc..9e3388f633 100644
--- a/block/meson.build
+++ b/block/meson.build
@@ -71,19 +71,19 @@ block_modules = {}
modsrc = []
foreach m : [
- [curl, 'curl', [curl, glib], 'curl.c'],
- [glusterfs, 'gluster', glusterfs, 'gluster.c'],
- [libiscsi, 'iscsi', libiscsi, 'iscsi.c'],
- [libnfs, 'nfs', libnfs, 'nfs.c'],
- [libssh, 'ssh', libssh, 'ssh.c'],
- [rbd, 'rbd', rbd, 'rbd.c'],
+ [curl, 'curl', files('curl.c')],
+ [glusterfs, 'gluster', files('gluster.c')],
+ [libiscsi, 'iscsi', files('iscsi.c')],
+ [libnfs, 'nfs', files('nfs.c')],
+ [libssh, 'ssh', files('ssh.c')],
+ [rbd, 'rbd', files('rbd.c')],
]
if m[0].found()
+ module_ss = ss.source_set()
+ module_ss.add(when: m[0], if_true: m[2])
if enable_modules
- modsrc += files(m[3])
+ modsrc += module_ss.all_sources()
endif
- module_ss = ss.source_set()
- module_ss.add(when: m[2], if_true: files(m[3]))
block_modules += {m[1] : module_ss}
endif
endforeach