VivoKey/vsmartcard
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

don't install libvpcd when libpcsclite is requested

Browse Source 
libpcsclite now statically links against libvpcd. This also is fully
compatible with OpenSC now, which uses dlopen/LoadLibrary for the PC/SC
provider.
This commit is contained in:
Frank Morgner
2013-08-07 21:43:41 +02:00
parent a82d98a93d
commit 4971ca1e17
4 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
virtualsmartcard/src/Makefile.am
View File

@@ -1,5 +1,5 @@
SUBDIRS = vpcd vpicc
if BUILD_LIBPCSCLITE if BUILD_LIBPCSCLITE
SUBDIRS = libpcsclite vpcd vpicc SUBDIRS += libpcsclite
else
SUBDIRS = vpcd vpicc
endif endif

4
virtualsmartcard/src/libpcsclite/Makefile.am
View File

@@ -4,8 +4,8 @@ lib_LTLIBRARIES = libpcsclite.la
libpcsclite_la_CPPFLAGS = $(PCSC_CFLAGS) -I$(srcdir)/../vpcd libpcsclite_la_CPPFLAGS = $(PCSC_CFLAGS) -I$(srcdir)/../vpcd
libpcsclite_la_LDFLAGS = -no-undefined libpcsclite_la_LDFLAGS = -no-undefined
libpcsclite_la_SOURCES = winscard.c debug.c strlcpy.c error.c \ libpcsclite_la_SOURCES = winscard.c debug.c strlcpy.c error.c
$(top_builddir)/src/vpcd/libvpcd.la libpcsclite_la_LIBADD = $(top_builddir)/src/vpcd/libvpcd.la
noinst_HEADERS = pcsclite.h strlcpycat.h misc.h noinst_HEADERS = pcsclite.h strlcpycat.h misc.h

2
virtualsmartcard/src/libpcsclite/libpcsclite.pc.in
View File

@@ -6,5 +6,5 @@ includedir=@includedir@/PCSC
Name: @PACKAGE_NAME@ Name: @PACKAGE_NAME@
Description: PC/SC smart card interface Description: PC/SC smart card interface
Version: @VERSION@ Version: @VERSION@
Libs: -L${libdir} -lpcsclite -lvpcd Libs: -L${libdir} -lpcsclite
Cflags: -I${includedir} Cflags: -I${includedir}

17
virtualsmartcard/src/vpcd/Makefile.am
View File

@@ -1,12 +1,9 @@
VPCD_LIB = $(LIB_PREFIX)vpcd.$(DYN_LIB_EXT) VPCD_LIB = $(LIB_PREFIX)vpcd.$(DYN_LIB_EXT)
libvpcd_la_SOURCES = ifd-vpcd.c vpcd.c libvpcd_la_SOURCES = ifd-vpcd.c vpcd.c
libvpcd_la_LIBADD = $(PCSC_LIBS)
libvpcd_la_LDFLAGS = -no-undefined libvpcd_la_LDFLAGS = -no-undefined
libvpcd_la_CFLAGS = $(PCSC_CFLAGS) libvpcd_la_CFLAGS = $(PCSC_CFLAGS)
lib_LTLIBRARIES = libvpcd.la
noinst_HEADERS = vpcd.h noinst_HEADERS = vpcd.h
EXTRA_DIST = reader.conf.in EXTRA_DIST = reader.conf.in
@@ -18,7 +15,21 @@ do_subst = $(SED) \
if BUILD_LIBPCSCLITE if BUILD_LIBPCSCLITE
noinst_LTLIBRARIES = libvpcd.la
ifd-vpcd.c: pcsclite.h
.PHONY: pcsclite.h
pcsclite.h:
$(MAKE) -C $(builddir)/../libpcsclite pcsclite.h
else else
libvpcd_la_LIBADD = $(PCSC_LIBS)
lib_LTLIBRARIES = libvpcd.la
install: install_libvpcd install: install_libvpcd
install_libvpcd: libvpcd.la reader.conf.in install_libvpcd: libvpcd.la reader.conf.in