text cleanup t55xx cmds

[proxmark3-svn] / client / Makefile

diff --git a/client/Makefile b/client/Makefile
index 7d03b101301768797d8cc53ddd9483b85f56916b..15b1cbca3cd76660fbdb69b7841dc199334a70f1 100644 (file)
--- a/client/Makefile
+++ b/client/Makefile
@@ -36,8 +36,8 @@ else ifeq ($(platform),Darwin)
 else
     CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall -O4
     QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null)
 else
     CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall -O4
     QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null)

+    LUALIB +=  -ldl

     MOC = $(shell pkg-config --variable=moc_location QtCore)
     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
     # 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


@@ -89,6 +89,7 @@ CMDSRCS =     nonce2key/crapto1.c\
                        cmdlf.c \
                        cmdlfio.c \
                        cmdlfhid.c \
                        cmdlf.c \
                        cmdlfio.c \
                        cmdlfhid.c \

+                       cmdlfawid.c \

                        cmdlfem4x.c \
                        cmdlfhitag.c \
                        cmdlfti.c \
                        cmdlfem4x.c \
                        cmdlfhitag.c \
                        cmdlfti.c \


@@ -102,6 +103,7 @@ CMDSRCS =   nonce2key/crapto1.c\
                        pm3_bitlib.c\
                        aes.c\
                        protocols.c\
                        pm3_bitlib.c\
                        aes.c\
                        protocols.c\

+                       sha1.c\

 
 ZLIBSRCS = deflate.c adler32.c trees.c zutil.c inflate.c inffast.c inftrees.c
 ZLIB_FLAGS = -DZ_SOLO -DZ_PREFIX -DNO_GZIP -DZLIB_PM3_TUNED 
 
 ZLIBSRCS = deflate.c adler32.c trees.c zutil.c inflate.c inffast.c inftrees.c
 ZLIB_FLAGS = -DZ_SOLO -DZ_PREFIX -DNO_GZIP -DZLIB_PM3_TUNED 


@@ -121,7 +123,7 @@ all: lua_build $(BINS)
 all-static: LDLIBS:=-static $(LDLIBS)
 all-static: snooper cli flasher fpga_compress
 
 all-static: LDLIBS:=-static $(LDLIBS)
 all-static: snooper cli flasher fpga_compress
 

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

 proxmark3: $(OBJDIR)/proxmark3.o $(COREOBJS) $(CMDOBJS) $(QTGUI)
        $(CXX) $(CXXFLAGS) $^ $(LDLIBS) -o $@
 
 proxmark3: $(OBJDIR)/proxmark3.o $(COREOBJS) $(CMDOBJS) $(QTGUI)
        $(CXX) $(CXXFLAGS) $^ $(LDLIBS) -o $@