From: Philippe Mathieu-Daudé <phi...@redhat.com>
The trace_events_subdirs array is split in two different
locations, merge it as one.
Signed-off-by: Philippe Mathieu-Daudé <phi...@redhat.com>
Acked-by: Paolo Bonzini <pbonz...@redhat.com>
Reviewed-by: Claudio Fontana <cfont...@suse.de>
Message-Id: <20210122204441.2145197-7-phi...@redhat.com>
Signed-off-by: Paolo Bonzini <pbonz...@redhat.com>
---
meson.build | 28 +++++++++++++---------------
1 file changed, 13 insertions(+), 15 deletions(-)
diff --git a/meson.build b/meson.build
index 0bebab037c..ec1a9ed0e8 100644
--- a/meson.build
+++ b/meson.build
@@ -1661,7 +1661,20 @@ trace_events_subdirs = [
'accel/kvm',
'accel/tcg',
'crypto',
+ 'hw/core',
+ 'qapi',
+ 'qom',
'monitor',
+ 'target/arm',
+ 'target/hppa',
+ 'target/i386',
+ 'target/i386/kvm',
+ 'target/mips',
+ 'target/ppc',
+ 'target/riscv',
+ 'target/s390x',
+ 'target/sparc',
+ 'util',
]
if have_user
trace_events_subdirs += [ 'linux-user' ]
@@ -1734,21 +1747,6 @@ if have_system
'ui',
]
endif
-trace_events_subdirs += [
- 'hw/core',
- 'qapi',
- 'qom',
- 'target/arm',
- 'target/hppa',
- 'target/i386',
- 'target/i386/kvm',
- 'target/mips',
- 'target/ppc',
- 'target/riscv',
- 'target/s390x',
- 'target/sparc',
- 'util',
-]
vhost_user = not_found
if 'CONFIG_VHOST_USER' in config_host
--
2.29.2
