LDLIBS = -L/opt/local/lib -L/usr/local/lib -lreadline -lpthread -lm
 LUALIB = ../liblua/liblua.a
 LDFLAGS = $(COMMON_FLAGS)
-CFLAGS = -std=c99 -D_ISOC99_SOURCE -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)))
 
 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/fileutils.c\
                        whereami.c\
                        mifarehost.c\
+                       parity.c\
                        crc.c \
                        crc16.c \
                        crc64.c \