From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57404) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VHWgV-0005qT-H4 for qemu-devel@nongnu.org; Thu, 05 Sep 2013 06:21:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VHWgP-0002fu-Cx for qemu-devel@nongnu.org; Thu, 05 Sep 2013 06:21:07 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39659) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VHWgP-0002fo-0c for qemu-devel@nongnu.org; Thu, 05 Sep 2013 06:21:01 -0400 From: Fam Zheng Date: Thu, 5 Sep 2013 18:20:45 +0800 Message-Id: <1378376448-29036-4-git-send-email-famz@redhat.com> In-Reply-To: <1378376448-29036-1-git-send-email-famz@redhat.com> References: <1378376448-29036-1-git-send-email-famz@redhat.com> Subject: [Qemu-devel] [RFC PATCH 3/6] Makefile: define curl cflags and libs with object List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, mjt@tls.msk.ru, famz@redhat.com, stefanha@redhat.com We have per object cflags and libs support now, move CURL_CFLAGS and CURL_LIBS from global option variables to a per object basis. Signed-off-by: Fam Zheng --- block/Makefile.objs | 3 ++- configure | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/block/Makefile.objs b/block/Makefile.objs index 4cf9aa4..b1e1520 100644 --- a/block/Makefile.objs +++ b/block/Makefile.objs @@ -23,4 +23,5 @@ common-obj-y += commit.o common-obj-y += mirror.o common-obj-y += backup.o -$(obj)/curl.o: QEMU_CFLAGS+=$(CURL_CFLAGS) +$(obj)/curl.o-cflags := $(CURL_CFLAGS) +$(obj)/curl.o-libs := $(CURL_LIBS) diff --git a/configure b/configure index 0a55c20..48e14b8 100755 --- a/configure +++ b/configure @@ -2199,8 +2199,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" @@ -3878,6 +3876,7 @@ fi if test "$curl" = "yes" ; then echo "CONFIG_CURL=y" >> $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