From c6f4343276b193d9832849d3bd4d9a193b09ce6b Mon Sep 17 00:00:00 2001
From: Romain Tartiere <romain.tartiere@gmail.com>
Date: Tue, 23 Nov 2010 18:38:10 +0000
Subject: [PATCH] Fix autotools fun.

Tribute to Justice!
---
 configure.ac                                         | 3 ++-
 test/Makefile.am                                     | 7 ++-----
 test/{ => common}/mifare_desfire_auto_authenticate.c | 0
 test/{ => common}/mifare_desfire_auto_authenticate.h | 0
 test/test_mifare_desfire.c                           | 2 +-
 5 files changed, 5 insertions(+), 7 deletions(-)
 rename test/{ => common}/mifare_desfire_auto_authenticate.c (100%)
 rename test/{ => common}/mifare_desfire_auto_authenticate.h (100%)

diff --git a/configure.ac b/configure.ac
index 3d68928..5c35c31 100644
--- a/configure.ac
+++ b/configure.ac
@@ -82,5 +82,6 @@ AC_OUTPUT([Makefile
 	   examples/Makefile
 	   libfreefare/Makefile
 	   libfreefare.pc
-	   test/Makefile])
+	   test/Makefile
+	   test/common/Makefile])
 
diff --git a/test/Makefile.am b/test/Makefile.am
index 5cce4c6..204a279 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -3,6 +3,7 @@
 INCLUDES = $(CUTTER_CFLAGS) -I$(top_srcdir)/libfreefare
 LIBS = $(CUTTER_LIBS)
 
+SUBDIRS = common .
 
 AM_CFLAGS = @LIBNFC_CFLAGS@
 
@@ -12,7 +13,6 @@ TESTS = run-test.sh
 TESTS_ENVIRONMENT = NO_MAKE=yes CUTTER="$(CUTTER)"
 
 noinst_LTLIBRARIES = \
-		     mifare_desfire_auto_authenticate.la \
 		     test_mad.la \
 		     test_mifare_application.la \
 		     test_mifare_classic.la \
@@ -27,9 +27,6 @@ noinst_LTLIBRARIES = \
 
 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_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.h
 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_LIBADD = $(top_builddir)/libfreefare/libfreefare.la
diff --git a/test/mifare_desfire_auto_authenticate.c b/test/common/mifare_desfire_auto_authenticate.c
similarity index 100%
rename from test/mifare_desfire_auto_authenticate.c
rename to test/common/mifare_desfire_auto_authenticate.c
diff --git a/test/mifare_desfire_auto_authenticate.h b/test/common/mifare_desfire_auto_authenticate.h
similarity index 100%
rename from test/mifare_desfire_auto_authenticate.h
rename to test/common/mifare_desfire_auto_authenticate.h
diff --git a/test/test_mifare_desfire.c b/test/test_mifare_desfire.c
index e63f155..a7d7017 100644
--- a/test/test_mifare_desfire.c
+++ b/test/test_mifare_desfire.c
@@ -26,7 +26,7 @@
 #include "freefare_internal.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) \
     do { \