Commit 7b62bf5a authored Sep 07, 2017 by Fam Zheng

buildsys: Move libcacard cflags/libs to per object



Signed-off-by: Fam Zheng <famz@redhat.com>
Message-Id: <20170907082918.7299-8-famz@redhat.com>
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Fam Zheng <famz@redhat.com>

parent b1149911

configure

+2 −2

Original line number	Diff line number	Diff line
		@@ -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

hw/usb/Makefile.objs

+4 −2

Original line number	Diff line number	Diff line
		@@ -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)