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

Added autodetection of ARDMK_DIR

Browse source
This commit is contained in:
jeffkowalski 2012-08-18 20:30:25 -07:00
parent d09a316d7a
commit 486be238ba
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
arduino-mk/Arduino.mk
View file

@ -384,23 +384,26 @@ endif
######################################################################## ########################################################################
# Makefile distribution path # Makefile distribution path
# #
ifdef ARDMK_DIR ifndef ARDMK_DIR
$(call show_config_variable,ARDMK_DIR) # presume it's a level above the path to our own file
ARDMK_DIR := $(realpath $(dir $(realpath $(lastword $(MAKEFILE_LIST))))/..)
$(call show_config_variable,ARDMK_DIR,[COMPUTED],(relative to $(notdir $(lastword $(MAKEFILE_LIST)))))
else
$(call show_config_variable,ARDMK_DIR,[USER])
endif
ifdef ARDMK_DIR
ifndef ARDMK_PATH ifndef ARDMK_PATH
ARDMK_PATH = $(ARDMK_DIR)/bin ARDMK_PATH = $(ARDMK_DIR)/bin
$(call show_config_variable,ARDMK_PATH,[COMPUTED],(relative to ARDMK_DIR)) $(call show_config_variable,ARDMK_PATH,[COMPUTED],(relative to ARDMK_DIR))
else else
$(call show_config_variable,ARDMK_PATH) $(call show_config_variable,ARDMK_PATH)
endif endif
else else
echo $(error "ARDMK_DIR is not defined") echo $(error "ARDMK_DIR is not defined")
endif endif
######################################################################## ########################################################################
# Miscellanea # Miscellanea
# #
@ -574,7 +577,6 @@ endif
######################################################################## ########################################################################
# Determine ARDUINO_LIBS automatically # Determine ARDUINO_LIBS automatically
# #
ifndef ARDUINO_LIBS ifndef ARDUINO_LIBS
# automatically determine included libraries # automatically determine included libraries
ARDUINO_LIBS += $(filter $(notdir $(wildcard $(ARDUINO_DIR)/libraries/*)), \ ARDUINO_LIBS += $(filter $(notdir $(wildcard $(ARDUINO_DIR)/libraries/*)), \