Fix commit 232, reenable GUI

[proxmark3-svn] / linux / Makefile

diff --git a/linux/Makefile b/linux/Makefile
index ef764db421e62e331e7a4814e9bb5a2c8bd4f7cf..70e7cc7a114d1e9daf0dd2864c9f05a23ca5da17 100644 (file)
--- a/linux/Makefile
+++ b/linux/Makefile
@@ -1,10 +1,12 @@
-LDFLAGS = -lusb -lreadline -lpthread -L/opt/local/lib
-CFLAGS = -I. -I/opt/local/include -Wall
+#COMMON_FLAGS = -m32
+LDLIBS = -L/usr/local/lib -lusb -lreadline -lpthread
+LDFLAGS = $(COMMON_FLAGS)
+CFLAGS = -I. -I/opt/local/include -Wall -Wno-unused-function $(COMMON_FLAGS)
 
 CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall
-QTLDFLAGS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null)
+QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null)
 
-ifneq ($(QTLDFLAGS),)
+ifneq ($(QTLDLIBS),)
 QTGUI = proxgui.o proxguiqt.o proxguiqt.moc.o
 CFLAGS += -DHAVE_GUI
 MOC = $(shell type moc-qt4 >/dev/null 2>&1 && echo moc-qt4 || echo moc)
@@ -13,19 +15,26 @@ else
 QTGUI = guidummy.o
 endif
 
-all: proxmark3 snooper cli
+all: proxmark3 snooper cli flasher
 
-proxmark3: LDFLAGS+=$(QTLDFLAGS)
+all-static: LDLIBS:=-static $(LDLIBS)
+all-static: snooper cli flasher
+
+proxmark3: LDLIBS+=$(QTLDLIBS)
 proxmark3: proxmark3.o gui.o command.o usb.o $(QTGUI)
 
+command.o: ../winsrc/command.cpp translate.h
+
 snooper: snooper.o gui.o command.o usb.o guidummy.o
 
 cli: cli.o gui.o command.o usb.o guidummy.o
 
+flasher: flasher.o usb.o
+
 proxguiqt.moc.cpp: proxguiqt.h
        $(MOC) -o$@ $^
 
 clean:
-       rm -f cli proxmark3 snooper *.o *.moc.cpp
+       rm -f cli flasher proxmark3 snooper *.o *.moc.cpp
 
 .PHONY: all clean