Revision c0424934

b/Makefile.objs
373 373
# trace
374 374

  
375 375
ifeq ($(TRACE_BACKEND),dtrace)
376
trace.h: trace.h-timestamp trace-dtrace.h
377
else
378
trace.h: trace.h-timestamp
376
TRACE_H_EXTRA_DEPS=trace-dtrace.h
379 377
endif
378
trace.h: trace.h-timestamp $(TRACE_H_EXTRA_DEPS)
380 379
trace.h-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)/config-host.mak
381
	$(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/tracetool.py --format=h --backend=$(TRACE_BACKEND) < $< > $@,"  GEN   trace.h")
380
	$(call quiet-command,$(TRACETOOL) \
381
		--format=h \
382
		--backend=$(TRACE_BACKEND) \
383
		< $< > $@,"  GEN   trace.h")
382 384
	@cmp -s $@ trace.h || cp $@ trace.h
383 385

  
384 386
trace.c: trace.c-timestamp
385 387
trace.c-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)/config-host.mak
386
	$(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/tracetool.py --format=c --backend=$(TRACE_BACKEND) < $< > $@,"  GEN   trace.c")
388
	$(call quiet-command,$(TRACETOOL) \
389
		--format=c \
390
		--backend=$(TRACE_BACKEND) \
391
		< $< > $@,"  GEN   trace.c")
387 392
	@cmp -s $@ trace.c || cp $@ trace.c
388 393

  
389 394
trace.o: trace.c $(GENERATED_HEADERS)
......
396 401
# rule file. So we use '.dtrace' instead
397 402
trace-dtrace.dtrace: trace-dtrace.dtrace-timestamp
398 403
trace-dtrace.dtrace-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)/config-host.mak
399
	$(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/tracetool.py --format=d --backend=$(TRACE_BACKEND) < $< > $@,"  GEN   trace-dtrace.dtrace")
404
	$(call quiet-command,$(TRACETOOL) \
405
		--format=d \
406
		--backend=$(TRACE_BACKEND) \
407
		< $< > $@,"  GEN   trace-dtrace.dtrace")
400 408
	@cmp -s $@ trace-dtrace.dtrace || cp $@ trace-dtrace.dtrace
401 409

  
402 410
trace-dtrace.o: trace-dtrace.dtrace $(GENERATED_HEADERS)
403
	$(call quiet-command,dtrace -o $@ -G -s $<, "  GEN trace-dtrace.o")
411
	$(call quiet-command,dtrace -o $@ -G -s $<, "  GEN   trace-dtrace.o")
404 412

  
405 413
ifeq ($(LIBTOOL),)
406 414
trace-dtrace.lo: trace-dtrace.dtrace
b/Makefile.target
59 59
endif
60 60

  
61 61
$(QEMU_PROG).stp: $(SRC_PATH)/trace-events
62
	$(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/tracetool.py \
62
	$(call quiet-command,$(TRACETOOL) \
63 63
		--format=stap \
64 64
		--backend=$(TRACE_BACKEND) \
65 65
		--binary=$(bindir)/$(QEMU_PROG) \
66 66
		--target-arch=$(TARGET_ARCH) \
67 67
		--target-type=$(TARGET_TYPE) \
68
		< $(SRC_PATH)/trace-events > $(QEMU_PROG).stp,"  GEN   $(QEMU_PROG).stp")
68
		< $< > $@,"  GEN   $(QEMU_PROG).stp")
69 69
else
70 70
stap:
71 71
endif
b/rules.mak
59 59
        $(wildcard $1), \
60 60
        $(wildcard $(patsubst %, %/$1, $(subst :, ,$(PATH)))))
61 61

  
62
# Generate files with tracetool
63
TRACETOOL=$(PYTHON) $(SRC_PATH)/scripts/tracetool.py
64

  
62 65
# Generate timestamp files for .h include files
63 66

  
64 67
%.h: %.h-timestamp

Also available in: Unified diff