summary refs log tree commit diff stats
path: root/hw/usb
diff options
context:
space:
mode:
authorMichael Tokarev <mjt@tls.msk.ru>2014-05-08 16:48:27 +0400
committerPaolo Bonzini <pbonzini@redhat.com>2014-05-09 22:59:40 +0200
commit9d171bd9375e4d08feff9adda15163e0811f5f42 (patch)
treef2372f0b502f650e64e1049d798bfb107b94ab2d /hw/usb
parent2a8e6c7a85b65c1b8a8af3005d5e8868a73a5d8f (diff)
downloadfocaccia-qemu-9d171bd9375e4d08feff9adda15163e0811f5f42.tar.gz
focaccia-qemu-9d171bd9375e4d08feff9adda15163e0811f5f42.zip
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 'hw/usb')
-rw-r--r--hw/usb/Makefile.objs1
1 files changed, 1 insertions, 0 deletions
diff --git a/hw/usb/Makefile.objs b/hw/usb/Makefile.objs
index 17d460cb04..3fe4dff3bd 100644
--- a/hw/usb/Makefile.objs
+++ b/hw/usb/Makefile.objs
@@ -24,6 +24,7 @@ ifeq ($(CONFIG_USB_SMARTCARD),y)
 common-obj-y                          += dev-smartcard-reader.o
 common-obj-y                          += ccid-card-passthru.o
 common-obj-$(CONFIG_SMARTCARD_NSS)    += ccid-card-emulated.o
+ccid-card-emulated.o-cflags := -I$(SRC_PATH)/libcacard
 endif
 
 ifeq ($(CONFIG_POSIX),y)