CHG: print up to 20 possible keys.

[proxmark3-svn] / common / Makefile.common

diff --git a/common/Makefile.common b/common/Makefile.common
index 66bdddab9a000c5b0ff097d5bc30e0c21325dd7f..b933361048b6d3756e4c3e843976ce81fb360faf 100644 (file)
--- a/common/Makefile.common
+++ b/common/Makefile.common
@@ -1,3 +1,11 @@
+#-----------------------------------------------------------------------------
+# This code is licensed to you under the terms of the GNU GPL, version 2 or,
+# at your option, any later version. See the LICENSE.txt file for the text of
+# the license.
+#-----------------------------------------------------------------------------
+# Common makefile functions for all platforms
+#-----------------------------------------------------------------------------
+
 # This new makefile replaces the previous Makefile/Makefile.linux
 # with as much common code for both environments as possible.
 # Following is a short OS detection to set up variables, all the
@@ -7,9 +15,12 @@
 
 # Make sure that all is the default target
 # (The including Makefile still needs to define what 'all' is)
+
+platform = $(shell uname)
+
 all:
 
-CROSS   = arm-elf-
+CROSS  ?= arm-none-eabi-
 CC     = $(CROSS)gcc
 AS     = $(CROSS)as
 LD     = $(CROSS)ld
@@ -17,7 +28,10 @@ OBJCOPY = $(CROSS)objcopy
 
 OBJDIR = obj
 
-INCLUDE = -I../include
+INCLUDE = -I../include -I../common
+
+TAR=tar
+TARFLAGS = -C .. -rvf
 
 # Windows' echo echos its input verbatim, on Posix there is some
 #  amount of shell command line parsing going on. echo "" on 
@@ -31,9 +45,7 @@ MOVE=mv
 COPY=cp
 PATHSEP=/
 FLASH_TOOL=client/flasher
-DETECTED_OS=UNAME
-# You may/should set this in your environment
-LIBGCC ?= $(shell $(CC) -print-file-name=interwork/libgcc.a)
+DETECTED_OS=$(UNAME)
 
 else
 
@@ -42,8 +54,8 @@ DELETE=del /q
 MOVE=ren
 COPY=copy
 PATHSEP=\\#
-LIBGCC ?= ../../devkitARM/lib/gcc/arm-elf/4.1.0/interwork/libgcc.a
-FLASH_TOOL=winsrc\\prox.exe
+#FLASH_TOOL=winsrc\\prox.exe
+FLASH_TOOL=winsrc\\flash.exe
 DETECTED_OS=Windows
 
 endif
@@ -54,10 +66,15 @@ VPATH = . ../common/ ../fpga/
 
 INCLUDES = ../include/proxmark3.h ../include/at91sam7s512.h ../include/config_gpio.h ../include/usb_cmd.h $(APP_INCLUDES)
 
-CFLAGS =  -c $(INCLUDE) -Wall -Werror -pedantic -std=gnu99 $(APP_CFLAGS)
+# compile hint: -flto to minimise size.
+CFLAGS =  -c $(INCLUDE) -Wall -Werror  -fdata-sections -ffunction-sections -pedantic -std=c99 -Os $(APP_CFLAGS)
+#CFLAGS =  -c $(INCLUDE) -Wall -Werror  -pedantic -std=c99 -Os $(APP_CFLAGS)
+LDFLAGS = -nostartfiles -nodefaultlibs -Wl,-gc-sections -n
+
+LIBS = -lgcc
 
 THUMBOBJ = $(patsubst %.c,$(OBJDIR)/%.o,$(THUMBSRC))
-ARMOBJ   = $(patsubst %.c,$(OBJDIR)/%.o,$(ARMSRC))
+ARMOBJ   = $(ARMSRC:%.c=$(OBJDIR)/%.o)
 ASMOBJ   = $(patsubst %.s,$(OBJDIR)/%.o,$(ASMSRC))
 VERSIONOBJ = $(OBJDIR)/version.o