diff options
author | Michael Tokarev <mjt@tls.msk.ru> | 2014-05-08 16:48:27 +0400 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2014-05-09 22:59:40 +0200 |
commit | 9d171bd9375e4d08feff9adda15163e0811f5f42 (patch) | |
tree | f2372f0b502f650e64e1049d798bfb107b94ab2d /Makefile.objs | |
parent | 2a8e6c7a85b65c1b8a8af3005d5e8868a73a5d8f (diff) |
libcacard: remove libcacard-specific CFLAGS and LIBS from global vars
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.
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'Makefile.objs')
-rw-r--r-- | Makefile.objs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile.objs b/Makefile.objs index f0069ba057..b897e1dc34 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -31,6 +31,8 @@ libcacard-y += libcacard/vcard_emul_nss.o libcacard-y += libcacard/vcard_emul_type.o libcacard-y += libcacard/card_7816.o libcacard-y += libcacard/vcardt.o +libcacard/vcard_emul_nss.o-cflags := $(NSS_CFLAGS) +libcacard/vcard_emul_nss.o-libs := $(NSS_LIBS) ###################################################################### # Target independent part of system emulation. The long term path is to |