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

Fix autotools fun.

Browse source 
Tribute to Justice!
This commit is contained in:
Romain Tartiere 2010-11-23 18:38:10 +00:00
parent e0a28547fd
commit c6f4343276
5 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
configure.ac
View file

@ -82,5 +82,6 @@ AC_OUTPUT([Makefile
examples/Makefile examples/Makefile
libfreefare/Makefile libfreefare/Makefile
libfreefare.pc libfreefare.pc
test/Makefile]) test/Makefile
test/common/Makefile])

7
test/Makefile.am
View file

@ -3,6 +3,7 @@
INCLUDES = $(CUTTER_CFLAGS) -I$(top_srcdir)/libfreefare INCLUDES = $(CUTTER_CFLAGS) -I$(top_srcdir)/libfreefare
LIBS = $(CUTTER_LIBS) LIBS = $(CUTTER_LIBS)
SUBDIRS = common .
AM_CFLAGS = @LIBNFC_CFLAGS@ AM_CFLAGS = @LIBNFC_CFLAGS@
@ -12,7 +13,6 @@ TESTS = run-test.sh
TESTS_ENVIRONMENT = NO_MAKE=yes CUTTER="$(CUTTER)" TESTS_ENVIRONMENT = NO_MAKE=yes CUTTER="$(CUTTER)"
noinst_LTLIBRARIES = \ noinst_LTLIBRARIES = \
mifare_desfire_auto_authenticate.la \
test_mad.la \ test_mad.la \
test_mifare_application.la \ test_mifare_application.la \
test_mifare_classic.la \ test_mifare_classic.la \
@ -27,9 +27,6 @@ noinst_LTLIBRARIES = \
AM_LDFLAGS = -module -rpath $(libdir) -avoid-version -no-undefined AM_LDFLAGS = -module -rpath $(libdir) -avoid-version -no-undefined
mifare_desfire_auto_authenticate_la_SOURCES = mifare_desfire_auto_authenticate.c \
mifare_desfire_auto_authenticate.h
test_mad_la_SOURCES = test_mad.c test_mad_la_SOURCES = test_mad.c
test_mad_la_LIBADD = $(top_builddir)/libfreefare/libfreefare.la test_mad_la_LIBADD = $(top_builddir)/libfreefare/libfreefare.la
@ -52,7 +49,7 @@ test_mifare_desfire_la_SOURCES = test_mifare_desfire.c \
mifare_desfire_fixture.c \ mifare_desfire_fixture.c \
mifare_desfire_fixture.h mifare_desfire_fixture.h
test_mifare_desfire_la_LIBADD = $(top_builddir)/libfreefare/libfreefare.la \ test_mifare_desfire_la_LIBADD = $(top_builddir)/libfreefare/libfreefare.la \
mifare_desfire_auto_authenticate.lo $(top_builddir)/test/common/libtestcommon.la
test_mifare_desfire_aid_la_SOURCES = test_mifare_desfire_aid.c test_mifare_desfire_aid_la_SOURCES = test_mifare_desfire_aid.c
test_mifare_desfire_aid_la_LIBADD = $(top_builddir)/libfreefare/libfreefare.la test_mifare_desfire_aid_la_LIBADD = $(top_builddir)/libfreefare/libfreefare.la

0
test/mifare_desfire_auto_authenticate.c → test/common/mifare_desfire_auto_authenticate.c
View file

0
test/mifare_desfire_auto_authenticate.h → test/common/mifare_desfire_auto_authenticate.h
View file

2
test/test_mifare_desfire.c
View file

@ -26,7 +26,7 @@
#include "freefare_internal.h" #include "freefare_internal.h"
#include "mifare_desfire_fixture.h" #include "mifare_desfire_fixture.h"
#include "mifare_desfire_auto_authenticate.h" #include "common/mifare_desfire_auto_authenticate.h"
#define cut_assert_success(last_command) \ #define cut_assert_success(last_command) \
do { \ do { \