When detecting MONITOR_BAUDRATE, use $(LOCAL_INO_SRCS)

matthijskooijman · matthijskooijman · commit 05ce9fd14b9d · 2013-05-30T13:08:02.000+02:00
Now that this detection code is moved down a bit, it can use the same
.ino list as all the other code.
diff --git a/arduino-mk/Arduino.mk b/arduino-mk/Arduino.mk
@@ -658,7 +658,7 @@ endif
 #
 ifndef MONITOR_BAUDRATE
 	#This works only in linux. TODO: Port it to MAC OS also
-	SPEED = $(shell grep --max-count=1 --regexp="Serial.begin" $$(ls -1 *.ino) | sed -e 's/\t//g' -e 's/\/\/.*$$//g' -e 's/(/\t/' -e 's/)/\t/' | awk -F '\t' '{print $$2}' )
+	SPEED = $(shell grep --max-count=1 --regexp="Serial.begin" $(LOCAL_INO_SRCS) | sed -e 's/\t//g' -e 's/\/\/.*$$//g' -e 's/(/\t/' -e 's/)/\t/' | awk -F '\t' '{print $$2}' )
 	MONITOR_BAUDRATE = $(findstring $(SPEED),300 1200 2400 4800 9600 14400 19200 28800 38400 57600 115200)
 
 	ifeq ($(MONITOR_BAUDRATE),)

Original file line number	Diff line number	Diff line change
`@@ -658,7 +658,7 @@ endif`
`658`	`658`	`#`
`659`	`659`	`ifndef MONITOR_BAUDRATE`
`660`	`660`	`#This works only in linux. TODO: Port it to MAC OS also`
`661`		`- SPEED = $(shell grep --max-count=1 --regexp="Serial.begin" $$(ls -1 .ino) \| sed -e 's/\t//g' -e 's/\/\/.$$//g' -e 's/(/\t/' -e 's/)/\t/' \| awk -F '\t' '{print $$2}' )`
	`661`	`+ SPEED = $(shell grep --max-count=1 --regexp="Serial.begin" $(LOCAL_INO_SRCS) \| sed -e 's/\t//g' -e 's/\/\/.*$$//g' -e 's/(/\t/' -e 's/)/\t/' \| awk -F '\t' '{print $$2}' )`
`662`	`662`	`MONITOR_BAUDRATE = $(findstring $(SPEED),300 1200 2400 4800 9600 14400 19200 28800 38400 57600 115200)`
`663`	`663`
`664`	`664`	`ifeq ($(MONITOR_BAUDRATE),)`