Merge branch 'master' into topaz

[proxmark3-svn] / client / Makefile

diff --git a/client/Makefile b/client/Makefile
index 2e1c2092ec7843a6d0952f324dfa4a54fa06061b..48cbdfaa9d1c27107846d5ce566021b33dbf3db4 100644 (file)
--- a/client/Makefile
+++ b/client/Makefile
@@ -66,6 +66,7 @@ CMDSRCS =     nonce2key/crapto1.c\
                loclass/elite_crack.c\
                loclass/fileutils.c\
                mifarehost.c\
                loclass/elite_crack.c\
                loclass/fileutils.c\
                mifarehost.c\

+               crc.c \

                crc16.c \
                iso14443crc.c \
                iso15693tools.c \
                crc16.c \
                iso14443crc.c \
                iso15693tools.c \


@@ -100,8 +101,7 @@ CMDSRCS =   nonce2key/crapto1.c\
                cmdscript.c\
                pm3_bitlib.c\
                aes.c\
                cmdscript.c\
                pm3_bitlib.c\
                aes.c\

-               protocols.c\
-
+               protocols.c

 
 COREOBJS = $(CORESRCS:%.c=$(OBJDIR)/%.o)
 CMDOBJS = $(CMDSRCS:%.c=$(OBJDIR)/%.o)
 
 COREOBJS = $(CORESRCS:%.c=$(OBJDIR)/%.o)
 CMDOBJS = $(CMDSRCS:%.c=$(OBJDIR)/%.o)