[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 050/132] meson: convert trace/
From: |
Paolo Bonzini |
Subject: |
[PATCH 050/132] meson: convert trace/ |
Date: |
Thu, 12 Dec 2019 13:51:34 +0100 |
From: Marc-André Lureau <address@hidden>
Signed-off-by: Marc-André Lureau <address@hidden>
---
Makefile.objs | 4 ----
trace/Makefile.objs | 8 --------
trace/meson.build | 5 ++++-
3 files changed, 4 insertions(+), 13 deletions(-)
delete mode 100644 trace/Makefile.objs
diff --git a/Makefile.objs b/Makefile.objs
index 307e27c..e9ae889 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -77,7 +77,3 @@ common-obj-y += disas/
######################################################################
# Resource file for Windows executables
version-obj-$(CONFIG_WIN32) += $(BUILD_DIR)/version.o
-
-######################################################################
-# tracing
-util-obj-y += trace/
diff --git a/trace/Makefile.objs b/trace/Makefile.objs
deleted file mode 100644
index a429474..0000000
--- a/trace/Makefile.objs
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: makefile -*-
-
-
-##################################################
-# Translation level
-
-obj-y += generated-helpers.o
-obj-y += control-target.o
diff --git a/trace/meson.build b/trace/meson.build
index 8ea8db7..b113425 100644
--- a/trace/meson.build
+++ b/trace/meson.build
@@ -1,3 +1,5 @@
+specific_ss.add(files('control-target.c'))
+
# common options
tracetool = [
find_program('scripts/tracetool.py'),
@@ -67,12 +69,13 @@ foreach d : [
['generated-helpers.h', 'tcg-helper-h'],
['generated-helpers-wrappers.h', 'tcg-helper-wrapper-h'],
]
- custom_target(d[0],
+ gen = custom_target(d[0],
output: d[0],
input: meson.source_root() / 'trace-events',
command: [ tracetool, '--group=root',
'--format=@0@'.format(d[1]), '@INPUT@' ],
build_by_default: true, # to be removed when added to a target
capture: true)
+ specific_ss.add(gen)
endforeach
if 'CONFIG_TRACE_UST' in config_host
--
1.8.3.1
- [PATCH 043/132] meson: qemu-{img,io,nbd}, (continued)
- [PATCH 043/132] meson: qemu-{img,io,nbd}, Paolo Bonzini, 2019/12/12
- [PATCH 042/132] meson: convert block, Paolo Bonzini, 2019/12/12
- [PATCH 044/132] meson: qemu-pr-helper, Paolo Bonzini, 2019/12/12
- [PATCH 040/132] meson: add modules infrastructure, Paolo Bonzini, 2019/12/12
- [PATCH 045/132] configure, Makefile; remove TOOLS and HELPERS-y variable, Paolo Bonzini, 2019/12/12
- [PATCH 046/132] meson: convert chardev directory to Meson (emulator part), Paolo Bonzini, 2019/12/12
- [PATCH 047/132] meson: convert audio directory to Meson, Paolo Bonzini, 2019/12/12
- [PATCH 049/132] meson: convert root directory to Meson, Paolo Bonzini, 2019/12/12
- [PATCH 048/132] meson: convert ui directory to Meson, Paolo Bonzini, 2019/12/12
- [PATCH 051/132] meson: convert qom/, Paolo Bonzini, 2019/12/12
- [PATCH 050/132] meson: convert trace/,
Paolo Bonzini <=
- [PATCH 052/132] meson: convert block/, Paolo Bonzini, 2019/12/12
- [PATCH 053/132] meson: convert dump/, Paolo Bonzini, 2019/12/12
- [PATCH 054/132] meson: convert monitor directory to Meson, Paolo Bonzini, 2019/12/12
- [PATCH 055/132] meson: convert replay directory to Meson, Paolo Bonzini, 2019/12/12
- [PATCH 056/132] meson: convert migration directory to Meson, Paolo Bonzini, 2019/12/12
- [PATCH 057/132] meson: build softmmu-specific migration/ram.c, Paolo Bonzini, 2019/12/12
- [PATCH 059/132] meson: convert backends directory to Meson, Paolo Bonzini, 2019/12/12
- [PATCH 058/132] meson: convert net directory to Meson, Paolo Bonzini, 2019/12/12
- [PATCH 060/132] meson: convert fsdev/, Paolo Bonzini, 2019/12/12
- [PATCH 061/132] meson: convert disas directory to Meson, Paolo Bonzini, 2019/12/12