fixed cmd malloc strlen()+1 bug

[proxmark3-svn] / client / Makefile

diff --git a/client/Makefile b/client/Makefile
index 66986dafe70883870547fee4c60d91da812567a4..028888d4f011dda8473c449a0b3caf0783df3bb7 100644 (file)
--- a/client/Makefile
+++ b/client/Makefile
@@ -3,6 +3,8 @@
 # at your option, any later version. See the LICENSE.txt file for the text of
 # the license.
 #-----------------------------------------------------------------------------
+include ../common/Makefile.common
+
 CC=gcc
 CXX=g++
 #COMMON_FLAGS = -m32
@@ -14,12 +16,10 @@ LDLIBS = -L/opt/local/lib -L/usr/local/lib -lusb -lreadline -lpthread
 LDFLAGS = $(COMMON_FLAGS)
 CFLAGS = -std=gnu99 -I. -I../include -I../common -I/opt/local/include -Wall -Wno-unused-function $(COMMON_FLAGS) -g -O3
 
-platform = $(shell uname)
-
 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
@@ -40,24 +40,36 @@ QTGUI = guidummy.o
 endif
 
 CMDSRCS = \
+                       nonce2key/crapto1.c\
+                       nonce2key/crypto1.c\
+                       nonce2key/nonce2key.c\
+                       mifarehost.c\
                        crc16.c \
                        iso14443crc.c \
+                       iso15693tools.c \
                        data.c \
                        graph.c \
                        ui.c \
+                       util.c \
                        cmddata.c \
                        cmdhf.c \
                        cmdhf14a.c \
                        cmdhf14b.c \
                        cmdhf15.c \
+                       cmdhfepa.c \
                        cmdhflegic.c \
+                       cmdhficlass.c \
+                       cmdhfmf.c \
                        cmdhw.c \
                        cmdlf.c \
                        cmdlfem4x.c \
                        cmdlfhid.c \
+                       cmdlfhitag.c \
                        cmdlfti.c \
                        cmdparser.c \
-                       cmdmain.c
+                       cmdmain.c \
+                       cmdlft55xx.c \
+                       cmdlfpcf7931.c
 
 CMDOBJS = $(CMDSRCS:%.c=$(OBJDIR)/%.o)
 
@@ -95,6 +107,9 @@ proxguiqt.moc.cpp: proxguiqt.h
 clean:
        $(RM) $(CLEAN)
 
+tarbin: $(BINS)
+       $(TAR) $(TARFLAGS) ../proxmark3-$(platform)-bin.tar $(BINS:%=client/%)
+
 # must be run as root
 install_kext: Info.plist
        mkdir -p /System/Library/Extensions/Proxmark3.kext/Contents