james/yubikey.rs
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

drop direct PCSC dependency for the tool

Browse Source
This commit is contained in:
Klas Lindfors
2014-06-17 09:16:51 +02:00
parent 56bee46ed3
commit 9eb5c7fda1
2 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tool/Makefile.am
+2 -3
View File
@@ -25,14 +25,13 @@
# for the parts of OpenSSL used as well as that of the covered work. # for the parts of OpenSSL used as well as that of the covered work.
AM_CFLAGS = $(WERROR_CFLAGS) $(WARN_CFLAGS) AM_CFLAGS = $(WERROR_CFLAGS) $(WARN_CFLAGS)
AM_CPPFLAGS = $(OPENSSL_CFLAGS) $(PCSC_CFLAGS) AM_CPPFLAGS = $(OPENSSL_CFLAGS)
AM_CPPFLAGS += -I$(top_srcdir)/lib -I$(top_builddir)/lib AM_CPPFLAGS += -I$(top_srcdir)/lib -I$(top_builddir)/lib
bin_PROGRAMS = yubico-piv-tool bin_PROGRAMS = yubico-piv-tool
yubico_piv_tool_SOURCES = yubico-piv-tool.c yubico-piv-tool.h2m yubico_piv_tool_SOURCES = yubico-piv-tool.c yubico-piv-tool.h2m
yubico_piv_tool_SOURCES += cmdline.ggo cmdline.c cmdline.h yubico_piv_tool_SOURCES += cmdline.ggo cmdline.c cmdline.h
yubico_piv_tool_LDADD = $(OPENSSL_LIBS) $(PCSC_LIBS) yubico_piv_tool_LDADD = $(OPENSSL_LIBS)
yubico_piv_tool_LDADD += $(LTLIBWINSCARD) $(PCSC_MACOSX_LIBS)
yubico_piv_tool_LDADD += ../lib/libykpiv.la yubico_piv_tool_LDADD += ../lib/libykpiv.la
cmdline.c cmdline.h: cmdline.ggo Makefile.am cmdline.c cmdline.h: cmdline.ggo Makefile.am
tool/yubico-piv-tool.c
-9
View File
@@ -34,15 +34,6 @@
#include "ykpiv.h" #include "ykpiv.h"
#if BACKEND_PCSC
#if defined HAVE_PCSC_WINSCARD_H
# include <PCSC/wintypes.h>
# include <PCSC/winscard.h>
#else
# include <winscard.h>
#endif
#endif
#include <openssl/des.h> #include <openssl/des.h>
#include <openssl/pem.h> #include <openssl/pem.h>
#include <openssl/pkcs12.h> #include <openssl/pkcs12.h>