@@ -1386,6 +1386,7 @@ target_softmmu_arch = {}
# TODO: add each directory to the subdirs from its own meson.build, once
# we have those
+trace_events_config = []
trace_events_subdirs = [
'accel/kvm',
'accel/tcg',
@@ -1,12 +1,23 @@
specific_ss.add(files('control-target.c'))
trace_events_files = []
-foreach dir : [ '.' ] + trace_events_subdirs
- trace_events_file = meson.source_root() / dir / 'trace-events'
+
+trace_events_config += {
+ 'file' : meson.source_root() / 'trace-events',
+ 'group' : 'root',
+}
+foreach dir : trace_events_subdirs
+ trace_events_config += {
+ 'file' : meson.source_root() / dir / 'trace-events',
+ 'group' : dir.underscorify(),
+ }
+endforeach
+
+foreach c : trace_events_config
+ trace_events_file = c.get('file')
trace_events_files += [ trace_events_file ]
- group_name = dir == '.' ? 'root' : dir.underscorify()
- group = '--group=' + group_name
- fmt = '@0@-' + group_name + '.@1@'
+ group = '--group=' + c.get('group')
+ fmt = '@0@-' + c.get('group') + '.@1@'
trace_h = custom_target(fmt.format('trace', 'h'),
output: fmt.format('trace', 'h'),
It's an array of dicts, where each dict holds the configuration for one trace-events file. For now just fill it from trace_events_subdirs. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> --- meson.build | 1 + trace/meson.build | 21 ++++++++++++++++----- 2 files changed, 17 insertions(+), 5 deletions(-)