aboutsummaryrefslogtreecommitdiff
path: root/Common.mk
diff options
context:
space:
mode:
authorSimon John <git@the-jedi.co.uk>2018-02-24 16:03:37 +0000
committerGitHub <noreply@github.com>2018-02-24 16:03:37 +0000
commit139b5dbc4919e118b0e18783fae8e51a2dbc258c (patch)
treecff8ea8bb5e6f63d7ada4eb85ad67a9b5237525a /Common.mk
parentb3c5127be244ef68f1f895155f3d8999f8800f83 (diff)
parentc10eaa4f480da35437d13fdc21df5d13e2d11866 (diff)
Merge branch 'master' into disable-prog-types-compat
Diffstat (limited to 'Common.mk')
-rw-r--r--Common.mk6
1 files changed, 5 insertions, 1 deletions
diff --git a/Common.mk b/Common.mk
index a8bd46a..5f30fba 100644
--- a/Common.mk
+++ b/Common.mk
@@ -1,3 +1,4 @@
+COMMON_INCLUDED = TRUE
# Useful functions
# Returns the first argument (typically a directory), if the file or directory
# named by concatenating the first and optionally second argument
@@ -26,8 +27,11 @@ show_config_variable = $(call show_config_info,$(1) = $($(1)) $(3),$(2))
# Just a nice simple visual separator
show_separator = $(call arduino_output,-------------------------)
+# Master Arduino Makefile include (after user Makefile)
+ardmk_include = $(shell basename $(word 2,$(MAKEFILE_LIST)))
+
$(call show_separator)
-$(call arduino_output,Arduino.mk Configuration:)
+$(call arduino_output,$(call ardmk_include) Configuration:)
########################################################################
#