diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-02-24 09:50:37 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-02-24 09:50:37 -0600 |
| commit | 18ac5499584319ef828c7da4c6223f818dde0234 (patch) | |
| tree | 38c46f72f4ccd3f4020e0655e6f3758cbddde90e /Makefile.objs | |
| parent | 7c1daf341f3374a490a03dfcde17021d3369aa48 (diff) | |
| parent | 546b60d06b9baecfe1cd1afdc41d80482a28942a (diff) | |
Merge remote-tracking branch 'mdroth/qga-win32-pull-2-23-12' into staging
* mdroth/qga-win32-pull-2-23-12:
qemu-ga: add win32 guest-shutdown command
qemu-ga: add Windows service integration
qemu-ga: add initial win32 support
qemu-ga: fixes for win32 build of qemu-ga
qemu-ga: rename guest-agent-commands.c -> commands-posix.c
qemu-ga: separate out common commands from posix-specific ones
qemu-ga: move channel/transport functionality into wrapper class
qemu-ga: Add schema documentation for types
Diffstat (limited to 'Makefile.objs')
| -rw-r--r-- | Makefile.objs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Makefile.objs b/Makefile.objs index 67ee3df828..808de6a250 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -424,11 +424,13 @@ common-obj-y += qmp.o hmp.o ###################################################################### # guest agent -qga-nested-y = guest-agent-commands.o guest-agent-command-state.o +qga-nested-y = commands.o guest-agent-command-state.o +qga-nested-$(CONFIG_POSIX) += commands-posix.o channel-posix.o +qga-nested-$(CONFIG_WIN32) += commands-win32.o channel-win32.o service-win32.o qga-obj-y = $(addprefix qga/, $(qga-nested-y)) -qga-obj-y += qemu-ga.o qemu-sockets.o module.o qemu-option.o +qga-obj-y += qemu-ga.o module.o qga-obj-$(CONFIG_WIN32) += oslib-win32.o -qga-obj-$(CONFIG_POSIX) += oslib-posix.o +qga-obj-$(CONFIG_POSIX) += oslib-posix.o qemu-sockets.o qemu-option.o vl.o: QEMU_CFLAGS+=$(GPROF_CFLAGS) |