Merge remote-tracking branch 'remotes/ehabkost/tags/python-next-pull-request' into...

[qemu.git] / Makefile.objs

diff --git a/Makefile.objs b/Makefile.objs
index d741134cc77ff2eec207981b8ec68ba2fc21840f..c6c9b8fc2177a3f6e26c364112e3fc1bbba90b3e 100644 (file)
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -104,11 +104,13 @@ common-obj-$(CONFIG_LINUX) += fsdev/
 common-obj-y += migration/
 
 common-obj-y += audio/
+common-obj-m += audio/
 common-obj-y += hw/
 
 common-obj-y += replay/
 
 common-obj-y += ui/
+common-obj-m += ui/
 common-obj-y += bt-host.o bt-vhci.o
 bt-host.o-cflags := $(BLUEZ_CFLAGS)
 
@@ -232,6 +234,7 @@ trace-events-subdirs += hw/alpha
 trace-events-subdirs += hw/hppa
 trace-events-subdirs += hw/xen
 trace-events-subdirs += hw/ide
+trace-events-subdirs += hw/tpm
 trace-events-subdirs += ui
 trace-events-subdirs += audio
 trace-events-subdirs += net