From 2c64004e7c273935d39f57e8e331e99782442597 Mon Sep 17 00:00:00 2001 From: bsongis Date: Mon, 6 Feb 2012 08:58:14 +0000 Subject: [PATCH] CC defined in the beginning of the Makefile --- src/Makefile | 40 +++++++++++++++++----------------------- 1 file changed, 17 insertions(+), 23 deletions(-) diff --git a/src/Makefile b/src/Makefile index 761abea79..79d2edd1f 100644 --- a/src/Makefile +++ b/src/Makefile @@ -113,6 +113,23 @@ TRANSLATIONS = EN #------- END BUILD OPTIONS --------------------------- +# Define programs and commands. +SHELL = sh +CC = avr-gcc +OBJCOPY = avr-objcopy +OBJDUMP = avr-objdump +SIZE = avr-size +NM = avr-nm +AVRDUDE = avrdude +REMOVE = rm -f +REMOVEDIR = rm -rf +COPY = cp +WINSHELL = cmd + +XBM2LBM = ruby ../util/xbm2lbm.rb +AREV = $(shell sh -c "cat .svn/entries | sed -n '4p'") +REV = $(shell echo $$(( $(AREV) + 1 ))) + # MCU name ifeq ($(PCB), STD) MCU = atmega64 @@ -540,29 +557,6 @@ DEBUG_PORT = 4242 # avarice is running on a different computer. DEBUG_HOST = localhost - - -#============================================================================ - - -# Define programs and commands. -SHELL = sh -CC = avr-gcc -OBJCOPY = avr-objcopy -OBJDUMP = avr-objdump -SIZE = avr-size -NM = avr-nm -AVRDUDE = avrdude -REMOVE = rm -f -REMOVEDIR = rm -rf -COPY = cp -WINSHELL = cmd - -XBM2LBM = ruby ../util/xbm2lbm.rb -AREV = $(shell sh -c "cat .svn/entries | sed -n '4p'") -REV = $(shell echo $$(( $(AREV) + 1 ))) - - # Define Messages # English MSG_ERRORS_NONE = Errors: none