summaryrefslogtreecommitdiffstats
path: root/Makefile.objs
diff options
context:
space:
mode:
authorPaolo Bonzini2011-05-02 09:54:03 +0200
committerStefan Hajnoczi2011-05-08 12:44:47 +0200
commit6774e44ae3bfe074f59a16ffb0b52ae441b9c66d (patch)
tree221bc65015066a8e781b0d94526a52ef08fc5675 /Makefile.objs
parentlinux-user: Replace deprecated function (diff)
downloadqemu-6774e44ae3bfe074f59a16ffb0b52ae441b9c66d.tar.gz
qemu-6774e44ae3bfe074f59a16ffb0b52ae441b9c66d.tar.xz
qemu-6774e44ae3bfe074f59a16ffb0b52ae441b9c66d.zip
libcacard: add correct subdirectory dependencies
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Cc: qemu-trivial@nongnu.org Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Diffstat (limited to 'Makefile.objs')
-rw-r--r--Makefile.objs7
1 files changed, 3 insertions, 4 deletions
diff --git a/Makefile.objs b/Makefile.objs
index d82c60d04e..4478c61e0c 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -7,8 +7,8 @@ qobject-obj-y += qerror.o
#######################################################################
# oslib-obj-y is code depending on the OS (win32 vs posix)
oslib-obj-y = osdep.o
-oslib-obj-$(CONFIG_WIN32) += oslib-win32.o
-oslib-obj-$(CONFIG_POSIX) += oslib-posix.o
+oslib-obj-$(CONFIG_WIN32) += oslib-win32.o qemu-thread-win32.o
+oslib-obj-$(CONFIG_POSIX) += oslib-posix.o qemu-thread-posix.o
#######################################################################
# block-obj-y is code used by both qemu system emulation and qemu-img
@@ -143,8 +143,7 @@ common-obj-y += $(addprefix ui/, $(ui-obj-y))
common-obj-$(CONFIG_VNC) += $(addprefix ui/, $(vnc-obj-y))
common-obj-y += iov.o acl.o
-common-obj-$(CONFIG_POSIX) += qemu-thread-posix.o compatfd.o
-common-obj-$(CONFIG_WIN32) += qemu-thread-win32.o
+common-obj-$(CONFIG_POSIX) += compatfd.o
common-obj-y += notify.o event_notifier.o
common-obj-y += qemu-timer.o qemu-timer-common.o