X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/f89c705002842291e39d000f27dbaea1ddd78917..dfc3c5053cb9347fc2ff63342aad7abc3bbf94c6:/client/Makefile?ds=inline

diff --git a/client/Makefile b/client/Makefile
index aa0fb61f..79e6eb2e 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -12,20 +12,20 @@ CXX=g++
 VPATH = ../common
 OBJDIR = obj
 
-LDLIBS = -L/opt/local/lib -L/usr/local/lib -lusb -lreadline -lpthread
+LDLIBS = -L/opt/local/lib -L/usr/local/lib -lreadline -lpthread
 LDFLAGS = $(COMMON_FLAGS)
-CFLAGS = -std=gnu99 -I. -I../include -I../common -I/opt/local/include -Wall -Wno-unused-function $(COMMON_FLAGS) -g -O3
+CFLAGS = -std=c99 -I. -I../include -I../common -I/opt/local/include -Wall -Wno-unused-function $(COMMON_FLAGS) -g -O4
 
 ifneq (,$(findstring MINGW,$(platform)))
 CXXFLAGS = -I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui
 QTLDLIBS = -L$(QTDIR)/lib -lQtCore4 -lQtGui4
-MOC = moc
+MOC = $(QTDIR)/bin/moc
 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
+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)
 endif
@@ -39,36 +39,46 @@ else
 QTGUI = guidummy.o
 endif
 
-CMDSRCS = \
-			nonce2key/crapto1.c\
-			nonce2key/crypto1.c\
-			nonce2key/nonce2key.c\
+CORESRCS = 	uart.c \
+		util.c \
+		sleep.c
+
+
+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 \
+			cmdlfem4x.c \
+			cmdlfhitag.c \
 			cmdlfti.c \
 			cmdparser.c \
-			cmdmain.c
+			cmdmain.c \
+			cmdlft55xx.c \
+			cmdlfpcf7931.c
 
+COREOBJS = $(CORESRCS:%.c=$(OBJDIR)/%.o)
 CMDOBJS = $(CMDSRCS:%.c=$(OBJDIR)/%.o)
 
 RM = rm -f
-BINS = proxmark3 snooper cli flasher
+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)
@@ -77,16 +87,16 @@ all-static: LDLIBS:=-static $(LDLIBS)
 all-static: snooper cli flasher
 	
 proxmark3: LDLIBS+=$(QTLDLIBS)
-proxmark3: $(OBJDIR)/proxmark3.o $(CMDOBJS) $(OBJDIR)/proxusb.o $(QTGUI)
+proxmark3: $(OBJDIR)/proxmark3.o $(COREOBJS) $(CMDOBJS) $(QTGUI)
 	$(CXX) $(CXXFLAGS) $^ $(LDLIBS) -o $@
 
-snooper: $(OBJDIR)/snooper.o $(CMDOBJS) $(OBJDIR)/proxusb.o $(OBJDIR)/guidummy.o
+snooper: $(OBJDIR)/snooper.o $(COREOBJS) $(CMDOBJS) $(OBJDIR)/guidummy.o
 	$(CXX) $(CXXFLAGS) $^ $(LDLIBS) -o $@
 
-cli: $(OBJDIR)/cli.o $(CMDOBJS) $(OBJDIR)/proxusb.o $(OBJDIR)/guidummy.o
+cli: $(OBJDIR)/cli.o $(COREOBJS) $(CMDOBJS) $(OBJDIR)/guidummy.o
 	$(CXX) $(CXXFLAGS) $^ $(LDLIBS) -o $@
 
-flasher: $(OBJDIR)/flash.o $(OBJDIR)/flasher.o $(OBJDIR)/proxusb.o
+flasher: $(OBJDIR)/flash.o $(OBJDIR)/flasher.o $(COREOBJS)
 	$(CXX) $(CXXFLAGS) $^ $(LDLIBS) -o $@
 
 $(OBJDIR)/%.o: %.c