/make/arduino-mk

To get this branch, use:
bzr branch http://bzr.ed.am/make/arduino-mk

« back to all changes in this revision

Viewing changes to arduino.mk

  • Committer: Tim Marston
  • Date: 2013-07-18 17:57:12 UTC
  • Revision ID: tim@ed.am-20130718175712-nxoqb246mfgfh811
updated regex that detects #included libraries

Show diffs side-by-side

added added

removed removed

arduino.mk
248
248
 
249
249
# automatically determine included libraries
250
250
LIBRARIES := $(filter $(notdir $(wildcard $(addsuffix /*, $(LIBRARYPATH)))), \
251
 
        $(shell sed -ne "s/^ *\# *include *[<\"]\(.*\)\.h[>\"]/\1/p" $(SOURCES)))
 
251
        $(shell sed -nre "s/^\s*\#\s*include\s*[<\"](\S+)\.h[>\"].*/\1/p" \
 
252
        $(SOURCES)))
252
253
 
253
254
endif
254
255
 
300
301
CPPDEPFLAGS = -MMD -MP -MF .dep/$<.dep
301
302
CPPINOFLAGS := -x c++ -include $(ARDUINOCOREDIR)/Arduino.h
302
303
AVRDUDEFLAGS += $(addprefix -C , $(AVRDUDECONF)) -DV
303
 
AVRDUDEFLAGS += -p $(BOARD_BUILD_MCU) -P $(SERIALDEV)
304
 
AVRDUDEFLAGS += -c $(BOARD_UPLOAD_PROTOCOL) -b $(BOARD_UPLOAD_SPEED)
 
304
AVRDUDEFLAGS += -p$(BOARD_BUILD_MCU) -P$(SERIALDEV) -c$(BOARD_UPLOAD_PROTOCOL)
 
305
AVRDUDEFLAGS += $(addprefix -b, $(BOARD_UPLOAD_SPEED))
305
306
LINKFLAGS += -Os -Wl,--gc-sections -mmcu=$(BOARD_BUILD_MCU)
306
307
 
307
308
# figure out which arg to use with stty (for OS X, GNU and busybox stty)