[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 17/36] buildsys: Move libcacard cflags/libs to per ob
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PULL 17/36] buildsys: Move libcacard cflags/libs to per object |
Date: |
Fri, 22 Sep 2017 15:46:40 +0800 |
Signed-off-by: Fam Zheng <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Gerd Hoffmann <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Fam Zheng <address@hidden>
---
configure | 4 ++--
hw/usb/Makefile.objs | 6 ++++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/configure b/configure
index fd544e7b55..c5d5f02c08 100755
--- a/configure
+++ b/configure
@@ -4206,8 +4206,6 @@ if test "$smartcard" != "no"; then
if $pkg_config libcacard; then
libcacard_cflags=$($pkg_config --cflags libcacard)
libcacard_libs=$($pkg_config --libs libcacard)
- QEMU_CFLAGS="$QEMU_CFLAGS $libcacard_cflags"
- libs_softmmu="$libs_softmmu $libcacard_libs"
smartcard="yes"
else
if test "$smartcard" = "yes"; then
@@ -5785,6 +5783,8 @@ fi
if test "$smartcard" = "yes" ; then
echo "CONFIG_SMARTCARD=y" >> $config_host_mak
+ echo "SMARTCARD_CFLAGS=$libcacard_cflags" >> $config_host_mak
+ echo "SMARTCARD_LIBS=$libcacard_libs" >> $config_host_mak
fi
if test "$libusb" = "yes" ; then
diff --git a/hw/usb/Makefile.objs b/hw/usb/Makefile.objs
index 757e365562..9aceb6cc3d 100644
--- a/hw/usb/Makefile.objs
+++ b/hw/usb/Makefile.objs
@@ -26,8 +26,10 @@ common-obj-$(CONFIG_USB_BLUETOOTH) += dev-bluetooth.o
ifeq ($(CONFIG_USB_SMARTCARD),y)
common-obj-y += dev-smartcard-reader.o
-common-obj-$(CONFIG_SMARTCARD) += ccid-card-passthru.o
-common-obj-$(CONFIG_SMARTCARD) += ccid-card-emulated.o
+common-obj-$(CONFIG_SMARTCARD) += smartcard.mo
+smartcard.mo-objs := ccid-card-passthru.o ccid-card-emulated.o
+smartcard.mo-cflags := $(SMARTCARD_CFLAGS)
+smartcard.mo-libs := $(SMARTCARD_LIBS)
endif
ifeq ($(CONFIG_POSIX),y)
--
2.13.5
- [Qemu-devel] [PULL 07/36] tests/docker: Clean up paths, (continued)
- [Qemu-devel] [PULL 07/36] tests/docker: Clean up paths, Fam Zheng, 2017/09/22
- [Qemu-devel] [PULL 08/36] docker: Fix return code of build_qemu(), Fam Zheng, 2017/09/22
- [Qemu-devel] [PULL 09/36] docker: Add test_fail and prep_fail, Fam Zheng, 2017/09/22
- [Qemu-devel] [PULL 10/36] docker: Use unconfined security profile, Fam Zheng, 2017/09/22
- [Qemu-devel] [PULL 11/36] docker: Add nettle-devel to fedora image, Fam Zheng, 2017/09/22
- [Qemu-devel] [PULL 12/36] docker: Add test-block, Fam Zheng, 2017/09/22
- [Qemu-devel] [PULL 13/36] vl: Don't include vde header, Fam Zheng, 2017/09/22
- [Qemu-devel] [PULL 15/36] buildsys: Move sdl cflags/libs to per object, Fam Zheng, 2017/09/22
- [Qemu-devel] [PULL 14/36] buildsys: Move vde libs to per object, Fam Zheng, 2017/09/22
- [Qemu-devel] [PULL 16/36] buildsys: Move audio libs to per object, Fam Zheng, 2017/09/22
- [Qemu-devel] [PULL 17/36] buildsys: Move libcacard cflags/libs to per object,
Fam Zheng <=
- [Qemu-devel] [PULL 18/36] buildsys: Move libusb cflags/libs to per object, Fam Zheng, 2017/09/22
- [Qemu-devel] [PULL 19/36] buildsys: Move usb redir cflags/libs to per object, Fam Zheng, 2017/09/22
- [Qemu-devel] [PULL 20/36] buildsys: Move brlapi libs to per object, Fam Zheng, 2017/09/22
- [Qemu-devel] [PULL 21/36] buildsys: Move rdma libs to per object, Fam Zheng, 2017/09/22
- [Qemu-devel] [PULL 22/36] MAINTAINERS: Fix subsystem name for "Build and test automation", Fam Zheng, 2017/09/22
- [Qemu-devel] [PULL 23/36] gitignore: Ignore vm test images, Fam Zheng, 2017/09/22
- [Qemu-devel] [PULL 24/36] qemu.py: Add "wait()" method, Fam Zheng, 2017/09/22
- [Qemu-devel] [PULL 26/36] tests: Add a test key pair, Fam Zheng, 2017/09/22
- [Qemu-devel] [PULL 25/36] scripts: Add archive-source.sh, Fam Zheng, 2017/09/22
- [Qemu-devel] [PULL 27/36] tests: Add vm test lib, Fam Zheng, 2017/09/22