aboutsummaryrefslogtreecommitdiff
path: root/Makefile.objs
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2012-12-21 09:45:20 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2013-01-12 18:42:51 +0100
commitff667e2e9b86fdc36e3b143483526f4c4fe80049 (patch)
tree28261edcc7426d92fc1435401a30a46487ab964f /Makefile.objs
parent0e848f482bce75f4d9cbac9f495fa45e51d08c9a (diff)
downloadqemu-arm-ff667e2e9b86fdc36e3b143483526f4c4fe80049.tar.gz
build: fold trace-obj-y into libqemuutil.a
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'Makefile.objs')
-rw-r--r--Makefile.objs11
1 files changed, 2 insertions, 9 deletions
diff --git a/Makefile.objs b/Makefile.objs
index bc56c61af6..d465a72030 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -1,7 +1,7 @@
#######################################################################
# Common libraries for tools and emulators
stub-obj-y = stubs/
-util-obj-y = util/ qobject/ qapi/
+util-obj-y = util/ qobject/ qapi/ trace/
#######################################################################
# block-obj-y is code used by both qemu system emulation and qemu-img
@@ -78,11 +78,6 @@ common-obj-y += qemu-seccomp.o
endif
######################################################################
-# trace
-
-trace-obj-y += trace/
-
-######################################################################
# smartcard
libcacard-y += libcacard/cac.o libcacard/event.o
@@ -107,7 +102,6 @@ universal-obj-y += tcg-runtime.o
universal-obj-y += hw/
universal-obj-y += qom/
universal-obj-y += disas/
-universal-obj-y += $(trace-obj-y)
######################################################################
# guest agent
@@ -129,6 +123,5 @@ nested-vars += \
block-obj-y \
common-obj-y \
universal-obj-y \
- extra-obj-y \
- trace-obj-y
+ extra-obj-y
dummy := $(call unnest-vars)