CHG: 'emv compilation' since the client makefile doesn't import makefile.common anymore, need to move some compilor directive. Now need to change two files for EMV compilation.

* client/Makefile
 * common/Makefile.common

armsrc/Makefile

@@ -86,19 +86,13 @@ ARMSRC = fpgaloader.c \
 	$(SRC_ISO14443a) \
 	$(SRC_ISO14443b) \
 	$(SRC_CRAPTO1) \
+	$(SRC_ICLASS) \
+	$(SRC_EMV) \
 	$(SRC_CRC) \
 	parity.c \
 	usb_cdc.c \
 	cmd.c
 	
-ifneq ($(WITH_ICLASS),"")
-ARMSRC += $(SRC_ICLASS)
-endif	
-	
-ifneq ($(WITH_EMV),"")
-ARMSRC += $(SRC_EMV)
-endif
-	
 # Do not move this inclusion before the definition of {THUMB,ASM,ARM}SRC
 include ../common/Makefile.common
 

armsrc/apps.h

@@ -243,7 +243,6 @@ extern void EMVFuzz_RATS(uint8_t ratslen, uint8_t* RATS);
 extern void EMVReadRecord(uint8_t arg0, uint8_t arg1,emvcard* inputcard);
 extern void EMVSelectPPSE();
 extern void EMVSelectAID(uint8_t *AID, uint8_t AIDlen, emvcard* inputcard);
-extern void EMVTransaction();
 extern void EMVClone(uint8_t maxsfi, uint8_t maxrecord);
 extern void EMVSim();
 extern void EMVTest();

client/Makefile

@@ -13,6 +13,9 @@ RM = rm -f
 MV = mv
 
 #COMMON_FLAGS = -m32
+# uncomment to enable EMV
+#COMMON_FLAGS += -DWITH_EMV
+
 VPATH = ../common ../zlib ../uart
 OBJDIR = obj
 

common/Makefile.common

@@ -60,8 +60,7 @@ DETECTED_OS=Windows
 endif
 
 # uncomment these two; to enable EMV
-#APP_CFLAGS += -DWITH_EMV
-#COMMON_FLAGS += -DWITH_EMV
+APP_CFLAGS += -DWITH_EMV
 
 # uncomment these two; to fix 256 vs 512kb PM3 devices
 # flashing bootrom -b is needed