aboutsummaryrefslogtreecommitdiff
path: root/Makefile.objs
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2012-05-22 13:50:58 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2012-06-07 09:21:16 +0200
commit4eb7ba8aff38291296bce7e5efa4ac6f42c989c4 (patch)
tree4ed697060c74caa2b73588a1e21479038594d1fb /Makefile.objs
parentdd5614d6f1d22c4e940368e1433325a3669cbbc2 (diff)
downloadqemu-4eb7ba8aff38291296bce7e5efa4ac6f42c989c4.zip
qemu-4eb7ba8aff38291296bce7e5efa4ac6f42c989c4.tar.gz
qemu-4eb7ba8aff38291296bce7e5efa4ac6f42c989c4.tar.bz2
build: move qga/ objects to nested Makefile.objs
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'Makefile.objs')
-rw-r--r--Makefile.objs7
1 files changed, 2 insertions, 5 deletions
diff --git a/Makefile.objs b/Makefile.objs
index e7f7a85..fec21a4 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -385,11 +385,7 @@ universal-obj-y += $(qapi-obj-y)
######################################################################
# guest agent
-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 module.o
+qga-obj-y = qga/ qemu-ga.o module.o
qga-obj-$(CONFIG_WIN32) += oslib-win32.o
qga-obj-$(CONFIG_POSIX) += oslib-posix.o qemu-sockets.o qemu-option.o
@@ -400,6 +396,7 @@ vl.o: QEMU_CFLAGS+=$(SDL_CFLAGS)
QEMU_CFLAGS+=$(GLIB_CFLAGS)
nested-vars += \
+ qga-obj-y \
block-obj-y \
qom-obj-y \
qapi-obj-y \