From 7b02f5447c64d1854468f758398c9f6fe9e5721f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Date: Sun, 30 Aug 2015 11:48:40 +0200 Subject: libcacard: use the standalone project MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Michael Tokarev Reviewed-by: Paolo Bonzini Tested-by: Paolo Bonzini --- hw/usb/Makefile.objs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'hw/usb/Makefile.objs') 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) -- cgit v1.2.3