[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 074/150] meson: convert trace/
From: |
Paolo Bonzini |
Subject: |
[PULL 074/150] meson: convert trace/ |
Date: |
Tue, 18 Aug 2020 10:09:09 -0400 |
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
trace/Makefile.objs | 8 --------
trace/meson.build | 5 ++++-
2 files changed, 4 insertions(+), 9 deletions(-)
delete mode 100644 trace/Makefile.objs
diff --git a/trace/Makefile.objs b/trace/Makefile.objs
deleted file mode 100644
index a429474618..0000000000
--- 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 cab36a248b..9c3c128164 100644
--- a/trace/meson.build
+++ b/trace/meson.build
@@ -1,3 +1,5 @@
+specific_ss.add(files('control-target.c'))
+
trace_events_files = []
foreach dir : [ '.' ] + trace_events_subdirs
trace_events_file = meson.source_root() / dir / 'trace-events'
@@ -61,12 +63,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
--
2.26.2
- [PULL 066/150] meson: qemu-pr-helper, (continued)
- [PULL 066/150] meson: qemu-pr-helper, Paolo Bonzini, 2020/08/18
- [PULL 063/150] meson: convert chardev directory to Meson (tools part), Paolo Bonzini, 2020/08/18
- [PULL 067/150] configure, Makefile; remove TOOLS and HELPERS-y variable, Paolo Bonzini, 2020/08/18
- [PULL 060/150] meson: convert target/s390x/gen-features.h, Paolo Bonzini, 2020/08/18
- [PULL 072/150] meson: convert root directory to Meson, Paolo Bonzini, 2020/08/18
- [PULL 068/150] meson: convert chardev directory to Meson (emulator part), Paolo Bonzini, 2020/08/18
- [PULL 077/150] meson: convert qemu-storage-daemon, Paolo Bonzini, 2020/08/18
- [PULL 075/150] meson: convert dump/, Paolo Bonzini, 2020/08/18
- [PULL 069/150] meson: convert tests/qtest to meson, Paolo Bonzini, 2020/08/18
- [PULL 079/150] meson: convert migration directory to Meson, Paolo Bonzini, 2020/08/18
- [PULL 074/150] meson: convert trace/,
Paolo Bonzini <=
- [PULL 064/150] meson: convert block, Paolo Bonzini, 2020/08/18
- [PULL 073/150] meson: convert most of softmmu/, Paolo Bonzini, 2020/08/18
- [PULL 078/150] meson: convert replay directory to Meson, Paolo Bonzini, 2020/08/18
- [PULL 076/150] meson: convert common QMP bits for qemu and qemu-storage-daemon, Paolo Bonzini, 2020/08/18
- [PULL 082/150] meson: convert fsdev/, Paolo Bonzini, 2020/08/18
- [PULL 081/150] meson: convert backends directory to Meson, Paolo Bonzini, 2020/08/18
- [PULL 085/150] meson: convert hw/xen, Paolo Bonzini, 2020/08/18
- [PULL 086/150] meson: convert hw/core, Paolo Bonzini, 2020/08/18
- [PULL 088/150] meson: convert hw/nubus, Paolo Bonzini, 2020/08/18
- [PULL 090/150] meson: convert hw/mem, Paolo Bonzini, 2020/08/18