CHG: started to clean up the crapto1 imp in client/nonce2key/ folder.

[proxmark3-svn] / client / Makefile

diff --git a/client/Makefile b/client/Makefile
index 9133abff15c41abd87f111185a5cc35fce9c21c7..61afaf599475d1af9bfe1297a92c304b560f420b 100644 (file)
--- a/client/Makefile
+++ b/client/Makefile
@@ -5,9 +5,8 @@
 #-----------------------------------------------------------------------------
 include ../common/Makefile.common
 
 #-----------------------------------------------------------------------------
 include ../common/Makefile.common
 

-
-CC=gcc
-CXX=g++
+CC = gcc
+CXX = g++

 #COMMON_FLAGS = -m32
 VPATH = ../common ../zlib
 OBJDIR = obj
 #COMMON_FLAGS = -m32
 VPATH = ../common ../zlib
 OBJDIR = obj


@@ -53,6 +52,20 @@ else
    QTLDLIBS = -L$(QTDIR)/lib -lQtCore4 -lQtGui4
 endif
 
    QTLDLIBS = -L$(QTDIR)/lib -lQtCore4 -lQtGui4
 endif
 

+# easy variable to pass to allow this to build on ubutnu 14.04.2
+ifeq (1,$(UBUNTU_1404_QT4))
+  CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall -O4
+  QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null)
+  LUALIB = ../liblua/liblua.a
+  LUALIB +=  -ldl
+  MOC = $(shell pkg-config --variable=moc_location QtCore)
+  LUAPLATFORM = linux
+
+  # pop out the libgdi/etc strings
+  LDLIBS = -L/mingw/lib -L/opt/local/lib -L/usr/local/lib -lm -lreadline -lpthread 
+  
+endif
+

 ifneq ($(QTLDLIBS),)
     QTGUI = $(OBJDIR)/proxgui.o $(OBJDIR)/proxguiqt.o $(OBJDIR)/proxguiqt.moc.o
     CFLAGS += -DHAVE_GUI
 ifneq ($(QTLDLIBS),)
     QTGUI = $(OBJDIR)/proxgui.o $(OBJDIR)/proxguiqt.o $(OBJDIR)/proxguiqt.moc.o
     CFLAGS += -DHAVE_GUI


@@ -67,15 +80,16 @@ CORESRCS =  uart.c \
 
 
 CMDSRCS =      nonce2key/crapto1.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\
+                       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\
                        mifarehost.c\

+                       parity.c\

                        crc.c \
                        crc16.c \
                        crc64.c \
                        crc.c \
                        crc16.c \
                        crc64.c \


@@ -95,6 +109,7 @@ CMDSRCS =    nonce2key/crapto1.c\
                        cmdhficlass.c \
                        cmdhfmf.c \
             cmdhfmfu.c \
                        cmdhficlass.c \
                        cmdhfmf.c \
             cmdhfmfu.c \

+                       cmdhfmfhard.c \

                        cmdhfmfdes.c \
                        cmdhftopaz.c \
                        cmdhw.c \
                        cmdhfmfdes.c \
                        cmdhftopaz.c \
                        cmdhw.c \


@@ -105,6 +120,7 @@ CMDSRCS =   nonce2key/crapto1.c\
                        cmdlfem4x.c \
                        cmdlfhitag.c \
                        cmdlfti.c \
                        cmdlfem4x.c \
                        cmdlfhitag.c \
                        cmdlfti.c \

+                       cmdlfviking.c\

                        cmdparser.c \
                        cmdmain.c \
                        cmdlft55xx.c \
                        cmdparser.c \
                        cmdmain.c \
                        cmdlft55xx.c \


@@ -116,6 +132,7 @@ CMDSRCS =   nonce2key/crapto1.c\
                        aes.c\
                        protocols.c\
                        sha1.c\
                        aes.c\
                        protocols.c\
                        sha1.c\

+                       sha256.c\

                        cmdcrc.c\
                        reveng/reveng.c\
                        reveng/cli.c\
                        cmdcrc.c\
                        reveng/reveng.c\
                        reveng/cli.c\


@@ -123,7 +140,8 @@ CMDSRCS =   nonce2key/crapto1.c\
                        reveng/model.c\
                        reveng/poly.c\
                        reveng/getopt.c\
                        reveng/model.c\
                        reveng/poly.c\
                        reveng/getopt.c\

-          
+                       tea.c\
+                       prng.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