comparison Makefile @ 32:bd9ce7e581ec

Fix bad merge
author Matt Johnston <matt@ucc.asn.au>
date Thu, 27 Jun 2013 11:40:35 +0800
parents 320c8cc7df5a
children a3de303afabf
comparison
equal deleted inserted replaced
31:5d6a841eef82 32:bd9ce7e581ec
22 CLOCK = 11059200L 22 CLOCK = 11059200L
23 PROGRAMMER = #-c stk500v2 -P avrdoper 23 PROGRAMMER = #-c stk500v2 -P avrdoper
24 PROGRAMMER = -c stk500 -P ~/dev/stk500 -p $(PROGDEVICE) -B 2 24 PROGRAMMER = -c stk500 -P ~/dev/stk500 -p $(PROGDEVICE) -B 2
25 SOURCE_1WIRE = onewire.c simple_ds18b20.c crc8.c 25 SOURCE_1WIRE = onewire.c simple_ds18b20.c crc8.c
26 SOURCE_CRYPTO = hmac-sha1.c sha1-asm.S aes.c 26 SOURCE_CRYPTO = hmac-sha1.c sha1-asm.S aes.c
27 SOURCE_SD = byteordering.c fat.c partition.c sd_raw.c
27 SOURCE = main.c 28 SOURCE = main.c
28 SOURCE += $(SOURCE_CRYPTO) $(SOURCE_SD) 29 SOURCE += $(SOURCE_CRYPTO) $(SOURCE_SD)
29 LIBS = 30 LIBS =
30 31
31 OBJECTS := $(patsubst %.c,%.o,$(patsubst %.S,%.o,$(SOURCE))) 32 OBJECTS := $(patsubst %.c,%.o,$(patsubst %.S,%.o,$(SOURCE)))
76 77
77 SHELL := /bin/bash 78 SHELL := /bin/bash
78 export PATH := $(PATH):/usr/local/CrossPack-AVR/bin/ 79 export PATH := $(PATH):/usr/local/CrossPack-AVR/bin/
79 80
80 AVRDUDE = avrdude $(PROGRAMMER) 81 AVRDUDE = avrdude $(PROGRAMMER)
81 #COMPILE = avr-gcc -Wall -Os -DF_CPU=$(CLOCK) -mmcu=$(DEVICE) -g -std=c99 -mcall-prologues -fdata-sections -ffunction-sections -Wl,--gc-sections -Wl,--relax -fwhole-program -Wl,-u,vfprintf -lprintf_flt -lm 82 COMPILE = avr-gcc -Wall -Os -DF_CPU=$(CLOCK) -mmcu=$(DEVICE) -g -std=c99 -mcall-prologues -fdata-sections -ffunction-sections -Wl,--gc-sections -Wl,--relax -fwhole-program -flto
82 COMPILE = avr-gcc -Wall -Os -DF_CPU=$(CLOCK) -mmcu=$(DEVICE) -g -std=c99 -Wl,-u,vfprintf -lprintf_flt -lm
83 83
84 # symbolic targets: 84 # symbolic targets:
85 all: main.hex 85 all: main.hex
86 86
87 .c.o: 87 .c.o: