From ecd7d9918f0206dacb992cdc3691285d35b13998 Mon Sep 17 00:00:00 2001 From: Tokunori Ikegami Date: Sat, 14 Dec 2024 22:30:47 +0900 Subject: [PATCH] plugins: build plugins not depended on json without json Some plugins do not use json so no need to check the build dependency. Signed-off-by: Tokunori Ikegami --- plugins/meson.build | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/plugins/meson.build b/plugins/meson.build index 35a9604ba6..a0f26fca5a 100644 --- a/plugins/meson.build +++ b/plugins/meson.build @@ -5,34 +5,38 @@ if json_c_dep.found() 'plugins/amzn/amzn-nvme.c', 'plugins/dapustor/dapustor-nvme.c', 'plugins/dell/dell-nvme.c', - 'plugins/dera/dera-nvme.c', 'plugins/fdp/fdp.c', 'plugins/huawei/huawei-nvme.c', - 'plugins/innogrit/innogrit-nvme.c', - 'plugins/inspur/inspur-nvme.c', 'plugins/intel/intel-nvme.c', - 'plugins/memblaze/memblaze-nvme.c', 'plugins/micron/micron-nvme.c', 'plugins/nbft/nbft-plugin.c', 'plugins/netapp/netapp-nvme.c', 'plugins/nvidia/nvidia-nvme.c', 'plugins/scaleflux/sfx-nvme.c', 'plugins/seagate/seagate-nvme.c', - 'plugins/shannon/shannon-nvme.c', 'plugins/solidigm/solidigm-nvme.c', - 'plugins/toshiba/toshiba-nvme.c', - 'plugins/transcend/transcend-nvme.c', - 'plugins/virtium/virtium-nvme.c', + 'plugins/ssstc/ssstc-nvme.c', 'plugins/wdc/wdc-nvme.c', 'plugins/wdc/wdc-utils.c', - 'plugins/ymtc/ymtc-nvme.c', - 'plugins/zns/zns.c', - 'plugins/ssstc/ssstc-nvme.c', ] subdir('solidigm') - if conf.get('HAVE_SED_OPAL') != 0 - subdir('sed') - endif endif +sources += [ + 'plugins/dera/dera-nvme.c', + 'plugins/innogrit/innogrit-nvme.c', + 'plugins/inspur/inspur-nvme.c', + 'plugins/memblaze/memblaze-nvme.c', + 'plugins/shannon/shannon-nvme.c', + 'plugins/toshiba/toshiba-nvme.c', + 'plugins/transcend/transcend-nvme.c', + 'plugins/virtium/virtium-nvme.c', + 'plugins/ymtc/ymtc-nvme.c', + 'plugins/zns/zns.c', + ] + subdir('ocp') + +if conf.get('HAVE_SED_OPAL') != 0 + subdir('sed') +endif