diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-02-01 15:22:48 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-02-01 15:22:48 -0600 |
| commit | 9363ee31ab53fc0fd39fbe5936d9c00a2f4e54a4 (patch) | |
| tree | 77c55ab45310cbeced2a05e1f85a109bf2efd481 /Makefile.objs | |
| parent | cfb41c82ab9c468e599d3603ffcebeb81b6577ca (diff) | |
| parent | cbcc6336ce9e5c048821b136649712e078c4d05f (diff) | |
Merge remote branch 'spice/spice.v29.pull' into staging
Conflicts:
trace-events
Diffstat (limited to 'Makefile.objs')
| -rw-r--r-- | Makefile.objs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.objs b/Makefile.objs index 93406ff392..f1c7bfe4ea 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -105,7 +105,7 @@ 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 +common-obj-$(CONFIG_SPICE) += ui/spice-core.o ui/spice-input.o ui/spice-display.o spice-qemu-char.o audio-obj-y = audio.o noaudio.o wavaudio.o mixeng.o audio-obj-$(CONFIG_SDL) += sdlaudio.o |