minor fix when reading blocks

[proxmark3-svn] / client / Makefile

diff --git a/client/Makefile b/client/Makefile
index 113223fb61e19f5609a17e4e3199952839b65c89..364070e8364b4fc0b45913cb6e75153493e93276 100644 (file)
--- a/client/Makefile
+++ b/client/Makefile
@@ -1,40 +1,128 @@
+#-----------------------------------------------------------------------------
+# 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
 #COMMON_FLAGS = -m32

-LDLIBS = -L/usr/local/lib -lusb -lreadline -lpthread
+
+VPATH = ../common
+OBJDIR = obj
+
+LDLIBS = -L/opt/local/lib -L/usr/local/lib -lusb -lreadline -lpthread

 LDFLAGS = $(COMMON_FLAGS)
 LDFLAGS = $(COMMON_FLAGS)

-CFLAGS = -I. -I/opt/local/include -Wall -Wno-unused-function $(COMMON_FLAGS)
+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 = $(QTDIR)/moc
+####################################################
+# Disabled gui for Windows, can someone with more
+# knowledge about QT fix this problem??
+####################################################
+QTLDLIBS=
+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)
 QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null)

+MOC = $(shell pkg-config --variable=moc_location QtCore)
+endif
+

 
 ifneq ($(QTLDLIBS),)
 
 ifneq ($(QTLDLIBS),)

-QTGUI = proxgui.o proxguiqt.o proxguiqt.moc.o
+QTGUI = $(OBJDIR)/proxgui.o $(OBJDIR)/proxguiqt.o $(OBJDIR)/proxguiqt.moc.o

 CFLAGS += -DHAVE_GUI
 CFLAGS += -DHAVE_GUI

-MOC = $(shell type moc-qt4 >/dev/null 2>&1 && echo moc-qt4 || echo moc)

 LINK.o = $(LINK.cpp)
 else
 QTGUI = guidummy.o
 endif
 
 LINK.o = $(LINK.cpp)
 else
 QTGUI = guidummy.o
 endif
 

-all: proxmark3 snooper cli flasher
+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 \
+                       uart.c
+
+CMDOBJS = $(CMDSRCS:%.c=$(OBJDIR)/%.o)
+
+RM = rm -f
+BINS = proxmark3 flasher #snooper cli
+CLEAN = cli cli.exe flasher flasher.exe proxmark3 proxmark3.exe snooper snooper.exe $(CMDOBJS) $(OBJDIR)/*.o *.o *.moc.cpp
+
+all: $(BINS)

 
 all-static: LDLIBS:=-static $(LDLIBS)
 all-static: snooper cli flasher
 
 all-static: LDLIBS:=-static $(LDLIBS)
 all-static: snooper cli flasher

-
+       

 proxmark3: LDLIBS+=$(QTLDLIBS)
 proxmark3: LDLIBS+=$(QTLDLIBS)

-proxmark3: proxmark3.o gui.o command.o usb.o $(QTGUI)
+proxmark3: $(OBJDIR)/proxmark3.o $(CMDOBJS) $(OBJDIR)/proxusb.o $(QTGUI)
+       $(CXX) $(CXXFLAGS) $^ $(LDLIBS) -o $@

 
 

-command.o: command.cpp translate.h
+snooper: $(OBJDIR)/snooper.o $(CMDOBJS) $(OBJDIR)/proxusb.o $(OBJDIR)/guidummy.o
+       $(CXX) $(CXXFLAGS) $^ $(LDLIBS) -o $@

 
 

-snooper: snooper.o gui.o command.o usb.o guidummy.o
+cli: $(OBJDIR)/cli.o $(CMDOBJS) $(OBJDIR)/proxusb.o $(OBJDIR)/guidummy.o
+       $(CXX) $(CXXFLAGS) $^ $(LDLIBS) -o $@

 
 

-cli: cli.o gui.o command.o usb.o guidummy.o
+flasher: $(OBJDIR)/flash.o $(OBJDIR)/flasher.o $(OBJDIR)/proxusb.o
+       $(CXX) $(CXXFLAGS) $^ $(LDLIBS) -o $@

 
 

-flasher: flasher.o usb.o
+$(OBJDIR)/%.o: %.c
+       $(CC) $(CFLAGS) -c -o $@ $<
+
+$(OBJDIR)/%.o: %.cpp
+       $(CXX) $(CXXFLAGS) -c -o $@ $<

 
 proxguiqt.moc.cpp: proxguiqt.h
        $(MOC) -o$@ $^
 
 clean:
 
 proxguiqt.moc.cpp: proxguiqt.h
        $(MOC) -o$@ $^
 
 clean:

-       rm -f cli flasher proxmark3 snooper *.o *.moc.cpp
+       $(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
+       cp Info.plist /System/Library/Extensions/Proxmark3.kext/Contents
+       chown -R root:wheel /System/Library/Extensions/Proxmark3.kext
+       chmod 755 /System/Library/Extensions/Proxmark3.kext /System/Library/Extensions/Proxmark3.kext/Contents
+       chmod 644 /System/Library/Extensions/Proxmark3.kext/Contents/Info.plist
+       rm -rf /System/Library/Caches/com.apple.kext.caches
+       touch /System/Library/Extensions
+       @echo "*** You may need to reboot for the kext to take effect."

 
 .PHONY: all clean
 
 .PHONY: all clean