Merge remote-tracking branch 'remotes/xtensa/tags/20160408-xtensa' into staging

[qemu.git] / Makefile.objs

diff --git a/Makefile.objs b/Makefile.objs
index 06b95c72d09e000dccd7030da8366510a789a2b4..8f705f6202e681e0bd5ca943ab3d7631245e5824 100644 (file)
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -1,6 +1,6 @@
 #######################################################################
 # Common libraries for tools and emulators
-stub-obj-y = stubs/
+stub-obj-y = stubs/ crypto/
 util-obj-y = util/ qobject/ qapi/
 util-obj-y += qmp-introspect.o qapi-types.o qapi-visit.o qapi-event.o
 
@@ -89,7 +89,6 @@ endif
 
 #######################################################################
 # Target-independent parts used in system and user emulation
-common-obj-y += qemu-log.o
 common-obj-y += tcg-runtime.o
 common-obj-y += hw/
 common-obj-y += qom/