From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47653) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WiO4U-0003mq-7b for qemu-devel@nongnu.org; Thu, 08 May 2014 09:09:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WiO4K-0004mj-TE for qemu-devel@nongnu.org; Thu, 08 May 2014 09:09:10 -0400 Received: from mail-we0-x235.google.com ([2a00:1450:400c:c03::235]:51204) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WiO4K-0004mB-KJ for qemu-devel@nongnu.org; Thu, 08 May 2014 09:09:00 -0400 Received: by mail-we0-f181.google.com with SMTP id w61so2442773wes.40 for ; Thu, 08 May 2014 06:08:59 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Thu, 8 May 2014 15:08:47 +0200 Message-Id: <1399554527-22262-3-git-send-email-pbonzini@redhat.com> In-Reply-To: <1399554527-22262-1-git-send-email-pbonzini@redhat.com> References: <1399554527-22262-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 2/2] build: more libcacard cleanups List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mjt@tls.msk.ru To be squashed in Michael's "libcacard: remove libcacard-specific CFLAGS and LIBS from global vars". Signed-off-by: Paolo Bonzini --- configure | 2 -- hw/usb/Makefile.objs | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/configure b/configure index b0c0c9c..25d59f9 100755 --- a/configure +++ b/configure @@ -3470,7 +3470,6 @@ if test "$smartcard_nss" != "no"; then #include int main(void) { PK11_FreeSlot(0); return 0; } EOF - smartcard_includes="-I\$(SRC_PATH)/libcacard" # FIXME: do not include $glib_* in here nss_libs="$($pkg_config --libs nss 2>/dev/null) $glib_libs" nss_cflags="$($pkg_config --cflags nss 2>/dev/null) $glib_cflags" @@ -4497,7 +4496,6 @@ fi if test "$smartcard_nss" = "yes" ; then echo "CONFIG_SMARTCARD_NSS=y" >> $config_host_mak - echo "SMARTCARD_INCLUDES=$smartcard_includes" >> $config_host_mak echo "NSS_LIBS=$nss_libs" >> $config_host_mak echo "NSS_CFLAGS=$nss_cflags" >> $config_host_mak fi diff --git a/hw/usb/Makefile.objs b/hw/usb/Makefile.objs index 54d3982..a32b38b 100644 --- a/hw/usb/Makefile.objs +++ b/hw/usb/Makefile.objs @@ -24,8 +24,8 @@ 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 := $(SMARTCARD_INCLUDES) -libs_softmmu += $(NSS_LIBS) +ccid-card-emulated.o-cflags := -I$(SRC_PATH)/libcacard +ccid-card-emulated.o-libs += $(NSS_LIBS) endif ifeq ($(CONFIG_POSIX),y) -- 1.8.3.1