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

Duplicate show_config_variable in each sub-makefile.

Browse source 
This is unfortunate because the code is duplicated, but I don't see a
good way around it since we need to dupliacate the check for ARDMK_DIR
before we can find Common.mk.
This commit is contained in:
Christopher Peplin 2013-07-03 16:40:16 -04:00
parent f90087a329
commit 5ed507cf43
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
arduino-mk/Arduino.mk
View file

@ -211,6 +211,11 @@ endif
######################################################################## ########################################################################
# Makefile distribution path # Makefile distribution path
# #
# Call with the name of the variable, a prefix tag if desired (like [AUTODETECTED]),
# and an explanation if desired (like (found in $$PATH)
show_config_variable = $(call show_config_info,$(1) = $($(1)) $(3),$(2))
ifndef ARDMK_DIR ifndef ARDMK_DIR
# presume it's a level above the path to our own file # presume it's a level above the path to our own file
ARDMK_DIR := $(realpath $(dir $(realpath $(lastword $(MAKEFILE_LIST))))/..) ARDMK_DIR := $(realpath $(dir $(realpath $(lastword $(MAKEFILE_LIST))))/..)

5
arduino-mk/chipKIT.mk
View file

@ -23,6 +23,11 @@
######################################################################## ########################################################################
# Makefile distribution path # Makefile distribution path
# #
# Call with the name of the variable, a prefix tag if desired (like [AUTODETECTED]),
# and an explanation if desired (like (found in $$PATH)
show_config_variable = $(call show_config_info,$(1) = $($(1)) $(3),$(2))
ifndef ARDMK_DIR ifndef ARDMK_DIR
# presume it's a level above the path to our own file # presume it's a level above the path to our own file
ARDMK_DIR := $(realpath $(dir $(realpath $(lastword $(MAKEFILE_LIST))))/..) ARDMK_DIR := $(realpath $(dir $(realpath $(lastword $(MAKEFILE_LIST))))/..)