crewID/libnfc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libnfc can now be compiled without pcsc-lite (but it removes acr122 device support)

Browse source
This commit is contained in:
Romuald Conty 2009-06-11 11:57:36 +00:00
parent eccb9d3d3b
commit bf5848e7a1
3 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configure.ac
View file

@ -36,7 +36,7 @@ then
fi fi
AM_CONDITIONAL(PCSC_LITE_ENABLED, [test x"$enable_pcsc_lite" = xyes]) AM_CONDITIONAL(PCSC_LITE_ENABLED, [test x"$enable_pcsc_lite" = xyes])
# --enable-debug support # --enable-debug support (default:no)
AC_ARG_ENABLE([debug],AS_HELP_STRING([--enable-debug],[Debug flags]),[enable_debug=$enableval],[enable_debug="no"]) AC_ARG_ENABLE([debug],AS_HELP_STRING([--enable-debug],[Debug flags]),[enable_debug=$enableval],[enable_debug="no"])
AC_MSG_CHECKING(for debug flag) AC_MSG_CHECKING(for debug flag)

16
src/Makefile.am
View file

@ -5,19 +5,19 @@ bin_PROGRAMS = nfc-anticol nfc-list nfc-mftool nfc-relay nfc-emulate
# set the include path found by configure # set the include path found by configure
INCLUDES= $(all_includes) INCLUDES= $(all_includes)
nfcinclude_HEADERS = libnfc.h bitutils.h defines.h types.h mifaretag.h devices.h rs232.h dev_arygon.h nfcinclude_HEADERS = libnfc.h bitutils.h defines.h types.h mifaretag.h devices.h rs232.h dev_arygon.h dev_pn531.h dev_pn533.h
nfcincludedir = $(includedir)/libnfc nfcincludedir = $(includedir)/libnfc
lib_LTLIBRARIES = libnfc.la lib_LTLIBRARIES = libnfc.la
libnfc_la_SOURCES = bitutils.c libnfc.c rs232.c dev_arygon.c libnfc_la_SOURCES = bitutils.c libnfc.c rs232.c dev_arygon.c dev_pn531.c dev_pn533.c
libnfc_la_CFLAGS = libnfc_la_CFLAGS = @LIBUSB_CFLAGS@
libnfc_la_LIBADD = libnfc_la_LIBADD = @LIBUSB_LIBS@
if PCSC_LITE_ENABLED if PCSC_LITE_ENABLED
nfcinclude_HEADERS += dev_acr122.h dev_pn531.h dev_pn533.h nfcinclude_HEADERS += dev_acr122.h
libnfc_la_CFLAGS += @LIBUSB_CFLAGS@ @LIBPCSCLITE_CFLAGS@ libnfc_la_CFLAGS += @LIBPCSCLITE_CFLAGS@ -DHAVE_PCSC_LITE
libnfc_la_SOURCES += dev_acr122.c dev_pn531.c dev_pn533.c libnfc_la_SOURCES += dev_acr122.c
libnfc_la_LIBADD += @LIBUSB_LIBS@ @LIBPCSCLITE_LIBS@ libnfc_la_LIBADD += @LIBPCSCLITE_LIBS@
endif endif
nfc_anticol_SOURCES = anticol.c nfc_anticol_SOURCES = anticol.c

6
src/devices.h
View file

@ -23,14 +23,18 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "defines.h" #include "defines.h"
#include "types.h" #include "types.h"
#include "dev_acr122.h" #ifdef HAVE_PCSC_LITE
#include "dev_acr122.h"
#endif
#include "dev_pn531.h" #include "dev_pn531.h"
#include "dev_pn533.h" #include "dev_pn533.h"
#include "dev_arygon.h" #include "dev_arygon.h"
const static struct dev_callbacks dev_callbacks_list[] = { const static struct dev_callbacks dev_callbacks_list[] = {
// Driver Name Connect Transceive Disconect // Driver Name Connect Transceive Disconect
#ifdef HAVE_PCSC_LITE
{ "ACR122", dev_acr122_connect, dev_acr122_transceive, dev_acr122_disconnect }, { "ACR122", dev_acr122_connect, dev_acr122_transceive, dev_acr122_disconnect },
#endif
{ "PN531USB", dev_pn531_connect, dev_pn531_transceive, dev_pn531_disconnect }, { "PN531USB", dev_pn531_connect, dev_pn531_transceive, dev_pn531_disconnect },
{ "PN533USB", dev_pn533_connect, dev_pn533_transceive, dev_pn533_disconnect }, { "PN533USB", dev_pn533_connect, dev_pn533_transceive, dev_pn533_disconnect },
{ "ARYGON", dev_arygon_connect, dev_arygon_transceive, dev_arygon_disconnect } { "ARYGON", dev_arygon_connect, dev_arygon_transceive, dev_arygon_disconnect }