Re: [Qemu-devel] [PATCH 10/10] libcacard: remove libcacard-specific CFLAGS and LIBS from global vars

[Michael Tokarev <mjt@tls.msk.ru>]

08.05.2014 17:36, Paolo Bonzini wrote:
> From: Michael Tokarev <mjt@tls.msk.ru>
> 
> 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 <pk11pub.h>
>  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