FIX: CoverityScan 123358 and 133864 - Unchecked return value

[proxmark3-svn] / client / Makefile

diff --git a/client/Makefile b/client/Makefile
index 8ccd1ceaeb5d8c623217c19051d06dd7b3ab1a21..11246a1c6268a3e30cdfe7a60f53731f8fd76d00 100644 (file)
--- a/client/Makefile
+++ b/client/Makefile
@@ -41,9 +41,16 @@ ifneq (,$(findstring MINGW,$(platform)))
        endif
        
 else ifeq ($(platform),Darwin)
        endif
        
 else ifeq ($(platform),Darwin)

+
+       # Assuming you have QT4 installed.

        CFLAGS += -I/usr/include/malloc/ -I/usr/local/opt/readline/include
        LDLIBS = -L/opt/local/lib -L/usr/local/opt/readline/lib -lreadline -lpthread -lm
        CFLAGS += -I/usr/include/malloc/ -I/usr/local/opt/readline/include
        LDLIBS = -L/opt/local/lib -L/usr/local/opt/readline/lib -lreadline -lpthread -lm

-    CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall -O3
+       
+       # use this if you have QT5 installed.
+       #CFLAGS += -I/usr/include/malloc/ -I/usr/local/opt/readline/include -I/usr/local/opt/qt5/include 
+    #LDLIBS = -L/opt/local/lib -L/usr/local/opt/readline/lib -L/usr/local/opt/qt5/lib -lreadline -lpthread -lm
+
+       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)
     LUAPLATFORM = macosx
     QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null)
     MOC = $(shell pkg-config --variable=moc_location QtCore)
     LUAPLATFORM = macosx


@@ -51,6 +58,7 @@ else
     CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall -O3
     QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null)
     LUALIB +=  -ldl
     CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall -O3
     QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null)
     LUALIB +=  -ldl

+    LDLIBS +=  -ltermcap -lncurses

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


@@ -70,7 +78,8 @@ CORESRCS =    uart.c \
                sleep.c
 
 
                sleep.c
 
 

-CMDSRCS =      nonce2key/crapto1.c \
+CMDSRCS =      mifarehost.c \
+                       nonce2key/crapto1.c \

                        nonce2key/crypto1.c \
                        nonce2key/nonce2key.c \
                        nonce2key/crypto1_bs.c \
                        nonce2key/crypto1.c \
                        nonce2key/nonce2key.c \
                        nonce2key/crypto1_bs.c \


@@ -80,7 +89,6 @@ CMDSRCS =     nonce2key/crapto1.c \
                        loclass/ikeys.c \
                        loclass/elite_crack.c \
                        loclass/fileutils.c \
                        loclass/ikeys.c \
                        loclass/elite_crack.c \
                        loclass/fileutils.c \

-                       mifarehost.c \

                        parity.c \
                        crc.c \
                        crc16.c \
                        parity.c \
                        crc.c \
                        crc16.c \


@@ -122,6 +130,7 @@ CMDSRCS =   nonce2key/crapto1.c \
                        cmdlfpyramid.c \
                        cmdlfguard.c \
                        cmdlfnedap.c \
                        cmdlfpyramid.c \
                        cmdlfguard.c \
                        cmdlfnedap.c \

+                       cmdlfjablotron.c \

                        pm3_binlib.c \
                        scripting.c \
                        cmdscript.c \
                        pm3_binlib.c \
                        scripting.c \
                        cmdscript.c \


@@ -140,8 +149,9 @@ CMDSRCS =   nonce2key/crapto1.c \
                        reveng/getopt.c \
                        tea.c \
                        prng.c \
                        reveng/getopt.c \
                        tea.c \
                        prng.c \

-                       radixsort.c \

                        bucketsort.c
                        bucketsort.c

+#                      radixsort.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