Code cleanup: deduplicate crapto1 library (#228)

[proxmark3-svn] / client / Makefile

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

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

 OBJDIR = obj
 
 LDLIBS = -L/opt/local/lib -L/usr/local/lib -lreadline -lpthread -lm
 LUALIB = ../liblua/liblua.a
 LDFLAGS = $(COMMON_FLAGS)
 OBJDIR = obj
 
 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)))

-    CFLAGS += -D__USE_MINGW_ANSI_STDIO=1

     CXXFLAGS = -I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui
     MOC = $(QTDIR)/bin/moc
     LUAPLATFORM = mingw
     CXXFLAGS = -I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui
     MOC = $(QTDIR)/bin/moc
     LUAPLATFORM = mingw


@@ -58,8 +57,8 @@ CORESRCS =    uart.c \
                sleep.c
 
 
                sleep.c
 
 

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

                        nonce2key/nonce2key.c\
                        loclass/cipher.c \
                        loclass/cipherutils.c \
                        nonce2key/nonce2key.c\
                        loclass/cipher.c \
                        loclass/cipherutils.c \


@@ -67,6 +66,7 @@ CMDSRCS =     nonce2key/crapto1.c\
                        loclass/ikeys.c \
                        loclass/elite_crack.c\
                        loclass/fileutils.c\
                        loclass/ikeys.c \
                        loclass/elite_crack.c\
                        loclass/fileutils.c\

+                       whereami.c\

                        mifarehost.c\
                        crc.c \
                        crc16.c \
                        mifarehost.c\
                        crc.c \
                        crc16.c \


@@ -90,22 +90,24 @@ CMDSRCS =   nonce2key/crapto1.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 \

+                       cmdlfhid.c \

                        cmdlfhitag.c \
                        cmdlfhitag.c \

-                       cmdlfti.c \
-                       cmdparser.c \
-                       cmdmain.c \
-                       cmdlft55xx.c \
+                       cmdlfio.c \

                        cmdlfpcf7931.c\
                        cmdlfpcf7931.c\

-                       cmdlfviking.c\

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

-                       pm3_binlib.c\
+                       cmdlft55xx.c \
+                       cmdlfti.c \
+                       cmdlfviking.c\
+                       cmdlfvisa2000.c\
+                       cmdparser.c \
+                       cmdmain.c \

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

+                       pm3_binlib.c\

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