summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile51
-rw-r--r--trace/meson.build14
2 files changed, 14 insertions, 51 deletions
diff --git a/Makefile b/Makefile
index e5d217d4d2..5731d739f1 100644
--- a/Makefile
+++ b/Makefile
@@ -137,61 +137,10 @@ FULL_VERSION := $(if $(QEMU_PKGVERSION),$(VERSION) ($(QEMU_PKGVERSION)),$(VERSIO
generated-files-y = qemu-version.h config-host.h qemu-options.def
-generated-files-y += trace/generated-tcg-tracers.h
-
-generated-files-y += trace/generated-helpers-wrappers.h
-generated-files-y += trace/generated-helpers.h
-generated-files-y += trace/generated-helpers.c
-
generated-files-y += module_block.h
generated-files-y += .git-submodule-status
-tracetool-y = $(SRC_PATH)/scripts/tracetool.py
-tracetool-y += $(shell find $(SRC_PATH)/scripts/tracetool -name "*.py")
-
-trace/generated-helpers-wrappers.h: trace/generated-helpers-wrappers.h-timestamp
- @cmp $< $@ >/dev/null 2>&1 || cp $< $@
-trace/generated-helpers-wrappers.h-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)/config-host.mak $(tracetool-y)
- @mkdir -p $(dir $@)
- $(call quiet-command,$(TRACETOOL) \
- --group=root \
- --format=tcg-helper-wrapper-h \
- --backend=$(TRACE_BACKENDS) \
- $< > $@,"GEN","$(patsubst %-timestamp,%,$@)")
-
-trace/generated-helpers.h: trace/generated-helpers.h-timestamp
- @cmp $< $@ >/dev/null 2>&1 || cp $< $@
-trace/generated-helpers.h-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)/config-host.mak $(tracetool-y)
- @mkdir -p $(dir $@)
- $(call quiet-command,$(TRACETOOL) \
- --group=root \
- --format=tcg-helper-h \
- --backend=$(TRACE_BACKENDS) \
- $< > $@,"GEN","$(patsubst %-timestamp,%,$@)")
-
-trace/generated-helpers.c: trace/generated-helpers.c-timestamp
- @cmp $< $@ >/dev/null 2>&1 || cp $< $@
-trace/generated-helpers.c-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)/config-host.mak $(tracetool-y)
- @mkdir -p $(dir $@)
- $(call quiet-command,$(TRACETOOL) \
- --group=root \
- --format=tcg-helper-c \
- --backend=$(TRACE_BACKENDS) \
- $< > $@,"GEN","$(patsubst %-timestamp,%,$@)")
-
-trace/generated-helpers.o: trace/generated-helpers.c
-
-trace/generated-tcg-tracers.h: trace/generated-tcg-tracers.h-timestamp
- @cmp $< $@ >/dev/null 2>&1 || cp $< $@
-trace/generated-tcg-tracers.h-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)/config-host.mak $(tracetool-y)
- @mkdir -p $(dir $@)
- $(call quiet-command,$(TRACETOOL) \
- --group=root \
- --format=tcg-h \
- --backend=$(TRACE_BACKENDS) \
- $< > $@,"GEN","$(patsubst %-timestamp,%,$@)")
-
KEYCODEMAP_GEN = $(SRC_PATH)/ui/keycodemapdb/tools/keymap-gen
KEYCODEMAP_CSV = $(SRC_PATH)/ui/keycodemapdb/data/keymaps.csv
diff --git a/trace/meson.build b/trace/meson.build
index f0a8d1c2e2..cab36a248b 100644
--- a/trace/meson.build
+++ b/trace/meson.build
@@ -55,6 +55,20 @@ custom_target('trace-events-all',
install: true,
install_dir: config_host['qemu_datadir'])
+foreach d : [
+ ['generated-tcg-tracers.h', 'tcg-h'],
+ ['generated-helpers.c', 'tcg-helper-c'],
+ ['generated-helpers.h', 'tcg-helper-h'],
+ ['generated-helpers-wrappers.h', 'tcg-helper-wrapper-h'],
+]
+ 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)
+endforeach
+
if 'CONFIG_TRACE_UST' in config_host
trace_ust_all_h = custom_target('trace-ust-all.h',
output: 'trace-ust-all.h',