Merge branch 'master' of github.com:Proxmark/proxmark3

[proxmark3-svn] / client / Makefile

diff --git a/client/Makefile b/client/Makefile
index 71da64fdf302ae587307dc8669aa1af654a03045..20e17d7d5ae47ec8b7949ac60adc44e900c9cc79 100644 (file)
--- a/client/Makefile
+++ b/client/Makefile
@@ -9,26 +9,32 @@ include ../common/Makefile.common
 CC=gcc
 CXX=g++
 #COMMON_FLAGS = -m32
-
 VPATH = ../common
 OBJDIR = obj
 
-LDLIBS = -L/opt/local/lib -L/usr/local/lib -lreadline -lpthread ../liblua/liblua.a
+LDLIBS = -L/opt/local/lib -L/usr/local/lib ../liblua/liblua.a -lreadline -lpthread -lm
 LDFLAGS = $(COMMON_FLAGS)
-CFLAGS = -std=c99 -I. -I../include -I../common -I/opt/local/include -I../liblua -Wall -Wno-unused-function $(COMMON_FLAGS) -g -O4 
-
+CFLAGS = -std=c99 -I. -I../include -I../common -I/opt/local/include -I../liblua -Wall $(COMMON_FLAGS) -g -O4
+LUAPLATFORM = generic
 ifneq (,$(findstring MINGW,$(platform)))
 CXXFLAGS = -I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui
 QTLDLIBS = -L$(QTDIR)/lib -lQtCore4 -lQtGui4
 MOC = $(QTDIR)/bin/moc
+LUAPLATFORM = mingw
 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 
+CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall -O4
+QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null)
+MOC = $(shell pkg-config --variable=moc_location QtCore)
+LUAPLATFORM = macosx
 else
 CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall -O4
 QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null)
 MOC = $(shell pkg-config --variable=moc_location QtCore)
+LDLIBS +=  -ldl
+
+# Below is a variant you can use if you have problems compiling with QT5 on ubuntu. see http://www.proxmark.org/forum/viewtopic.php?id=1661 for more info. 
+#MOC = /usr/lib/x86_64-linux-gnu/qt4/bin/moc
+LUAPLATFORM = linux
 endif
 
 
@@ -42,11 +48,18 @@ endif
 
 CORESRCS =     uart.c \
                util.c \
-               sleep.c \
+               sleep.c
+
 
 CMDSRCS =      nonce2key/crapto1.c\
                nonce2key/crypto1.c\
                nonce2key/nonce2key.c\
+               loclass/cipher.c \
+               loclass/cipherutils.c \
+               loclass/des.c \
+               loclass/ikeys.c \
+               loclass/elite_crack.c\
+               loclass/fileutils.c\
                        mifarehost.c\
                        crc16.c \
                        iso14443crc.c \
@@ -55,6 +68,7 @@ CMDSRCS =     nonce2key/crapto1.c\
                        graph.c \
                        ui.c \
                        cmddata.c \
+                       lfdemod.c \
                        cmdhf.c \
                        cmdhf14a.c \
                        cmdhf14b.c \
@@ -63,8 +77,10 @@ CMDSRCS =    nonce2key/crapto1.c\
                        cmdhflegic.c \
                        cmdhficlass.c \
                        cmdhfmf.c \
+            cmdhfmfu.c \
                        cmdhw.c \
                        cmdlf.c \
+                       cmdlfio.c \
                        cmdlfhid.c \
                        cmdlfem4x.c \
                        cmdlfhitag.c \
@@ -76,7 +92,9 @@ CMDSRCS =     nonce2key/crapto1.c\
                        pm3_binlib.c\
                        scripting.c\
                        cmdscript.c\
-
+                       pm3_bitlib.c\
+                       aes.c\
+                       protocols.c\
 
 
 COREOBJS = $(CORESRCS:%.c=$(OBJDIR)/%.o)
@@ -115,23 +133,13 @@ proxguiqt.moc.cpp: proxguiqt.h
 
 clean:
        $(RM) $(CLEAN)
+       cd ../liblua && make 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."
-
 lua_build:
-       @echo Compiling liblua;
-       cd ../liblua && make linux
+       @echo Compiling liblua, using platform $(LUAPLATFORM)
+       cd ../liblua && make $(LUAPLATFORM)
 
 .PHONY: all clean