But let people override CROSS if they reall want to ;)

[proxmark3-svn] / common / Makefile.common

diff --git a/common/Makefile.common b/common/Makefile.common
index c2903a8f1feebba91646826dbc5800d2672ff3d5..e29347929e50f785fd567e81339ea3a98cf71433 100644 (file)
--- a/common/Makefile.common
+++ b/common/Makefile.common
@@ -9,7 +9,7 @@
 # (The including Makefile still needs to define what 'all' is)
 all:
 
-CROSS   = arm-elf-
+CROSS  ?= arm-eabi-
 CC     = $(CROSS)gcc
 AS     = $(CROSS)as
 LD     = $(CROSS)ld
@@ -17,7 +17,7 @@ OBJCOPY = $(CROSS)objcopy
 
 OBJDIR = obj
 
-INCLUDE = -I../include
+INCLUDE = -I../include -I../common
 
 # Windows' echo echos its input verbatim, on Posix there is some
 #  amount of shell command line parsing going on. echo "" on 
@@ -57,7 +57,7 @@ INCLUDES = ../include/proxmark3.h ../include/at91sam7s512.h ../include/config_gp
 CFLAGS =  -c $(INCLUDE) -Wall -Werror -pedantic -std=gnu99 $(APP_CFLAGS)
 
 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