MERGE: libnfc-mingw-cross merge with trunk (r805-821)

This commit is contained in:
Romuald Conty 2010-11-17 08:29:41 +00:00
parent 6df612a364
commit 58dcf63e7c
19 changed files with 246 additions and 110 deletions

View file

@ -12,8 +12,12 @@ bin_PROGRAMS = \
nfc-relay \
nfc-relay-picc \
pn53x-diagnose \
pn53x-sam \
pn53x-sam
if POSIX_ONLY_EXAMPLES_ENABLED
bin_PROGRAMS += \
pn53x-tamashell
endif
# set the include path found by configure
INCLUDES= $(all_includes) $(LIBNFC_CFLAGS)