Client cleanup and restructuring. Stage 1...

[proxmark3-svn] / client / Makefile

diff --git a/client/Makefile b/client/Makefile
index 8bbc0273cd35103cd347be8090d36b4be7d2a6b2..48ddffd2d91547b5b9f20d8b5aae4645f34bd389 100644 (file)
--- a/client/Makefile
+++ b/client/Makefile
@@ -1,15 +1,38 @@
 WINCC=c:\mingw\bin\gcc
-
 #COMMON_FLAGS = -m32
 
+VPATH = ../common
+
 LDLIBS = -L/opt/local/lib -L/usr/local/lib -lusb -lreadline -lpthread
 LDFLAGS = $(COMMON_FLAGS)
-CFLAGS = -I. -I/opt/local/include -Wall -Wno-unused-function $(COMMON_FLAGS) -g3
+CFLAGS = -std=c99 -I. -I../include -I../common -I/opt/local/include -Wall -Wno-unused-function $(COMMON_FLAGS) -g3
 
 WINLIBS = -lgdi32 -lsetupapi
 CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall
 QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null)
 
+CMDSRCS = \
+                       crc16.c \
+                       iso14443crc.c \
+                       data.c \
+                       graph.c \
+                       ui.c \
+                       cmddata.c \
+                       cmdhf.c \
+                       cmdhf14a.c \
+                       cmdhf14b.c \
+                       cmdhf15.c \
+                       cmdhflegic.c \
+                       cmdhw.c \
+                       cmdlf.c \
+                       cmdlfem4x.c \
+                       cmdlfhid.c \
+                       cmdlfti.c \
+                       cmdparser.c \
+                       cmdmain.c
+
+CMDOBJS = $(CMDSRCS:.c=.o)
+
 ifeq ($(shell echo ""),)
 
 ifeq ($(shell uname),Darwin)
@@ -29,7 +52,7 @@ endif
 
 RM = rm -f
 BINS = proxmark3 snooper cli flasher
-CLEAN = cli flasher proxmark3 snooper *.o *.moc.cpp
+CLEAN = cli flasher proxmark3 snooper *.o $(CMDOBJS) *.moc.cpp
 else
 RM = del
 BINS = prox.exe
@@ -41,19 +64,17 @@ all: $(BINS)
 all-static: LDLIBS:=-static $(LDLIBS)
 all-static: snooper cli flasher
 
-prox.exe: prox.c wingui.c command.c flash.c
-       $(WINCC) $(CFLAGS) $(DEFINES) -o prox.exe prox.c wingui.c command.c flash.c $(WINLIBS)
+prox.exe: prox.c wingui.c $(CMDSRCS) flash.c
+       $(WINCC) $(CFLAGS) $(DEFINES) -o prox.exe prox.c wingui.c $(CMDSRCS) flash.c $(WINLIBS)
        
 proxmark3: LDLIBS+=$(QTLDLIBS)
-proxmark3: proxmark3.o gui.o command.o usb.o $(QTGUI)
-
-command.o: command.c
+proxmark3: proxmark3.o $(CMDOBJS) proxusb.o $(QTGUI)
 
-snooper: snooper.o gui.o command.o usb.o guidummy.o
+snooper: snooper.o $(CMDOBJS) proxusb.o guidummy.o
 
-cli: cli.o gui.o command.o usb.o guidummy.o
+cli: cli.o $(CMDOBJS) proxusb.o guidummy.o
 
-flasher: flash.o flasher.o usb.o
+flasher: flash.o flasher.o proxusb.o
 
 proxguiqt.moc.cpp: proxguiqt.h
        $(MOC) -o$@ $^