From patchwork Wed Jun 6 06:36:24 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 163282 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 25D35B6FAC for ; Wed, 6 Jun 2012 17:39:45 +1000 (EST) Received: from localhost ([::1]:44035 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ScAqF-0004yf-1v for incoming@patchwork.ozlabs.org; Wed, 06 Jun 2012 03:39:43 -0400 Received: from eggs.gnu.org ([208.118.235.92]:39476) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sc9rx-0003z6-Ra for qemu-devel@nongnu.org; Wed, 06 Jun 2012 02:37:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Sc9rw-0002Gi-4D for qemu-devel@nongnu.org; Wed, 06 Jun 2012 02:37:25 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:50333) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sc9rv-000290-Ru for qemu-devel@nongnu.org; Wed, 06 Jun 2012 02:37:24 -0400 Received: by mail-pb0-f45.google.com with SMTP id ro12so9244268pbb.4 for ; Tue, 05 Jun 2012 23:37:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=6t+8SAE3lmWTWQOQORo0MSXZ8D6HFf+Jb5gK4up+H2s=; b=i3bvsM3Y8m3cxfrBD3Mh7B/VuFsVKQ5N6PR0VaqDt4ZuSN+h1/LI8xp4rswWhJitnM q6kce3NPAWRY6EY1egygAkyICOnSgqTQZhc0KMjii5uarsmMXQRp54YNvmbZujGl1YWW u+Cp/H/HVa8jwO+6Yeq1240JE/ytc78qVBXgxKLVayvp5+vGuSz3nZBBG5wMvgwP33iF oAYu4Jpl/OAFU/ohXbwkKNoTot4J3q634PMKT1plS4P68zuTwXSEzltCRmHpkSCe5Sk6 Qt11R5jNU0jWx/jM9NJ5FA1pFmLHW4BnmvuWusW2ZDTPLHyc6INhtvePTmJrGyGp9r/l ZXcQ== Received: by 10.68.226.226 with SMTP id rv2mr56021354pbc.101.1338964642834; Tue, 05 Jun 2012 23:37:22 -0700 (PDT) Received: from yakj.usersys.redhat.com.usersys.redhat.com (p40081-ipngn402hodogaya.kanagawa.ocn.ne.jp. [180.23.161.81]) by mx.google.com with ESMTPS id py5sm1479093pbb.1.2012.06.05.23.37.20 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 05 Jun 2012 23:37:21 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 6 Jun 2012 08:36:24 +0200 Message-Id: <1338964592-22223-18-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.10.1 In-Reply-To: <1338964592-22223-1-git-send-email-pbonzini@redhat.com> References: <1338964592-22223-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.160.45 Cc: anthony@codemonkey.ws Subject: [Qemu-devel] [PATCH v2 17/25] build: move qga/ objects to nested Makefile.objs X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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