X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/d5be6f7cd4bedb62331f1ab61c63e74897b17d46..bd20f8f47847787e1f3e933043933272908c5beb:/common/Makefile.common

diff --git a/common/Makefile.common b/common/Makefile.common
index c2903a8f..3dbb55c0 100644
--- 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
@@ -9,7 +17,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 +25,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 +65,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