From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43715) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WiPf0-0003Bb-8f for qemu-devel@nongnu.org; Thu, 08 May 2014 10:51:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WiPev-0000ri-BP for qemu-devel@nongnu.org; Thu, 08 May 2014 10:50:58 -0400 Received: from isrv.corpit.ru ([86.62.121.231]:43782) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WiPeu-0000ra-MW for qemu-devel@nongnu.org; Thu, 08 May 2014 10:50:53 -0400 Message-ID: <536B99CB.4040300@msgid.tls.msk.ru> Date: Thu, 08 May 2014 18:50:51 +0400 From: Michael Tokarev MIME-Version: 1.0 References: <1399556198-17776-1-git-send-email-pbonzini@redhat.com> <1399556198-17776-11-git-send-email-pbonzini@redhat.com> In-Reply-To: <1399556198-17776-11-git-send-email-pbonzini@redhat.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 10/10] libcacard: remove libcacard-specific CFLAGS and LIBS from global vars List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paolo Bonzini , qemu-devel@nongnu.org 08.05.2014 17:36, Paolo Bonzini wrote: > From: Michael Tokarev > > Currently all what's needed for single file libcacard/vcard_emul_nss.c > (libnss cflags) and hw/usb/ccid-card-emulated.c (libcacard includes) > together with the libs is added to global QEMU_CFLAGS and libs_softmmu. > > Use the cflags only where really used (for two mentioned files), and > libs only where needed. > > While at it, rename variables to better reflect reality: libcacard_* > is really nss_*. > > This needs a bit more tweaking: $(NSS_LIBS) should not contain $glib_libs > (ditto for _cflags). But in order to fix it, some more preparations > should be made first. So add a FIXME comment. [] > diff --git a/configure b/configure > index ac2fa15..25d59f9 100755 > --- a/configure > +++ b/configure > @@ -3470,10 +3470,10 @@ if test "$smartcard_nss" != "no"; then > #include > int main(void) { PK11_FreeSlot(0); return 0; } > EOF > - smartcard_includes="-I\$(SRC_PATH)/libcacard" > - libcacard_libs="$($pkg_config --libs nss 2>/dev/null) $glib_libs" > - libcacard_cflags="$($pkg_config --cflags nss 2>/dev/null) $glib_cflags" > - test_cflags="$libcacard_cflags" > + # FIXME: do not include $glib_* in here > + nss_libs="$($pkg_config --libs nss 2>/dev/null) $glib_libs" > + nss_cflags="$($pkg_config --cflags nss 2>/dev/null) $glib_cflags" glib_cflags isn't needed here, only glib_libs. Or else glib_cflags is added twice (doen't hurt, just bigger command line) FWIW. Thanks, /mjt