mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: get rid of target-obj-y

Browse Source 
It is possible to specify the trace/ directory already in objs-y;
there is no need to have a separate unnest-vars invocation.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2019-03-08 17:39:08 +01:00
parent c8350ebd67
commit 310b3fe9e5
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.objs
View File

@ -101,7 +101,6 @@ version-obj-$(CONFIG_WIN32) += $(BUILD_DIR)/version.o
###################################################################### ######################################################################
# tracing # tracing
util-obj-y += trace/ util-obj-y += trace/
target-obj-y += trace/
###################################################################### ######################################################################
# guest agent # guest agent

7
Makefile.target
View File

@ -105,6 +105,8 @@ all: $(PROGS) stap
# Dummy command so that make thinks it has done something # Dummy command so that make thinks it has done something
@true @true
obj-y += trace/
######################################################### #########################################################
# cpu emulator library # cpu emulator library
obj-y += exec.o obj-y += exec.o
@ -173,13 +175,10 @@ endif # CONFIG_SOFTMMU
dummy := $(call unnest-vars,,obj-y) dummy := $(call unnest-vars,,obj-y)
all-obj-y := $(obj-y) all-obj-y := $(obj-y)
target-obj-y :=
block-obj-y := block-obj-y :=
common-obj-y := common-obj-y :=
chardev-obj-y := chardev-obj-y :=
include $(SRC_PATH)/Makefile.objs include $(SRC_PATH)/Makefile.objs
dummy := $(call unnest-vars,,target-obj-y)
target-obj-y-save := $(target-obj-y)
dummy := $(call unnest-vars,.., \ dummy := $(call unnest-vars,.., \
authz-obj-y \ authz-obj-y \
block-obj-y \ block-obj-y \
@ -191,9 +190,7 @@ dummy := $(call unnest-vars,.., \
io-obj-y \ io-obj-y \
common-obj-y \ common-obj-y \
common-obj-m) common-obj-m)
target-obj-y := $(target-obj-y-save)
all-obj-y += $(common-obj-y) all-obj-y += $(common-obj-y)
all-obj-y += $(target-obj-y)
all-obj-y += $(qom-obj-y) all-obj-y += $(qom-obj-y)
all-obj-$(CONFIG_SOFTMMU) += $(authz-obj-y) all-obj-$(CONFIG_SOFTMMU) += $(authz-obj-y)
all-obj-$(CONFIG_SOFTMMU) += $(block-obj-y) $(chardev-obj-y) all-obj-$(CONFIG_SOFTMMU) += $(block-obj-y) $(chardev-obj-y)

4
trace/Makefile.objs
View File

@ -36,7 +36,7 @@ $(obj)/generated-helpers.c-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)/conf
$(obj)/generated-helpers.o: $(obj)/generated-helpers.c $(obj)/generated-helpers.o: $(obj)/generated-helpers.c
target-obj-y += generated-helpers.o obj-y += generated-helpers.o
$(obj)/generated-tcg-tracers.h: $(obj)/generated-tcg-tracers.h-timestamp $(obj)/generated-tcg-tracers.h: $(obj)/generated-tcg-tracers.h-timestamp
@ -55,5 +55,5 @@ $(obj)/generated-tcg-tracers.h-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)/
util-obj-$(CONFIG_TRACE_SIMPLE) += simple.o util-obj-$(CONFIG_TRACE_SIMPLE) += simple.o
util-obj-$(CONFIG_TRACE_FTRACE) += ftrace.o util-obj-$(CONFIG_TRACE_FTRACE) += ftrace.o
util-obj-y += control.o util-obj-y += control.o
target-obj-y += control-target.o obj-y += control-target.o
util-obj-y += qmp.o util-obj-y += qmp.o