Another merge fix.

This commit is contained in:
Sonny Jeon 2013-10-29 19:43:40 -06:00
parent b8f0a2399e
commit 2eb5acaa33

View File

@ -42,7 +42,7 @@ FUSES = -U hfuse:w:0xd2:m -U lfuse:w:0xff:m
# Tune the lines below only if you know what you are doing: # Tune the lines below only if you know what you are doing:
AVRDUDE = avrdude $(PROGRAMMER) -p $(DEVICE) -B 10 -F AVRDUDE = avrdude $(PROGRAMMER) -p $(DEVICE) -B 10 -F
COMPILE = avr-gcc -Wall -Os -DF_CPU=$(CLOCK) -mmcu=$(DEVICE) -I. -ffunction-sections --std=c99 COMPILE = avr-gcc -Wall -Os -DF_CPU=$(CLOCK) -mmcu=$(DEVICE) -I. -ffunction-sections
# symbolic targets: # symbolic targets:
all: grbl.hex all: grbl.hex
@ -97,4 +97,3 @@ cpp:
# include generated header dependencies # include generated header dependencies
-include $(OBJECTS:.o=.d) -include $(OBJECTS:.o=.d)