From: Paolo Bonzini <pbonzini@redhat.com>
Date: Tue, 22 May 2012 11:50:03 +0000 (+0200)
Subject: build: remove trace-nested-y
X-Git-Tag: v1.2.0-rc0~312^2~28
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=046e7c5f934a7a5680a6822eae4dfa80899a1d40;p=thirdparty%2Fqemu.git

build: remove trace-nested-y

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---

diff --git a/Makefile.objs b/Makefile.objs
index 70c5c79a6e0..1daa92c96b6 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -425,16 +425,11 @@ ifneq ($(TRACE_BACKEND),dtrace)
 trace-obj-y = trace.o
 endif
 
-trace-nested-$(CONFIG_TRACE_DEFAULT) += default.o
-
-trace-nested-$(CONFIG_TRACE_SIMPLE) += simple.o
+trace-obj-$(CONFIG_TRACE_DEFAULT) += trace/default.o
+trace-obj-$(CONFIG_TRACE_SIMPLE) += trace/simple.o
 trace-obj-$(CONFIG_TRACE_SIMPLE) += qemu-timer-common.o
-
-trace-nested-$(CONFIG_TRACE_STDERR) += stderr.o
-
-trace-nested-y += control.o
-
-trace-obj-y += $(addprefix trace/, $(trace-nested-y))
+trace-obj-$(CONFIG_TRACE_STDERR) += trace/stderr.o
+trace-obj-y += trace/control.o
 
 $(trace-obj-y): $(GENERATED_HEADERS)