aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2019-03-08 17:39:08 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2019-03-11 16:33:49 +0100
commit310b3fe9e50a59f7911f8930bc523a7a0b84bb89 (patch)
treea84d01460d6bd276f527424b2163ddec7160d56c
parentc8350ebd6789c9b7641e84d03fbf0f6dd3aacf60 (diff)
downloadqemu-arm-310b3fe9e50a59f7911f8930bc523a7a0b84bb89.tar.gz
build: get rid of target-obj-y
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>
-rw-r--r--Makefile.objs1
-rw-r--r--Makefile.target7
-rw-r--r--trace/Makefile.objs4
3 files changed, 4 insertions, 8 deletions
diff --git a/Makefile.objs b/Makefile.objs
index ef65a6c12e..acc53aa0f0 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -101,7 +101,6 @@ version-obj-$(CONFIG_WIN32) += $(BUILD_DIR)/version.o
######################################################################
# tracing
util-obj-y += trace/
-target-obj-y += trace/
######################################################################
# guest agent
diff --git a/Makefile.target b/Makefile.target
index 40830c5646..a458506139 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -105,6 +105,8 @@ all: $(PROGS) stap
# Dummy command so that make thinks it has done something
@true
+obj-y += trace/
+
#########################################################
# cpu emulator library
obj-y += exec.o
@@ -173,13 +175,10 @@ endif # CONFIG_SOFTMMU
dummy := $(call unnest-vars,,obj-y)
all-obj-y := $(obj-y)
-target-obj-y :=
block-obj-y :=
common-obj-y :=
chardev-obj-y :=
include $(SRC_PATH)/Makefile.objs
-dummy := $(call unnest-vars,,target-obj-y)
-target-obj-y-save := $(target-obj-y)
dummy := $(call unnest-vars,.., \
authz-obj-y \
block-obj-y \
@@ -191,9 +190,7 @@ dummy := $(call unnest-vars,.., \
io-obj-y \
common-obj-y \
common-obj-m)
-target-obj-y := $(target-obj-y-save)
all-obj-y += $(common-obj-y)
-all-obj-y += $(target-obj-y)
all-obj-y += $(qom-obj-y)
all-obj-$(CONFIG_SOFTMMU) += $(authz-obj-y)
all-obj-$(CONFIG_SOFTMMU) += $(block-obj-y) $(chardev-obj-y)
diff --git a/trace/Makefile.objs b/trace/Makefile.objs
index afd571c3ec..c544509adf 100644
--- a/trace/Makefile.objs
+++ b/trace/Makefile.objs
@@ -36,7 +36,7 @@ $(obj)/generated-helpers.c-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)/conf
$(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
@@ -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_FTRACE) += ftrace.o
util-obj-y += control.o
-target-obj-y += control-target.o
+obj-y += control-target.o
util-obj-y += qmp.o