From 4556e371d5d1aa35cf973d9e4a653ea52f77be7d Mon Sep 17 00:00:00 2001
From: marshmellow42 <marshmellowrf@gmail.com>
Date: Tue, 31 Jul 2018 11:07:15 -0400
Subject: [PATCH] allow common makefile options-defines

---
 armsrc/Makefile | 6 ++++++
 client/Makefile | 8 +++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/armsrc/Makefile b/armsrc/Makefile
index f0a0c0ff..30e37824 100644
--- a/armsrc/Makefile
+++ b/armsrc/Makefile
@@ -27,6 +27,11 @@ SRC_ISO14443a = epa.c iso14443a.c mifareutil.c mifarecmd.c mifaresniff.c mifares
 SRC_ISO14443b = iso14443b.c
 SRC_CRAPTO1 = crypto1.c des.c
 SRC_CRC = iso14443crc.c crc.c crc16.c crc32.c parity.c
+ifneq (,$(findstring SMARTCARD,$(APP_CFLAGS)))
+	SRC_SMARTCARD = i2c.c
+else
+	SRC_SMARTCARD = 
+endif
 #the FPGA bitstream files. Note: order matters!
 FPGA_BITSTREAMS = fpga_lf.bit fpga_hf.bit
 
@@ -44,6 +49,7 @@ THUMBSRC = start.c \
 	$(SRC_ISO15693) \
 	$(SRC_LF) \
 	$(SRC_ZLIB) \
+	$(SRC_SMARTCARD) \
 	appmain.c \
 	printf.c \
 	util.c \
diff --git a/client/Makefile b/client/Makefile
index 2d256b72..affcb923 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -26,6 +26,11 @@ CXXFLAGS = -I../include -Wall -O3
 APP_CFLAGS =
 include ../common/Makefile_Enabled_Options.common
 CFLAGS += $(APP_CFLAGS)
+ifneq (,$(findstring WITH_SMARTCARD,$(APP_CFLAGS)))
+	SRC_SMARTCARD = cmdsmartcard.c
+else
+	SRC_SMARTCARD = 
+endif
 
 LUAPLATFORM = generic
 platform = $(shell uname)
@@ -93,7 +98,8 @@ CORESRCS = 	uart_posix.c \
 			ui.c \
 			comms.c
 
-CMDSRCS = 	crapto1/crapto1.c\
+CMDSRCS = 	$(SRC_SMARTCARD) \
+			crapto1/crapto1.c\
 			crapto1/crypto1.c\
 			polarssl/des.c \
 			polarssl/aes.c\