From patchwork Mon Apr 27 11:51:56 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 464965 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3181614007D for ; Mon, 27 Apr 2015 21:52:42 +1000 (AEST) Received: from localhost ([::1]:54393 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ymhaa-0004xl-6l for incoming@patchwork.ozlabs.org; Mon, 27 Apr 2015 07:52:40 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36915) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ymha7-00045w-Lg for qemu-devel@nongnu.org; Mon, 27 Apr 2015 07:52:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ymha3-00072w-Ae for qemu-devel@nongnu.org; Mon, 27 Apr 2015 07:52:11 -0400 Received: from isrv.corpit.ru ([86.62.121.231]:57933) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ymha3-00072c-3X; Mon, 27 Apr 2015 07:52:07 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id DE86442746; Mon, 27 Apr 2015 14:52:05 +0300 (MSK) Received: from tls.msk.ru (mjt.vpn.tls.msk.ru [192.168.177.99]) by tsrv.corpit.ru (Postfix) with SMTP id C5F1C8FC; Mon, 27 Apr 2015 14:52:05 +0300 (MSK) Received: (nullmailer pid 32486 invoked by uid 1000); Mon, 27 Apr 2015 11:52:05 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Date: Mon, 27 Apr 2015 14:51:56 +0300 Message-Id: <1430135516-32438-1-git-send-email-mjt@msgid.tls.msk.ru> X-Mailer: git-send-email 2.1.4 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 86.62.121.231 Cc: qemu-trivial@nongnu.org, Stefan Hajnoczi , Michael Tokarev , Peter Wu , Kevin Wolf Subject: [Qemu-devel] [PATCH v2] block/dmg: make it modular 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 dmg can optionally utilize libbz2, make it modular Signed-off-by: Michael Tokarev Reviewed-by: Paolo Bonzini --- block/Makefile.objs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/block/Makefile.objs b/block/Makefile.objs index db2933e..179e71d 100644 --- a/block/Makefile.objs +++ b/block/Makefile.objs @@ -1,4 +1,4 @@ -block-obj-y += raw_bsd.o qcow.o vdi.o vmdk.o cloop.o dmg.o bochs.o vpc.o vvfat.o +block-obj-y += raw_bsd.o qcow.o vdi.o vmdk.o cloop.o bochs.o vpc.o vvfat.o block-obj-y += qcow2.o qcow2-refcount.o qcow2-cluster.o qcow2-snapshot.o qcow2-cache.o block-obj-y += qed.o qed-gencb.o qed-l2-cache.o qed-table.o qed-cluster.o block-obj-y += qed-check.o @@ -37,6 +37,7 @@ gluster.o-libs := $(GLUSTERFS_LIBS) ssh.o-cflags := $(LIBSSH2_CFLAGS) ssh.o-libs := $(LIBSSH2_LIBS) archipelago.o-libs := $(ARCHIPELAGO_LIBS) +block-obj-m += dmg.o dmg.o-libs := $(BZIP2_LIBS) qcow.o-libs := -lz linux-aio.o-libs := -laio