From 80fcfab9ce7b2d228cda5b95fa68ddec2a9f302e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Wed, 16 Sep 2020 10:42:02 +0100 Subject: [PATCH] access: ensure ACL files are rebuilt when protocol changes MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Meson is not told that the .x protocol files are an input for the generator, so it doesn't know to setup a rebuild dependancy. Reviewed-by: Erik Skultety Reviewed-by: Pavel Hrdina Signed-off-by: Daniel P. Berrangé --- src/access/meson.build | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/access/meson.build b/src/access/meson.build index b23838a776..1cffdae21a 100644 --- a/src/access/meson.build +++ b/src/access/meson.build @@ -34,38 +34,42 @@ foreach name : [ 'remote', 'qemu', 'lxc' ] access_gen_headers += custom_target( header_file, + input: protocol_file, output: header_file, command: [ - gendispatch_prog, '--mode=aclheader', name, name.to_upper(), protocol_file, + gendispatch_prog, '--mode=aclheader', name, name.to_upper(), '@INPUT@', ], capture: true, ) access_gen_sources += custom_target( source_file, + input: protocol_file, output: source_file, command: [ gendispatch_prog, '--mode=aclbody', name, name.to_upper(), - protocol_file, header_file, + '@INPUT@', header_file, ], capture: true, ) access_gen_sym += custom_target( syms_file, + input: protocol_file, output: syms_file, capture: true, command: [ - gendispatch_prog, '--mode=aclsym', name, name.to_upper(), protocol_file, + gendispatch_prog, '--mode=aclsym', name, name.to_upper(), '@INPUT@', ] ) access_gen_xml += custom_target( xml_file, + input: protocol_file, output: xml_file, capture: true, command: [ - gendispatch_prog, '--mode=aclapi', name, name.to_upper(), protocol_file, + gendispatch_prog, '--mode=aclapi', name, name.to_upper(), '@INPUT@', ], ) endforeach -- 2.47.2