Merge pull request #251 from marshmellow42/master

[proxmark3-svn] / client / Makefile

diff --git a/client/Makefile b/client/Makefile
index 0a4fc1608abd5d41ff3536c820a9a440d044524d..d5bfb08668113971abe22bcc4084f3d9cedbbaa0 100644 (file)
--- a/client/Makefile
+++ b/client/Makefile
@@ -9,7 +9,7 @@ include ../common/Makefile.common
 CC=gcc
 CXX=g++
 #COMMON_FLAGS = -m32
 CC=gcc
 CXX=g++
 #COMMON_FLAGS = -m32

-VPATH = ../common ../zlib ../tools
+VPATH = ../common ../zlib

 OBJDIR = obj
 
 LDLIBS = -L/opt/local/lib -L/usr/local/lib -lreadline -lpthread -lm
 OBJDIR = obj
 
 LDLIBS = -L/opt/local/lib -L/usr/local/lib -lreadline -lpthread -lm


@@ -54,12 +54,11 @@ endif
 
 CORESRCS =     uart.c \
                util.c \
 
 CORESRCS =     uart.c \
                util.c \

-               sleep.c

 
 
 CMDSRCS =      crapto1/crapto1.c\
                        crapto1/crypto1.c\
 
 
 CMDSRCS =      crapto1/crapto1.c\
                        crapto1/crypto1.c\

-                       nonce2key/nonce2key.c\
+                       mfkey.c\

                        loclass/cipher.c \
                        loclass/cipherutils.c \
                        loclass/des.c \
                        loclass/cipher.c \
                        loclass/cipherutils.c \
                        loclass/des.c \


@@ -68,6 +67,7 @@ CMDSRCS =     crapto1/crapto1.c\
                        loclass/fileutils.c\
                        whereami.c\
                        mifarehost.c\
                        loclass/fileutils.c\
                        whereami.c\
                        mifarehost.c\

+                       parity.c\

                        crc.c \
                        crc16.c \
                        crc64.c \
                        crc.c \
                        crc16.c \
                        crc64.c \


@@ -93,9 +93,12 @@ CMDSRCS =    crapto1/crapto1.c\
                        cmdlfawid.c \
                        cmdlfcotag.c\
                        cmdlfem4x.c \
                        cmdlfawid.c \
                        cmdlfcotag.c\
                        cmdlfem4x.c \

+                       cmdlffdx.c \
+                       cmdlfgproxii.c \

                        cmdlfhid.c \
                        cmdlfhitag.c \
                        cmdlfio.c \
                        cmdlfhid.c \
                        cmdlfhitag.c \
                        cmdlfio.c \

+                       cmdlfindala.c \

                        cmdlfpcf7931.c\
                        cmdlfpresco.c\
                        cmdlfpyramid.c\
                        cmdlfpcf7931.c\
                        cmdlfpresco.c\
                        cmdlfpyramid.c\