diff options
| author | Aurelien Jarno <aurelien@aurel32.net> | 2010-12-27 22:59:48 +0100 |
|---|---|---|
| committer | Aurelien Jarno <aurelien@aurel32.net> | 2010-12-27 22:59:48 +0100 |
| commit | 818c2e1b9777599d333855330d94050b3432c8b7 (patch) | |
| tree | df85b289b7c0f797fbf5bf8ca5bca4422b387aa7 /Makefile.target | |
| parent | 4058fd98fd7e9c476774717adbd49698dd273166 (diff) | |
| parent | 7572150c189c6553c2448334116ab717680de66d (diff) | |
| download | qemu-818c2e1b9777599d333855330d94050b3432c8b7.zip | |
Merge branch 'spice.v23.pull' of git://anongit.freedesktop.org/spice/qemu
* 'spice.v23.pull' of git://anongit.freedesktop.org/spice/qemu:
vnc/spice: add set_passwd monitor command.
vnc: support password expire
vnc: auth reject cleanup
spice: add qmp 'query-spice' and hmp 'info spice' commands.
spice: connection events.
spice: add qxl device
spice: add qxl vgabios binary.
Diffstat (limited to 'Makefile.target')
| -rw-r--r-- | Makefile.target | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile.target b/Makefile.target index d08f5dd4ef..a5e217edc3 100644 --- a/Makefile.target +++ b/Makefile.target @@ -217,6 +217,7 @@ obj-i386-y += vmmouse.o vmport.o hpet.o applesmc.o obj-i386-y += device-hotplug.o pci-hotplug.o smbios.o wdt_ib700.o obj-i386-y += debugcon.o multiboot.o obj-i386-y += pc_piix.o +obj-i386-$(CONFIG_SPICE) += qxl.o qxl-logger.o qxl-render.o # shared objects obj-ppc-y = ppc.o |