diff options
| -rw-r--r-- | src/udev/meson.build | 38 | ||||
| -rw-r--r-- | test/meson.build | 4 |
2 files changed, 21 insertions, 21 deletions
diff --git a/src/udev/meson.build b/src/udev/meson.build index 4e80f9bfd7..0527403398 100644 --- a/src/udev/meson.build +++ b/src/udev/meson.build @@ -115,42 +115,40 @@ libudevd_core = static_library( link_with : udev_link_with, dependencies : [libblkid, libkmod]) -udev_id_progs = [['ata_id/ata_id.c'], - ['cdrom_id/cdrom_id.c'], - ['fido_id/fido_id.c', - 'fido_id/fido_id_desc.c', - 'fido_id/fido_id_desc.h'], - ['scsi_id/scsi_id.c', - 'scsi_id/scsi_id.h', - 'scsi_id/scsi_serial.c', - 'scsi_id/scsi.h'], - ['v4l_id/v4l_id.c'], - ['mtd_probe/mtd_probe.c', - 'mtd_probe/mtd_probe.h', - 'mtd_probe/probe_smartmedia.c']] +udev_progs = [['ata_id/ata_id.c'], + ['cdrom_id/cdrom_id.c'], + ['fido_id/fido_id.c', + 'fido_id/fido_id_desc.c', + 'fido_id/fido_id_desc.h'], + ['scsi_id/scsi_id.c', + 'scsi_id/scsi_id.h', + 'scsi_id/scsi_serial.c', + 'scsi_id/scsi.h'], + ['v4l_id/v4l_id.c'], + ['mtd_probe/mtd_probe.c', + 'mtd_probe/mtd_probe.h', + 'mtd_probe/probe_smartmedia.c']] dmi_arches = ['x86', 'x86_64', 'aarch64', 'arm', 'ia64', 'mips'] if dmi_arches.contains(host_machine.cpu_family()) - udev_id_progs += [['dmi_memory_id/dmi_memory_id.c']] + udev_progs += [['dmi_memory_id/dmi_memory_id.c']] endif -foreach prog : udev_id_progs +udev_prog_paths = {} +foreach prog : udev_progs name = prog[0].split('/')[0] exe = executable( name, prog, include_directories : includes, - dependencies : [versiondep], + dependencies : versiondep, link_with : udev_link_with, install_rpath : udev_rpath, install : true, install_dir : udevlibexecdir) - # TODO: let's use a dictionary instead as soon as we can depend on meson >= 0.47. - if name == 'dmi_memory_id' - dmi_memory_id_path = exe.full_path() - endif + udev_prog_paths += {name : exe.full_path()} endforeach if install_sysconfdir_samples diff --git a/test/meson.build b/test/meson.build index 47c7f4d49a..c39d2ab7ac 100644 --- a/test/meson.build +++ b/test/meson.build @@ -145,7 +145,9 @@ if want_tests != 'false' and dmi_arches.contains(host_machine.cpu_family()) test(name, udev_dmi_memory_id_test, - args : [dmi_memory_id_path, source, source + '.txt']) + args : [udev_prog_paths['dmi_memory_id'], + source, + source + '.txt']) endforeach endif |