fix/update removeParity & fix securakey detection

[proxmark3-svn] / client / Makefile

diff --git a/client/Makefile b/client/Makefile
index 6b8b84a3c327fb9bb6342c4b329d9fa8bf2ad860..a6b1942fb9ccf4231015a64ddffdfcf50a7cc92c 100644 (file)
--- a/client/Makefile
+++ b/client/Makefile
@@ -15,7 +15,7 @@ OBJDIR = obj
 LDLIBS = -L/opt/local/lib -L/usr/local/lib -lreadline -lpthread -lm
 LUALIB = ../liblua/liblua.a
 LDFLAGS = $(COMMON_FLAGS)
 LDLIBS = -L/opt/local/lib -L/usr/local/lib -lreadline -lpthread -lm
 LUALIB = ../liblua/liblua.a
 LDFLAGS = $(COMMON_FLAGS)

-CFLAGS = -std=c99 -I. -I../include -I../common -I../zlib -I/opt/local/include -I../liblua -Wall $(COMMON_FLAGS) -g -O4
+CFLAGS = -std=c99 -D_ISOC99_SOURCE -I. -I../include -I../common -I../tools -I../zlib -I/opt/local/include -I../liblua -Wall $(COMMON_FLAGS) -g -O4

 LUAPLATFORM = generic
 
 ifneq (,$(findstring MINGW,$(platform)))
 LUAPLATFORM = generic
 
 ifneq (,$(findstring MINGW,$(platform)))


@@ -54,19 +54,20 @@ endif
 
 CORESRCS =     uart.c \
                util.c \
 
 CORESRCS =     uart.c \
                util.c \

-               sleep.c

 
 
 
 

-CMDSRCS =      nonce2key/crapto1.c\
-                       nonce2key/crypto1.c\
-                       nonce2key/nonce2key.c\
+CMDSRCS =      crapto1/crapto1.c\
+                       crapto1/crypto1.c\
+                       mfkey.c\

                        loclass/cipher.c \
                        loclass/cipherutils.c \
                        loclass/des.c \
                        loclass/ikeys.c \
                        loclass/elite_crack.c\
                        loclass/fileutils.c\
                        loclass/cipher.c \
                        loclass/cipherutils.c \
                        loclass/des.c \
                        loclass/ikeys.c \
                        loclass/elite_crack.c\
                        loclass/fileutils.c\

+                       whereami.c\

                        mifarehost.c\
                        mifarehost.c\

+                       parity.c\

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


@@ -85,30 +86,47 @@ CMDSRCS =   nonce2key/crapto1.c\
                        cmdhflegic.c \
                        cmdhficlass.c \
                        cmdhfmf.c \
                        cmdhflegic.c \
                        cmdhficlass.c \
                        cmdhfmf.c \

-            cmdhfmfu.c \
+                       cmdhfmfu.c \

                        cmdhftopaz.c \
                        cmdhw.c \
                        cmdlf.c \
                        cmdhftopaz.c \
                        cmdhw.c \
                        cmdlf.c \

-                       cmdlfio.c \
-                       cmdlfhid.c \

                        cmdlfawid.c \
                        cmdlfawid.c \

+                       cmdlfcotag.c\

                        cmdlfem4x.c \
                        cmdlfem4x.c \

+                       cmdlffdx.c \
+                       cmdlfgproxii.c \
+                       cmdlfhid.c \

                        cmdlfhitag.c \
                        cmdlfhitag.c \

+                       cmdlfio.c \
+                       cmdlfindala.c \
+                       cmdlfjablotron.c \
+                       cmdlfnexwatch.c \
+                       cmdlfnoralsy.c \
+                       cmdlfparadox.c \
+                       cmdlfpcf7931.c \
+                       cmdlfpresco.c \
+                       cmdlfpyramid.c \
+                       cmdlfsecurakey.c \
+                       cmdlft55xx.c \

                        cmdlfti.c \
                        cmdlfti.c \

+                       cmdlfviking.c\
+                       cmdlfvisa2000.c\

                        cmdparser.c \
                        cmdmain.c \
                        cmdparser.c \
                        cmdmain.c \

-                       cmdlft55xx.c \
-                       cmdlfpcf7931.c\
-                       cmdlfviking.c\
-                       cmdlfpresco.c\
-                       cmdlfpyramid.c\
-                       pm3_binlib.c\

                        scripting.c\
                        cmdscript.c\
                        scripting.c\
                        cmdscript.c\

+                       pm3_binlib.c\

                        pm3_bitlib.c\
                        aes.c\
                        protocols.c\
                        sha1.c\
                        pm3_bitlib.c\
                        aes.c\
                        protocols.c\
                        sha1.c\

+                       cmdcrc.c\
+                       reveng/reveng.c\
+                       reveng/cli.c\
+                       reveng/bmpbit.c\
+                       reveng/model.c\
+                       reveng/poly.c\
+                       reveng/getopt.c\

 
 ZLIBSRCS = deflate.c adler32.c trees.c zutil.c inflate.c inffast.c inftrees.c
 ZLIB_FLAGS = -DZ_SOLO -DZ_PREFIX -DNO_GZIP -DZLIB_PM3_TUNED 
 
 ZLIBSRCS = deflate.c adler32.c trees.c zutil.c inflate.c inffast.c inftrees.c
 ZLIB_FLAGS = -DZ_SOLO -DZ_PREFIX -DNO_GZIP -DZLIB_PM3_TUNED