diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2015-08-30 11:48:40 +0200 |
|---|---|---|
| committer | Marc-André Lureau <marcandre.lureau@redhat.com> | 2015-09-23 23:34:17 +0200 |
| commit | 7b02f5447c64d1854468f758398c9f6fe9e5721f (patch) | |
| tree | 887be15cede2707dceba2f08534268791077d427 /hw/usb | |
| parent | 684bb5770ec5d72a66620f64fc5d9672bf8d3509 (diff) | |
| download | focaccia-qemu-7b02f5447c64d1854468f758398c9f6fe9e5721f.tar.gz focaccia-qemu-7b02f5447c64d1854468f758398c9f6fe9e5721f.zip | |
libcacard: use the standalone project
libcacard is now a standalone project hosted with the Spice project (see the 2.5.0 release announcement), remove it from qemu tree. Use the library if found during configure or if --enable-smartcard. Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Reviewed-by: Michael Tokarev <mjt@tls.msk.ru> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> Tested-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw/usb')
| -rw-r--r-- | hw/usb/Makefile.objs | 5 | ||||
| -rw-r--r-- | hw/usb/ccid-card-passthru.c | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/hw/usb/Makefile.objs b/hw/usb/Makefile.objs index 7443e386b3..8f00fbd8f6 100644 --- a/hw/usb/Makefile.objs +++ b/hw/usb/Makefile.objs @@ -23,9 +23,8 @@ common-obj-$(CONFIG_USB_BLUETOOTH) += dev-bluetooth.o 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 +common-obj-$(CONFIG_SMARTCARD) += ccid-card-passthru.o +common-obj-$(CONFIG_SMARTCARD) += ccid-card-emulated.o endif ifeq ($(CONFIG_POSIX),y) diff --git a/hw/usb/ccid-card-passthru.c b/hw/usb/ccid-card-passthru.c index 85a4fc3e53..9f49c0537f 100644 --- a/hw/usb/ccid-card-passthru.c +++ b/hw/usb/ccid-card-passthru.c @@ -12,7 +12,7 @@ #include "qemu/error-report.h" #include "qemu/sockets.h" #include "ccid.h" -#include "libcacard/vscard_common.h" +#include "cacard/vscard_common.h" #define DPRINTF(card, lvl, fmt, ...) \ do { \ |