On Thu, 09/07 14:46, Philippe Mathieu-Daudé wrote: > > > On 09/07/2017 05:29 AM, Fam Zheng wrote: > > Signed-off-by: Fam Zheng <f...@redhat.com> > > --- > > 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) > > this line here looks more natural to me: > > common-obj-$(CONFIG_SMARTCARD) += smartcard.mo
Do you mean to move this line *after* the .mo variables? I personally find the current (top-down) order easier to understand, and it more common. Fam > > > endif > > ifeq ($(CONFIG_POSIX),y) > > >
