[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 7/9] buildsys: Move libcacard cflags/libs to per obj
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PATCH 7/9] buildsys: Move libcacard cflags/libs to per object |
Date: |
Thu, 7 Sep 2017 16:29:16 +0800 |
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 b1320b1994..85fef3d16f 100755
--- a/configure
+++ b/configure
@@ -4237,8 +4237,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
@@ -5831,6 +5829,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 97f1c4561a..795ff25a5e 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] [PATCH 0/9] buildsys: Move ui/usb library cflags/libs to per object, Fam Zheng, 2017/09/07
- [Qemu-devel] [PATCH 1/9] buildsys: Move gtk/vte cflags/libs to per object, Fam Zheng, 2017/09/07
- [Qemu-devel] [PATCH 2/9] buildsys: Move sdl cflags/libs to per object, Fam Zheng, 2017/09/07
- [Qemu-devel] [PATCH 3/9] buildsys: Move vnc cflags/libs to per object, Fam Zheng, 2017/09/07
- [Qemu-devel] [PATCH 4/9] buildsys: Move audio libs to per object, Fam Zheng, 2017/09/07
- [Qemu-devel] [PATCH 5/9] buildsys: Move curese cflags/libs to per object, Fam Zheng, 2017/09/07
- [Qemu-devel] [PATCH 8/9] buildsys: Move libusb cflags/libs to per object, Fam Zheng, 2017/09/07
- [Qemu-devel] [PATCH 6/9] buildsys: Move opengl cflags to per object, Fam Zheng, 2017/09/07
- [Qemu-devel] [PATCH 7/9] buildsys: Move libcacard cflags/libs to per object,
Fam Zheng <=
- [Qemu-devel] [PATCH 9/9] buildsys: Move usb redir cflags/libs to per object, Fam Zheng, 2017/09/07
- Re: [Qemu-devel] [PATCH 0/9] buildsys: Move ui/usb library cflags/libs to per object, Gerd Hoffmann, 2017/09/07