From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47215) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VJd96-0006PM-NZ for qemu-devel@nongnu.org; Wed, 11 Sep 2013 01:39:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VJd90-0006bz-At for qemu-devel@nongnu.org; Wed, 11 Sep 2013 01:39:20 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49104) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VJd90-0006br-24 for qemu-devel@nongnu.org; Wed, 11 Sep 2013 01:39:14 -0400 From: Fam Zheng Date: Wed, 11 Sep 2013 13:38:29 +0800 Message-Id: <1378877909-28518-7-git-send-email-famz@redhat.com> In-Reply-To: <1378877909-28518-1-git-send-email-famz@redhat.com> References: <1378877909-28518-1-git-send-email-famz@redhat.com> Subject: [Qemu-devel] [RFC PATCH v5 6/6] block: build qed and curl as shared library List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, famz@redhat.com, mjt@tls.msk.ru, stefanha@redhat.com, pbonzini@redhat.com, vilanova@ac.upc.edu, rth@twiddle.net Curl and qed block drivers are built as shared object module. We have per object cflags and libs support now, move CURL_CFLAGS and CURL_LIBS from global option variables to a per object basis. "make install" is not installing them yet, manually copy it to ${prefix}/qemu/block/ to make it loaded. Signed-off-by: Fam Zheng --- block/Makefile.objs | 7 ++++--- configure | 5 ++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/block/Makefile.objs b/block/Makefile.objs index 3bb85b5..741b92f 100644 --- a/block/Makefile.objs +++ b/block/Makefile.objs @@ -1,7 +1,6 @@ block-obj-y += raw_bsd.o cow.o qcow.o vdi.o vmdk.o cloop.o dmg.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 +block-obj-m += qed.mo block-obj-y += vhdx.o block-obj-y += parallels.o blkdebug.o blkverify.o block-obj-y += snapshot.o qapi.o @@ -23,4 +22,6 @@ common-obj-y += commit.o common-obj-y += mirror.o common-obj-y += backup.o -$(obj)/curl.o: QEMU_CFLAGS+=$(CURL_CFLAGS) +curl.o-cflags := $(CURL_CFLAGS) +curl.o-libs := $(CURL_LIBS) +qed.mo-objs := qed.o qed-gencb.o qed-l2-cache.o qed-table.o qed-cluster.o qed-check.o diff --git a/configure b/configure index f1d7fa7..f8be093 100755 --- a/configure +++ b/configure @@ -2217,8 +2217,6 @@ EOF curl_libs=`$curlconfig --libs 2>/dev/null` if compile_prog "$curl_cflags" "$curl_libs" ; then curl=yes - libs_tools="$curl_libs $libs_tools" - libs_softmmu="$curl_libs $libs_softmmu" else if test "$curl" = "yes" ; then feature_not_found "curl" @@ -3901,8 +3899,9 @@ if test "$bswap_h" = "yes" ; then echo "CONFIG_MACHINE_BSWAP_H=y" >> $config_host_mak fi if test "$curl" = "yes" ; then - echo "CONFIG_CURL=y" >> $config_host_mak + echo "CONFIG_CURL=m" >> $config_host_mak echo "CURL_CFLAGS=$curl_cflags" >> $config_host_mak + echo "CURL_LIBS=$curl_libs" >> $config_host_mak fi if test "$brlapi" = "yes" ; then echo "CONFIG_BRLAPI=y" >> $config_host_mak -- 1.8.3.1