summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc-André Lureau2019-09-03 14:47:00 +0200
committerPaolo Bonzini2020-08-21 12:30:22 +0200
commit0e1309d0c56fcfce14bd314aa73e35f65c2856b5 (patch)
treef57e6eb325f4aab25fe5e81f88faa189bff39f52
parentmeson: convert most of softmmu/ (diff)
downloadqemu-0e1309d0c56fcfce14bd314aa73e35f65c2856b5.tar.gz
qemu-0e1309d0c56fcfce14bd314aa73e35f65c2856b5.tar.xz
qemu-0e1309d0c56fcfce14bd314aa73e35f65c2856b5.zip
meson: convert trace/
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r--trace/Makefile.objs8
-rw-r--r--trace/meson.build5
2 files changed, 4 insertions, 9 deletions
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