Merge the freefare-desfire branch into trunk.
This commit is contained in:
parent
3f6a142b57
commit
5779d6f945
38 changed files with 4943 additions and 116 deletions
|
|
@ -17,6 +17,9 @@ noinst_LTLIBRARIES = \
|
|||
test_mifare_classic.la \
|
||||
test_mifare_classic_create_trailer_block.la \
|
||||
test_mifare_classic_sector_boundaries.la \
|
||||
test_mifare_desfire.la \
|
||||
test_mifare_desfire_des.la \
|
||||
test_mifare_desfire_key.la \
|
||||
test_mifare_ultralight.la \
|
||||
test_tlv.la
|
||||
|
||||
|
|
@ -40,6 +43,17 @@ test_mifare_classic_sector_boundaries_la_LIBADD = $(top_builddir)/libfreefare/li
|
|||
test_mifare_classic_create_trailer_block_la_SOURCES = test_mifare_classic_create_trailer_block.c
|
||||
test_mifare_classic_create_trailer_block_la_LIBADD = $(top_builddir)/libfreefare/libfreefare.la
|
||||
|
||||
test_mifare_desfire_la_SOURCES = test_mifare_desfire.c \
|
||||
mifare_desfire_fixture.c \
|
||||
mifare_desfire_fixture.h
|
||||
test_mifare_desfire_la_LIBADD = $(top_builddir)/libfreefare/libfreefare.la -lutil
|
||||
|
||||
test_mifare_desfire_des_la_SOURCES = test_mifare_desfire_des.c
|
||||
test_mifare_desfire_des_la_LIBADD = $(top_builddir)/libfreefare/libfreefare.la -lssl
|
||||
|
||||
test_mifare_desfire_key_la_SOURCES = test_mifare_desfire_key.c
|
||||
test_mifare_desfire_key_la_LIBADD = $(top_builddir)/libfreefare/libfreefare.la
|
||||
|
||||
test_mifare_ultralight_la_SOURCES = test_mifare_ultralight.c \
|
||||
mifare_ultralight_fixture.c \
|
||||
mifare_ultralight_fixture.h
|
||||
|
|
@ -52,5 +66,6 @@ echo-cutter:
|
|||
@echo $(CUTTER)
|
||||
|
||||
EXTRA_DIST = run-test.sh
|
||||
CLEANFILES = *.gcno
|
||||
|
||||
endif
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue