added simple test suite for tools/findbits.py

[proxmark3-svn] / client / Makefile

diff --git a/client/Makefile b/client/Makefile
index 87d529d5f4c604678f7812275616882f9a554457..c76edf522e5b396e856a42f1ce80d6641ba3beac 100644 (file)
--- a/client/Makefile
+++ b/client/Makefile
@@ -1,3 +1,10 @@
+#-----------------------------------------------------------------------------
+# This code is licensed to you under the terms of the GNU GPL, version 2 or,
+# 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
@@ -7,23 +14,51 @@ OBJDIR = obj
 
 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) -g3
+CFLAGS = -std=gnu99 -I. -I../include -I../common -I/opt/local/include -Wall -Wno-unused-function $(COMMON_FLAGS) -g -O3
 
-CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall
+ifneq (,$(findstring MINGW,$(platform)))
+CXXFLAGS = -I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui
+QTLDLIBS = -L$(QTDIR)/lib -lQtCore4 -lQtGui4
+MOC = 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
+MOC = moc 
+else
+CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall -O3
 QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null)
+MOC = $(shell pkg-config --variable=moc_location QtCore)
+endif
+
+
+ifneq ($(QTLDLIBS),)
+QTGUI = $(OBJDIR)/proxgui.o $(OBJDIR)/proxguiqt.o $(OBJDIR)/proxguiqt.moc.o
+CFLAGS += -DHAVE_GUI
+LINK.o = $(LINK.cpp)
+else
+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 \
                        cmdhflegic.c \
+                       cmdhficlass.c \
+                       cmdhfmf.c \
                        cmdhw.c \
                        cmdlf.c \
                        cmdlfem4x.c \
@@ -34,21 +69,6 @@ CMDSRCS = \
 
 CMDOBJS = $(CMDSRCS:%.c=$(OBJDIR)/%.o)
 
-ifeq ($(shell uname),Darwin)
-CXXFLAGS = -I/Library/Frameworks/QtGui.framework/Versions/Current/Headers -I/Library/Frameworks/QtCore.framework/Versions/Current/Headers
-QTLDLIBS = -framework QtGui -framework QtCore
-MOC = moc
-endif
-
-ifneq ($(QTLDLIBS),)
-QTGUI = $(OBJDIR)/proxgui.o $(OBJDIR)/proxguiqt.o $(OBJDIR)/proxguiqt.moc.o
-CFLAGS += -DHAVE_GUI
-MOC ?= $(shell pkg-config --variable=moc_location QtCore)
-LINK.o = $(LINK.cpp)
-else
-QTGUI = guidummy.o
-endif
-
 RM = rm -f
 BINS = proxmark3 snooper cli flasher
 CLEAN = cli cli.exe flasher flasher.exe proxmark3 proxmark3.exe snooper snooper.exe $(CMDOBJS) $(OBJDIR)/*.o *.o *.moc.cpp
@@ -83,6 +103,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