aboutsummaryrefslogtreecommitdiff
path: root/libcacard
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 /libcacard
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 'libcacard')
-rw-r--r--libcacard/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/libcacard/Makefile b/libcacard/Makefile
index c658d3a9b7..47827a0eb8 100644
--- a/libcacard/Makefile
+++ b/libcacard/Makefile
@@ -3,10 +3,11 @@ libcacard_includedir=$(includedir)/cacard
TOOLS += vscclient$(EXESUF)
# objects linked into a shared library, built with libtool with -fPIC if required
-libcacard-obj-y = $(trace-obj-y) $(stub-obj-y) $(libcacard-y)
+libcacard-obj-y = $(stub-obj-y) $(libcacard-y)
libcacard-obj-y += util/osdep.o util/cutils.o util/qemu-timer-common.o util/error.o
libcacard-obj-$(CONFIG_WIN32) += util/oslib-win32.o util/qemu-thread-win32.o
libcacard-obj-$(CONFIG_POSIX) += util/oslib-posix.o util/qemu-thread-posix.o
+libcacard-obj-y += $(filter trace/%, $(util-obj-y))
libcacard-lobj-y=$(patsubst %.o,%.lo,$(libcacard-obj-y))