fixed cmd malloc strlen()+1 bug

[proxmark3-svn] / client / Makefile

diff --git a/client/Makefile b/client/Makefile
index 6479d6cced10f3b58800f3acb622cbb8b6c522f3..028888d4f011dda8473c449a0b3caf0783df3bb7 100644 (file)
--- a/client/Makefile
+++ b/client/Makefile
@@ -19,7 +19,7 @@ CFLAGS = -std=gnu99 -I. -I../include -I../common -I/opt/local/include -Wall -Wno
 ifneq (,$(findstring MINGW,$(platform)))
 CXXFLAGS = -I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui
 QTLDLIBS = -L$(QTDIR)/lib -lQtCore4 -lQtGui4
 ifneq (,$(findstring MINGW,$(platform)))
 CXXFLAGS = -I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui
 QTLDLIBS = -L$(QTDIR)/lib -lQtCore4 -lQtGui4

-MOC = moc
+MOC = $(QTDIR)/bin/moc

 else ifeq ($(platform),Darwin)
 CXXFLAGS = -I/Library/Frameworks/QtGui.framework/Versions/Current/Headers -I/Library/Frameworks/QtCore.framework/Versions/Current/Headers
 QTLDLIBS = -framework QtGui -framework QtCore
 else ifeq ($(platform),Darwin)
 CXXFLAGS = -I/Library/Frameworks/QtGui.framework/Versions/Current/Headers -I/Library/Frameworks/QtCore.framework/Versions/Current/Headers
 QTLDLIBS = -framework QtGui -framework QtCore


@@ -40,6 +40,10 @@ QTGUI = guidummy.o
 endif
 
 CMDSRCS = \
 endif
 
 CMDSRCS = \

+                       nonce2key/crapto1.c\
+                       nonce2key/crypto1.c\
+                       nonce2key/nonce2key.c\
+                       mifarehost.c\

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


@@ -52,15 +56,20 @@ CMDSRCS = \
                        cmdhf14a.c \
                        cmdhf14b.c \
                        cmdhf15.c \
                        cmdhf14a.c \
                        cmdhf14b.c \
                        cmdhf15.c \

+                       cmdhfepa.c \

                        cmdhflegic.c \
                        cmdhficlass.c \
                        cmdhflegic.c \
                        cmdhficlass.c \

+                       cmdhfmf.c \

                        cmdhw.c \
                        cmdlf.c \
                        cmdlfem4x.c \
                        cmdlfhid.c \
                        cmdhw.c \
                        cmdlf.c \
                        cmdlfem4x.c \
                        cmdlfhid.c \

+                       cmdlfhitag.c \

                        cmdlfti.c \
                        cmdparser.c \
                        cmdlfti.c \
                        cmdparser.c \

-                       cmdmain.c
+                       cmdmain.c \
+                       cmdlft55xx.c \
+                       cmdlfpcf7931.c

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