From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:59346) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ScXLr-0007Ii-UD for qemu-devel@nongnu.org; Thu, 07 Jun 2012 03:41:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ScXLq-0006Bw-7N for qemu-devel@nongnu.org; Thu, 07 Jun 2012 03:41:51 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:56182) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ScXLp-0005d9-UX for qemu-devel@nongnu.org; Thu, 07 Jun 2012 03:41:50 -0400 Received: by mail-pb0-f45.google.com with SMTP id ro12so749296pbb.4 for ; Thu, 07 Jun 2012 00:41:48 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Thu, 7 Jun 2012 09:40:05 +0200 Message-Id: <1339054814-20939-21-git-send-email-pbonzini@redhat.com> In-Reply-To: <1339054814-20939-1-git-send-email-pbonzini@redhat.com> References: <1339054814-20939-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH v3 20/29] build: move qga/ objects to nested Makefile.objs List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: anthony@codemonkey.ws 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 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 \ diff --git a/qga/Makefile.objs b/qga/Makefile.objs new file mode 100644 index 0000000..6a4d843 --- /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 -- 1.7.10.1