diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2010-10-05 14:14:19 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2010-10-05 14:14:19 -0500 |
| commit | 4447d609688e75a40a10b559e3b6ae83843e3095 (patch) | |
| tree | 94e721b263ae28e68e8f1ccd1aa7db401c8b7129 /Makefile.objs | |
| parent | 48f57044e6a826329ebcac5d5a76d776a14e5d43 (diff) | |
| parent | 869564a9c0f78b1972e1ac51e69cb2016af3b060 (diff) | |
| download | qemu-4447d609688e75a40a10b559e3b6ae83843e3095.zip qemu-4447d609688e75a40a10b559e3b6ae83843e3095.tar.gz qemu-4447d609688e75a40a10b559e3b6ae83843e3095.tar.bz2 | |
Merge remote branch 'spice/submit.6' into staging
Conflicts:
configure
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'Makefile.objs')
| -rw-r--r-- | Makefile.objs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Makefile.objs b/Makefile.objs index 9c13bb3..816194a 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -84,11 +84,14 @@ common-obj-y += qemu-char.o savevm.o #aio.o common-obj-y += msmouse.o ps2.o common-obj-y += qdev.o qdev-properties.o common-obj-y += block-migration.o +common-obj-y += pflib.o common-obj-$(CONFIG_BRLAPI) += baum.o common-obj-$(CONFIG_POSIX) += migration-exec.o migration-unix.o migration-fd.o common-obj-$(CONFIG_WIN32) += version.o +common-obj-$(CONFIG_SPICE) += ui/spice-core.o ui/spice-input.o ui/spice-display.o + audio-obj-y = audio.o noaudio.o wavaudio.o mixeng.o audio-obj-$(CONFIG_SDL) += sdlaudio.o audio-obj-$(CONFIG_OSS) += ossaudio.o |