marcan's patch until he gets commit access. Remove C library's includes from the...

[proxmark3-svn] / common / Makefile.common

diff --git a/common/Makefile.common b/common/Makefile.common
index 66bdddab9a000c5b0ff097d5bc30e0c21325dd7f..c1193f9aa7e2de2d4440b16e0ddba8b2f9e6139f 100644 (file)
--- a/common/Makefile.common
+++ b/common/Makefile.common
@@ -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 
@@ -33,7 +33,7 @@ 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)
+LIBGCC ?= $(shell $(CC) -print-libgcc-file-name)
 
 else
 
@@ -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