diff options
| author | jeffkowalski <jeff.kowalski@gmail.com> | 2012-08-18 23:00:39 -0700 |
|---|---|---|
| committer | jeffkowalski <jeff.kowalski@gmail.com> | 2012-08-18 23:00:39 -0700 |
| commit | fc968b919148eb99d1d58a8454a71bf703ca7c78 (patch) | |
| tree | 5a99ae7cb3231b8365d3b5fd403a58080b8be354 | |
| parent | 486be238badbc36fb0859be068f2c8e99b892ffa (diff) | |
Libraries may also contain subdirectory called "utility", containing
header files to be included and source files to be built. Modified
SYS_LIBS and USER_LIBS to accomodate those directories if they exist.
| -rw-r--r-- | arduino-mk/Arduino.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arduino-mk/Arduino.mk b/arduino-mk/Arduino.mk index 113d569..3b0a6f1 100644 --- a/arduino-mk/Arduino.mk +++ b/arduino-mk/Arduino.mk @@ -438,7 +438,7 @@ endif # for more information (search for 'character special device'). # ifndef MONITOR_BAUDRATE - #This works only in linux. TODO: Port it to MAC OS also + #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/\/\/.*$$//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) @@ -625,6 +625,8 @@ ifneq (,$(strip $(LIBS_NOT_FOUND))) $(error The following libraries specified in ARDUINO_LIBS could not be found (searched USER_LIB_PATH and ARDUINO_LIB_PATH): $(LIBS_NOT_FOUND)) endif +SYS_LIBS := $(wildcard $(SYS_LIBS) $(addsuffix /utility,$(SYS_LIBS))) +USER_LIBS := $(wildcard $(USER_LIBS) $(addsuffix /utility,$(USER_LIBS))) SYS_INCLUDES = $(patsubst %,-I%,$(SYS_LIBS)) USER_INCLUDES = $(patsubst %,-I%,$(USER_LIBS)) LIB_C_SRCS = $(wildcard $(patsubst %,%/*.c,$(SYS_LIBS))) |