[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 06/12] meson: Merge trace_events_subdirs array
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v2 06/12] meson: Merge trace_events_subdirs array |
Date: |
Fri, 22 Jan 2021 21:44:35 +0100 |
The trace_events_subdirs array is split in two different
locations, merge it as one.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
Cc: Stefan Hajnoczi <stefanha@redhat.com>
---
meson.build | 28 +++++++++++++---------------
1 file changed, 13 insertions(+), 15 deletions(-)
diff --git a/meson.build b/meson.build
index 181f8795f5a..c43538a1523 100644
--- a/meson.build
+++ b/meson.build
@@ -1686,7 +1686,20 @@
'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' ]
@@ -1759,21 +1772,6 @@
'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.26.2
- [PATCH v2 01/12] configure: Only check for audio drivers if system-mode is selected, (continued)
- [PATCH v2 01/12] configure: Only check for audio drivers if system-mode is selected, Philippe Mathieu-Daudé, 2021/01/22
- [PATCH v2 02/12] tests/meson: Only build softfloat objects if TCG is selected, Philippe Mathieu-Daudé, 2021/01/22
- [PATCH v2 03/12] pc-bios/meson: Only install EDK2 blob firmwares with system emulation, Philippe Mathieu-Daudé, 2021/01/22
- [PATCH v2 04/12] meson: Do not build optional libraries by default, Philippe Mathieu-Daudé, 2021/01/22
- [PATCH v2 05/12] meson: Restrict block subsystem processing, Philippe Mathieu-Daudé, 2021/01/22
- [PATCH v2 06/12] meson: Merge trace_events_subdirs array,
Philippe Mathieu-Daudé <=
- [PATCH v2 07/12] meson: Restrict some trace event directories to user/system emulation, Philippe Mathieu-Daudé, 2021/01/22
- [PATCH v2 08/12] meson: Restrict emulation code, Philippe Mathieu-Daudé, 2021/01/22
- [PATCH v2 09/12] qapi/meson: Restrict qdev code to system-mode emulation, Philippe Mathieu-Daudé, 2021/01/22
- [PATCH v2 10/12] qapi/meson: Remove QMP from user-mode emulation, Philippe Mathieu-Daudé, 2021/01/22