From patchwork Wed Jun 6 06:36:23 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 163284 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 D7A7FB6FA1 for ; Wed, 6 Jun 2012 17:42:36 +1000 (EST) Received: from localhost ([::1]:46578 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ScAt0-0006S5-PX for incoming@patchwork.ozlabs.org; Wed, 06 Jun 2012 03:42:34 -0400 Received: from eggs.gnu.org ([208.118.235.92]:39488) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sc9s0-0003z7-IL for qemu-devel@nongnu.org; Wed, 06 Jun 2012 02:37:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Sc9rt-0002GZ-V0 for qemu-devel@nongnu.org; Wed, 06 Jun 2012 02:37:27 -0400 Received: from mail-pz0-f45.google.com ([209.85.210.45]:46266) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sc9rt-00028G-Lt for qemu-devel@nongnu.org; Wed, 06 Jun 2012 02:37:21 -0400 Received: by mail-pz0-f45.google.com with SMTP id v2so9050351dad.4 for ; Tue, 05 Jun 2012 23:37:20 -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=Cid7hsnY45z+QLTYGN505XjyYDoCU89S0uaxdmsX+wI=; b=UMv/q4mU+inCn02QymqM8GcRNR0xHbzFJAvCMe/vw4TrmGvylV9VJnVJWJej+gk/fY fdERdUA5umpMBBqDjUInRB/zVr3xCKPn2u/J0ih0znrVOY3YMjwCG6o5iDofYWnnPtcX 7+oh6tXJ58mnDbLBoAoLwlMAAo3g/g6Hh0uFIchxrSFFk9/Drskbd2LL1Xc+M2MLqAnr 2pBWjAofaTQTIIl9iN3PMn0GA7ezXUE6Jk7jW3eaYmUwKd5+h5Kf6sHia2ddRfseQtbr OyF4p/Kv2uZXXekk8xFPm8Z8quCyOR6HTCi1kNaNyP2nsFHaDPi/oLBwZYiD1ciNoRKi iBrA== Received: by 10.68.225.6 with SMTP id rg6mr55619679pbc.100.1338964640427; Tue, 05 Jun 2012 23:37:20 -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.17 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 05 Jun 2012 23:37:19 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 6 Jun 2012 08:36:23 +0200 Message-Id: <1338964592-22223-17-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.210.45 Cc: anthony@codemonkey.ws Subject: [Qemu-devel] [PATCH v2 16/25] build: move qapi/ 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 | 6 ++---- qapi/Makefile.objs | 3 +++ 2 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 qapi/Makefile.objs diff --git a/Makefile.objs b/Makefile.objs index 668c148..e7f7a85 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -375,10 +375,7 @@ libcacard-y = cac.o event.o vcard.o vreader.o vcard_emul_nss.o vcard_emul_type.o ###################################################################### # qapi -qapi-nested-y = qapi-visit-core.o qapi-dealloc-visitor.o qmp-input-visitor.o -qapi-nested-y += qmp-output-visitor.o qmp-registry.o qmp-dispatch.o -qapi-nested-y += string-input-visitor.o string-output-visitor.o -qapi-obj-y = $(addprefix qapi/, $(qapi-nested-y)) +qapi-obj-y = qapi/ common-obj-y += qmp-marshal.o qapi-visit.o qapi-types.o common-obj-y += qmp.o hmp.o @@ -405,6 +402,7 @@ QEMU_CFLAGS+=$(GLIB_CFLAGS) nested-vars += \ block-obj-y \ qom-obj-y \ + qapi-obj-y \ user-obj-y \ common-obj-y \ extra-obj-y diff --git a/qapi/Makefile.objs b/qapi/Makefile.objs new file mode 100644 index 0000000..d0b0c16 --- /dev/null +++ b/qapi/Makefile.objs @@ -0,0 +1,3 @@ +qapi-obj-y = qapi-visit-core.o qapi-dealloc-visitor.o qmp-input-visitor.o +qapi-obj-y += qmp-output-visitor.o qmp-registry.o qmp-dispatch.o +qapi-obj-y += string-input-visitor.o string-output-visitor.o