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

Beautify makefile commands for generation of files with tracetool

Browse Source 
Signed-off-by: Lluís Vilanova <vilanova@ac.upc.edu>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
This commit is contained in:
Lluís Vilanova 2012-04-18 20:15:45 +02:00 committed by Stefan Hajnoczi
parent 19ac36b5e2
commit c0424934fa
3 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Makefile.objs
View File

@ -373,17 +373,22 @@ libdis-$(CONFIG_LM32_DIS) += lm32-dis.o
# trace # trace
ifeq ($(TRACE_BACKEND),dtrace) ifeq ($(TRACE_BACKEND),dtrace)
trace.h: trace.h-timestamp trace-dtrace.h TRACE_H_EXTRA_DEPS=trace-dtrace.h
else
trace.h: trace.h-timestamp
endif endif
trace.h: trace.h-timestamp $(TRACE_H_EXTRA_DEPS)
trace.h-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)/config-host.mak trace.h-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)/config-host.mak
$(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/tracetool.py --format=h --backend=$(TRACE_BACKEND) < $< > $@," GEN trace.h") $(call quiet-command,$(TRACETOOL) \
--format=h \
--backend=$(TRACE_BACKEND) \
< $< > $@," GEN trace.h")
@cmp -s $@ trace.h || cp $@ trace.h @cmp -s $@ trace.h || cp $@ trace.h
trace.c: trace.c-timestamp trace.c: trace.c-timestamp
trace.c-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)/config-host.mak trace.c-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)/config-host.mak
$(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/tracetool.py --format=c --backend=$(TRACE_BACKEND) < $< > $@," GEN trace.c") $(call quiet-command,$(TRACETOOL) \
--format=c \
--backend=$(TRACE_BACKEND) \
< $< > $@," GEN trace.c")
@cmp -s $@ trace.c || cp $@ trace.c @cmp -s $@ trace.c || cp $@ trace.c
trace.o: trace.c $(GENERATED_HEADERS) trace.o: trace.c $(GENERATED_HEADERS)
@ -396,11 +401,14 @@ trace-dtrace.h: trace-dtrace.dtrace
# rule file. So we use '.dtrace' instead # rule file. So we use '.dtrace' instead
trace-dtrace.dtrace: trace-dtrace.dtrace-timestamp trace-dtrace.dtrace: trace-dtrace.dtrace-timestamp
trace-dtrace.dtrace-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)/config-host.mak trace-dtrace.dtrace-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)/config-host.mak
$(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/tracetool.py --format=d --backend=$(TRACE_BACKEND) < $< > $@," GEN trace-dtrace.dtrace") $(call quiet-command,$(TRACETOOL) \
--format=d \
--backend=$(TRACE_BACKEND) \
< $< > $@," GEN trace-dtrace.dtrace")
@cmp -s $@ trace-dtrace.dtrace || cp $@ trace-dtrace.dtrace @cmp -s $@ trace-dtrace.dtrace || cp $@ trace-dtrace.dtrace
trace-dtrace.o: trace-dtrace.dtrace $(GENERATED_HEADERS) trace-dtrace.o: trace-dtrace.dtrace $(GENERATED_HEADERS)
$(call quiet-command,dtrace -o $@ -G -s $<, " GEN trace-dtrace.o") $(call quiet-command,dtrace -o $@ -G -s $<, " GEN trace-dtrace.o")
ifeq ($(LIBTOOL),) ifeq ($(LIBTOOL),)
trace-dtrace.lo: trace-dtrace.dtrace trace-dtrace.lo: trace-dtrace.dtrace

4
Makefile.target
View File

@ -59,13 +59,13 @@ TARGET_TYPE=system
endif endif
$(QEMU_PROG).stp: $(SRC_PATH)/trace-events $(QEMU_PROG).stp: $(SRC_PATH)/trace-events
$(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/tracetool.py \ $(call quiet-command,$(TRACETOOL) \
--format=stap \ --format=stap \
--backend=$(TRACE_BACKEND) \ --backend=$(TRACE_BACKEND) \
--binary=$(bindir)/$(QEMU_PROG) \ --binary=$(bindir)/$(QEMU_PROG) \
--target-arch=$(TARGET_ARCH) \ --target-arch=$(TARGET_ARCH) \
--target-type=$(TARGET_TYPE) \ --target-type=$(TARGET_TYPE) \
< $(SRC_PATH)/trace-events > $(QEMU_PROG).stp," GEN $(QEMU_PROG).stp") < $< > $@," GEN $(QEMU_PROG).stp")
else else
stap: stap:
endif endif

3
rules.mak
View File

@ -59,6 +59,9 @@ find-in-path = $(if $(find-string /, $1), \
$(wildcard $1), \ $(wildcard $1), \
$(wildcard $(patsubst %, %/$1, $(subst :, ,$(PATH))))) $(wildcard $(patsubst %, %/$1, $(subst :, ,$(PATH)))))
# Generate files with tracetool
TRACETOOL=$(PYTHON) $(SRC_PATH)/scripts/tracetool.py
# Generate timestamp files for .h include files # Generate timestamp files for .h include files
%.h: %.h-timestamp %.h: %.h-timestamp