Deduplicate fixture headers.

test/Makefile.am

@@ -37,7 +37,7 @@ AM_LDFLAGS = -module -rpath $(libdir) -avoid-version -no-undefined
 
 test_felica_la_SOURCES = test_felica.c \
 			 felica_fixture.c \
-			 felica_fixture.h
+			 fixture.h
 test_felica_la_LIBADD = $(top_builddir)/libfreefare/libfreefare.la
 
 test_freefare_la_SOURCES = test_freefare.c
@@ -52,7 +52,7 @@ test_mifare_application_la_LIBADD = $(top_builddir)/libfreefare/libfreefare.la
 test_mifare_classic_la_SOURCES = test_mifare_classic.c \
 				 test_mifare_classic_mad.c \
 				 mifare_classic_fixture.c \
-				 mifare_classic_fixture.h
+				 fixture.h
 test_mifare_classic_la_LIBADD = $(top_builddir)/libfreefare/libfreefare.la
 
 test_mifare_classic_create_trailer_block_la_SOURCES = test_mifare_classic_create_trailer_block.c
@@ -63,7 +63,7 @@ test_mifare_classic_sector_boundaries_la_LIBADD = $(top_builddir)/libfreefare/li
 
 test_mifare_desfire_la_SOURCES = test_mifare_desfire.c \
 				 mifare_desfire_fixture.c \
-				 mifare_desfire_fixture.h
+				 fixture.h
 test_mifare_desfire_la_LIBADD = $(top_builddir)/libfreefare/libfreefare.la \
 				$(top_builddir)/test/common/libtestcommon.la
 
@@ -82,7 +82,7 @@ test_mifare_desfire_ev1_la_SOURCES = test_mifare_desfire_ev1.c \
 				     test_mifare_desfire_ev1_aes.c \
 				     test_mifare_desfire_ev1_iso.c \
 				     mifare_desfire_ev1_fixture.c \
-				     mifare_desfire_ev1_fixture.h
+				     fixture.h
 test_mifare_desfire_ev1_la_LIBADD = $(top_builddir)/libfreefare/libfreefare.la \
 				    $(top_builddir)/test/common/libtestcommon.la
 
@@ -91,7 +91,7 @@ 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
+				    fixture.h
 test_mifare_ultralight_la_LIBADD = $(top_builddir)/libfreefare/libfreefare.la
 
 test_tlv_la_SOURCES = test_tlv.c

test/felica_fixture.c

@@ -1,7 +1,7 @@
 #include <cutter.h>
 #include <freefare.h>
 
-#include "felica_fixture.h"
+#include "fixture.h"
 
 static nfc_context *context;
 static nfc_device *device = NULL;

test/felica_fixture.h

@@ -1 +0,0 @@
-extern FreefareTag tag;

test/fixture.h

@@ -0,0 +1,6 @@
+#ifndef _FIXTURE_H
+#define _FIXTURE_H
+
+extern FreefareTag tag;
+
+#endif /* _FIXTURE_H */

test/mifare_classic_fixture.c

@@ -1,7 +1,7 @@
 #include <cutter.h>
 #include <freefare.h>
 
-#include "mifare_classic_fixture.h"
+#include "fixture.h"
 
 static nfc_context *context;
 static nfc_device *device = NULL;

test/mifare_classic_fixture.h

@@ -1 +0,0 @@
-extern FreefareTag tag;

test/mifare_desfire_ev1_fixture.c

@@ -1,7 +1,7 @@
 #include <cutter.h>
 #include <freefare.h>
 
-#include "mifare_desfire_ev1_fixture.h"
+#include "fixture.h"
 
 static nfc_context *context;
 static nfc_device *device = NULL;

test/mifare_desfire_ev1_fixture.h

@@ -1 +0,0 @@
-extern FreefareTag tag;

test/mifare_desfire_fixture.c

@@ -1,7 +1,7 @@
 #include <cutter.h>
 #include <freefare.h>
 
-#include "mifare_desfire_fixture.h"
+#include "fixture.h"
 
 static nfc_context *context;
 static nfc_device *device = NULL;

test/mifare_desfire_fixture.h

@@ -1 +0,0 @@
-extern FreefareTag tag;

test/mifare_ultralight_fixture.c

@@ -1,7 +1,7 @@
 #include <cutter.h>
 #include <freefare.h>
 
-#include "mifare_ultralight_fixture.h"
+#include "fixture.h"
 
 static nfc_context *context;
 static nfc_device *device = NULL;

test/mifare_ultralight_fixture.h

@@ -1 +0,0 @@
-extern FreefareTag tag;

test/test_felica.c

@@ -2,7 +2,7 @@
 
 #include <freefare.h>
 
-#include "felica_fixture.h"
+#include "fixture.h"
 
 void
 test_felica_read_without_encryption(void)

test/test_mifare_classic.c

@@ -5,7 +5,7 @@
 #include <freefare.h>
 #include "freefare_internal.h"
 
-#include "mifare_classic_fixture.h"
+#include "fixture.h"
 
 void
 test_mifare_classic_authenticate(void)

test/test_mifare_classic_mad.c

@@ -2,7 +2,7 @@
 
 #include <freefare.h>
 
-#include "mifare_classic_fixture.h"
+#include "fixture.h"
 
 void
 test_mifare_classic_mad(void)

test/test_mifare_desfire.c

@@ -6,7 +6,7 @@
 #include <freefare.h>
 #include "freefare_internal.h"
 
-#include "mifare_desfire_fixture.h"
+#include "fixture.h"
 #include "common/mifare_desfire_auto_authenticate.h"
 
 #define cut_assert_success(last_command) \

test/test_mifare_desfire_ev1.c

@@ -6,7 +6,7 @@
 #include <freefare.h>
 #include "freefare_internal.h"
 
-#include "mifare_desfire_ev1_fixture.h"
+#include "fixture.h"
 #include "common/mifare_desfire_auto_authenticate.h"
 
 #define cut_assert_success(last_command) \

test/test_mifare_desfire_ev1_3des.c

@@ -6,7 +6,7 @@
 #include <freefare.h>
 #include "freefare_internal.h"
 
-#include "mifare_desfire_ev1_fixture.h"
+#include "fixture.h"
 #include "common/mifare_desfire_auto_authenticate.h"
 
 #define cut_assert_success(last_command) \

test/test_mifare_desfire_ev1_3k3des.c

@@ -6,7 +6,7 @@
 #include <freefare.h>
 #include "freefare_internal.h"
 
-#include "mifare_desfire_ev1_fixture.h"
+#include "fixture.h"
 #include "common/mifare_desfire_auto_authenticate.h"
 
 #define cut_assert_success(last_command) \

test/test_mifare_desfire_ev1_aes.c

@@ -6,7 +6,7 @@
 #include <freefare.h>
 #include "freefare_internal.h"
 
-#include "mifare_desfire_ev1_fixture.h"
+#include "fixture.h"
 #include "common/mifare_desfire_auto_authenticate.h"
 
 #define cut_assert_success(last_command) \

test/test_mifare_desfire_ev1_iso.c

@@ -3,7 +3,7 @@
 #include <freefare.h>
 #include "freefare_internal.h"
 
-#include "mifare_desfire_ev1_fixture.h"
+#include "fixture.h"
 #include "common/mifare_desfire_auto_authenticate.h"
 
 #define cut_assert_success(last_command) \

test/test_mifare_ultralight.c

@@ -5,7 +5,7 @@
 #include <freefare.h>
 #include "freefare_internal.h"
 
-#include "mifare_ultralight_fixture.h"
+#include "fixture.h"
 
 void
 test_mifare_ultralight_write(void)