From 4eb7ba8aff38291296bce7e5efa4ac6f42c989c4 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Tue, 22 May 2012 13:50:58 +0200 Subject: [PATCH] build: move qga/ objects to nested Makefile.objs Signed-off-by: Paolo Bonzini --- Makefile.objs | 7 ++----- qga/Makefile.objs | 3 +++ 2 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 qga/Makefile.objs diff --git a/Makefile.objs b/Makefile.objs index e7f7a85c7c..fec21a4fa9 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 \ diff --git a/qga/Makefile.objs b/qga/Makefile.objs new file mode 100644 index 0000000000..6a4d843436 --- /dev/null +++ b/qga/Makefile.objs @@ -0,0 +1,3 @@ +qga-obj-y = commands.o guest-agent-command-state.o +qga-obj-$(CONFIG_POSIX) += commands-posix.o channel-posix.o +qga-obj-$(CONFIG_WIN32) += commands-win32.o channel-win32.o service-win32.o