Fix custom_target breakage
The recent meson format commit reordered arguments of some
custom_target calls, where the code expected the first input to be the
script being run. Hardcode that argument instead.
Signed-off-by: Matt Spinler <spinler@us.ibm.com>
Change-Id: I2d895da8ad2ddb0aba3a545129ff698438f8eaa7
diff --git a/control/meson.build b/control/meson.build
index cbbea54..5224c55 100644
--- a/control/meson.build
+++ b/control/meson.build
@@ -45,6 +45,7 @@
'json/triggers/timer.cpp',
]
else
+ script = files('gen-fan-zone-defs.py')
fan_zone_defs_cpp_dep = custom_target(
'fan_zone_defs.cpp',
input: files(
@@ -52,19 +53,18 @@
conf.get_unquoted('FAN_ZONE_YAML_FILE'),
conf.get_unquoted('ZONE_EVENTS_YAML_FILE'),
conf.get_unquoted('ZONE_CONDITIONS_YAML_FILE'),
- './gen-fan-zone-defs.py',
),
command: [
python_prog,
- '@INPUT0@',
+ script,
'-f',
- '@INPUT1@',
+ '@INPUT0@',
'-z',
- '@INPUT2@',
+ '@INPUT1@',
'-e',
- '@INPUT3@',
+ '@INPUT2@',
'-c',
- '@INPUT4@',
+ '@INPUT3@',
'-o',
'control',
],
diff --git a/presence/meson.build b/presence/meson.build
index 11db05a..e8f5476 100644
--- a/presence/meson.build
+++ b/presence/meson.build
@@ -26,10 +26,11 @@
# Only needed for YAML config
if get_option('json-config').disabled()
+ script = files('pfpgen.py')
generated_hpp_dep = custom_target(
'generated.hpp',
- input: files(conf.get_unquoted('PRESENCE_YAML_FILE'), './pfpgen.py'),
- command: [python_prog, '@INPUT0@', 'generate-cpp', '-i', '@INPUT1@'],
+ input: files(conf.get_unquoted('PRESENCE_YAML_FILE')),
+ command: [python_prog, script, 'generate-cpp', '-i', '@INPUT0@'],
capture: true,
output: 'generated.hpp',
)