david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: some simplifications for "trace/Makefile.objs"

Browse Source 
Signed-off-by: Lluís Vilanova <vilanova@ac.upc.edu>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2012-12-24 14:06:27 +01:00
parent 84ecb7a6b9
commit 0e848f482b
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
trace.h → include/trace.h
View File

26
trace/Makefile.objs
View File

@ -1,12 +1,9 @@
# -*- mode: makefile -*- # -*- mode: makefile -*-
###################################################################### ######################################################################
# Auto-generated tracing routines # Auto-generated header for tracing routines
ifeq ($(TRACE_BACKEND),dtrace) $(obj)/generated-tracers.h: $(obj)/generated-tracers.h-timestamp
TRACE_H_EXTRA_DEPS=$(obj)/generated-tracers-dtrace.h
endif
$(obj)/generated-tracers.h: $(obj)/generated-tracers.h-timestamp $(TRACE_H_EXTRA_DEPS)
$(obj)/generated-tracers.h-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)/config-host.mak $(obj)/generated-tracers.h-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)/config-host.mak
$(call quiet-command,$(TRACETOOL) \ $(call quiet-command,$(TRACETOOL) \
--format=h \ --format=h \
@ -14,6 +11,10 @@ $(obj)/generated-tracers.h-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)/conf
< $< > $@," GEN $(patsubst %-timestamp,%,$@)") < $< > $@," GEN $(patsubst %-timestamp,%,$@)")
@cmp -s $@ $(patsubst %-timestamp,%,$@) || cp $@ $(patsubst %-timestamp,%,$@) @cmp -s $@ $(patsubst %-timestamp,%,$@) || cp $@ $(patsubst %-timestamp,%,$@)
######################################################################
# Auto-generated tracing routines (non-DTrace)
ifneq ($(TRACE_BACKEND),dtrace)
$(obj)/generated-tracers.c: $(obj)/generated-tracers.c-timestamp $(obj)/generated-tracers.c: $(obj)/generated-tracers.c-timestamp
$(obj)/generated-tracers.c-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)/config-host.mak $(obj)/generated-tracers.c-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)/config-host.mak
$(call quiet-command,$(TRACETOOL) \ $(call quiet-command,$(TRACETOOL) \
@ -23,9 +24,6 @@ $(obj)/generated-tracers.c-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)/conf
@cmp -s $@ $(patsubst %-timestamp,%,$@) || cp $@ $(patsubst %-timestamp,%,$@) @cmp -s $@ $(patsubst %-timestamp,%,$@) || cp $@ $(patsubst %-timestamp,%,$@)
$(obj)/generated-tracers.o: $(obj)/generated-tracers.c $(obj)/generated-tracers.h $(obj)/generated-tracers.o: $(obj)/generated-tracers.c $(obj)/generated-tracers.h
ifneq ($(TRACE_BACKEND),dtrace)
trace-obj-y += generated-tracers.o
endif endif
@ -35,19 +33,20 @@ endif
# Normal practice is to name DTrace probe file with a '.d' extension # Normal practice is to name DTrace probe file with a '.d' extension
# but that gets picked up by QEMU's Makefile as an external dependency # but that gets picked up by QEMU's Makefile as an external dependency
# rule file. So we use '.dtrace' instead # rule file. So we use '.dtrace' instead
$(obj)/generated-tracers-dtrace.dtrace: $(obj)/generated-tracers-dtrace.dtrace-timestamp ifeq ($(TRACE_BACKEND),dtrace)
$(obj)/generated-tracers-dtrace.dtrace-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)/config-host.mak $(obj)/generated-tracers.dtrace: $(obj)/generated-tracers.dtrace-timestamp
$(obj)/generated-tracers.dtrace-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)/config-host.mak
$(call quiet-command,$(TRACETOOL) \ $(call quiet-command,$(TRACETOOL) \
--format=d \ --format=d \
--backend=$(TRACE_BACKEND) \ --backend=$(TRACE_BACKEND) \
< $< > $@," GEN $(patsubst %-timestamp,%,$@)") < $< > $@," GEN $(patsubst %-timestamp,%,$@)")
@cmp -s $@ $(patsubst %-timestamp,%,$@) || cp $@ $(patsubst %-timestamp,%,$@) @cmp -s $@ $(patsubst %-timestamp,%,$@) || cp $@ $(patsubst %-timestamp,%,$@)
$(obj)/generated-tracers-dtrace.h: trace/generated-tracers-dtrace.dtrace $(obj)/generated-tracers-dtrace.h: $(obj)/generated-tracers.dtrace
$(call quiet-command,dtrace -o $@ -h -s $<, " GEN $@") $(call quiet-command,dtrace -o $@ -h -s $<, " GEN $@")
trace-obj-$(CONFIG_TRACE_DTRACE) += generated-tracers-dtrace.o $(obj)/generated-tracers.o: $(obj)/generated-tracers.dtrace
endif
###################################################################### ######################################################################
# Backend code # Backend code
@ -56,3 +55,4 @@ trace-obj-$(CONFIG_TRACE_DEFAULT) += default.o
trace-obj-$(CONFIG_TRACE_SIMPLE) += simple.o trace-obj-$(CONFIG_TRACE_SIMPLE) += simple.o
trace-obj-$(CONFIG_TRACE_STDERR) += stderr.o trace-obj-$(CONFIG_TRACE_STDERR) += stderr.o
trace-obj-y += control.o trace-obj-y += control.o
trace-obj-y += generated-tracers.o