dominic/Arduino-Makefile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #14 from brotchie/master

Browse source 
Fix for using --boards_txt on Linux.
This commit is contained in:
Martin Oldfield 2012-04-28 09:49:46 -07:00
commit 72c4fabdba
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
arduino-mk/Arduino.mk
View file

@ -243,46 +243,46 @@ endif
# Which variant ? This affects the include path # Which variant ? This affects the include path
ifndef VARIANT ifndef VARIANT
VARIANT = $(shell $(PARSE_BOARD) $(BOARD_TAG) build.variant) VARIANT = $(shell $(PARSE_BOARD_CMD) $(BOARD_TAG) build.variant)
endif endif
# processor stuff # processor stuff
ifndef MCU ifndef MCU
MCU = $(shell $(PARSE_BOARD) $(BOARD_TAG) build.mcu) MCU = $(shell $(PARSE_BOARD_CMD) $(BOARD_TAG) build.mcu)
endif endif
ifndef F_CPU ifndef F_CPU
F_CPU = $(shell $(PARSE_BOARD) $(BOARD_TAG) build.f_cpu) F_CPU = $(shell $(PARSE_BOARD_CMD) $(BOARD_TAG) build.f_cpu)
endif endif
# normal programming info # normal programming info
ifndef AVRDUDE_ARD_PROGRAMMER ifndef AVRDUDE_ARD_PROGRAMMER
AVRDUDE_ARD_PROGRAMMER = $(shell $(PARSE_BOARD) $(BOARD_TAG) upload.protocol) AVRDUDE_ARD_PROGRAMMER = $(shell $(PARSE_BOARD_CMD) $(BOARD_TAG) upload.protocol)
endif endif
ifndef AVRDUDE_ARD_BAUDRATE ifndef AVRDUDE_ARD_BAUDRATE
AVRDUDE_ARD_BAUDRATE = $(shell $(PARSE_BOARD) $(BOARD_TAG) upload.speed) AVRDUDE_ARD_BAUDRATE = $(shell $(PARSE_BOARD_CMD) $(BOARD_TAG) upload.speed)
endif endif
# fuses if you're using e.g. ISP # fuses if you're using e.g. ISP
ifndef ISP_LOCK_FUSE_PRE ifndef ISP_LOCK_FUSE_PRE
ISP_LOCK_FUSE_PRE = $(shell $(PARSE_BOARD) $(BOARD_TAG) bootloader.unlock_bits) ISP_LOCK_FUSE_PRE = $(shell $(PARSE_BOARD_CMD) $(BOARD_TAG) bootloader.unlock_bits)
endif endif
ifndef ISP_LOCK_FUSE_POST ifndef ISP_LOCK_FUSE_POST
ISP_LOCK_FUSE_POST = $(shell $(PARSE_BOARD) $(BOARD_TAG) bootloader.lock_bits) ISP_LOCK_FUSE_POST = $(shell $(PARSE_BOARD_CMD) $(BOARD_TAG) bootloader.lock_bits)
endif endif
ifndef ISP_HIGH_FUSE ifndef ISP_HIGH_FUSE
ISP_HIGH_FUSE = $(shell $(PARSE_BOARD) $(BOARD_TAG) bootloader.high_fuses) ISP_HIGH_FUSE = $(shell $(PARSE_BOARD_CMD) $(BOARD_TAG) bootloader.high_fuses)
endif endif
ifndef ISP_LOW_FUSE ifndef ISP_LOW_FUSE
ISP_LOW_FUSE = $(shell $(PARSE_BOARD) $(BOARD_TAG) bootloader.low_fuses) ISP_LOW_FUSE = $(shell $(PARSE_BOARD_CMD) $(BOARD_TAG) bootloader.low_fuses)
endif endif
ifndef ISP_EXT_FUSE ifndef ISP_EXT_FUSE
ISP_EXT_FUSE = $(shell $(PARSE_BOARD) $(BOARD_TAG) bootloader.extended_fuses) ISP_EXT_FUSE = $(shell $(PARSE_BOARD_CMD) $(BOARD_TAG) bootloader.extended_fuses)
endif endif
# Everything gets built in here # Everything gets built in here
@ -548,7 +548,7 @@ size: $(OBJDIR) $(TARGET_HEX)
$(SIZE) $(TARGET_HEX) $(SIZE) $(TARGET_HEX)
show_boards: show_boards:
$(PARSE_BOARD) --boards $(PARSE_BOARD_CMD) --boards
.PHONY: all clean depends upload raw_upload reset size show_boards .PHONY: all clean depends upload raw_upload reset size show_boards