fix temp changes

diff --git a/client/Makefile b/client/Makefile
index 7224fe069fc23ca36fc466590a7884d1471e5f7e..c76edf522e5b396e856a42f1ce80d6641ba3beac 100644 (file)
--- a/client/Makefile
+++ b/client/Makefile
@@ -31,13 +31,13 @@ MOC = $(shell pkg-config --variable=moc_location QtCore)
 endif
 
 
 endif
 
 

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

 QTGUI = guidummy.o
 QTGUI = guidummy.o

-#endif
+endif

 
 CMDSRCS = \
                        nonce2key/crapto1.c\
 
 CMDSRCS = \
                        nonce2key/crapto1.c\

diff --git a/common/Makefile.common b/common/Makefile.common
index d89683270cd6e2fecf9db4058b1eedd5e48fefd5..0e3bdd1ebfc7ce6289456684f98558bcb87d2b5d 100644 (file)
--- a/common/Makefile.common
+++ b/common/Makefile.common
@@ -20,7 +20,7 @@ platform = $(shell uname)
 
 all:
 
 
 all:
 

-CROSS  ?= arm-none-eabi-
+CROSS  ?= arm-eabi-

 CC     = $(CROSS)gcc
 AS     = $(CROSS)as
 LD     = $(CROSS)ld
 CC     = $(CROSS)gcc
 AS     = $(CROSS)as
 LD     = $(CROSS)ld