aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilippe Mathieu-Daudé <philmd@redhat.com>2021-01-22 21:44:35 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2021-02-08 14:43:55 +0100
commit69ff4d0a45eb940c880d26527939a6da68d21193 (patch)
tree40d8e6de2387f76fb2a66dc7fb2dafc98b7a3c6c
parentf285bd3fdcbfaa73e8af0f60371a745e124da804 (diff)
downloadqemu-arm-69ff4d0a45eb940c880d26527939a6da68d21193.tar.gz
meson: Merge trace_events_subdirs array
The trace_events_subdirs array is split in two different locations, merge it as one. Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> Acked-by: Paolo Bonzini <pbonzini@redhat.com> Reviewed-by: Claudio Fontana <cfontana@suse.de> Message-Id: <20210122204441.2145197-7-philmd@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r--meson.build28
1 files changed, 13 insertions, 15 deletions
diff --git a/meson.build b/meson.build
index 0ca73d0102..da21812064 100644
--- a/meson.build
+++ b/meson.build
@@ -1744,7 +1744,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' ]
@@ -1817,21 +1830,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