aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSudar <sudar@sudarmuthu.com>2013-06-20 21:32:35 +0530
committerSudar <sudar@sudarmuthu.com>2013-06-20 21:32:35 +0530
commit6cdad1d62149c6589de1bd3734eef0c8f561038c (patch)
tree65ea9d94807779ba83452930cb7ed162ed258466
parent3b35453564e18025642abc706d84967eef9b2a93 (diff)
Add $OBJDIR to the list of configuration that gets printed
Fix #77
-rw-r--r--HISTORY.md3
-rw-r--r--arduino-mk/Arduino.mk3
2 files changed, 6 insertions, 0 deletions
diff --git a/HISTORY.md b/HISTORY.md
index 2fbd5c7..9dbd81c 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -3,6 +3,9 @@ A Makefile for Arduino Sketches
The following is the rough list of changes that went into different versions. I tried to give credit whenever possible. If I have missed anyone, kindly add it to the list.
+### 0.12.1 (in development)
+- Add $OBJDIR to the list of configuration that gets printed. Fix issue #77
+
### 0.12.0 (2013-06-20)
- Fix "generated_assembly" target, which got broken earlier. Fix issue #76 (https://github.com/matthijskooijman)
- Deprecate "generated_assembly" target in favour of "generate_assembly". Fix issue #79
diff --git a/arduino-mk/Arduino.mk b/arduino-mk/Arduino.mk
index b04d057..c6a49bc 100644
--- a/arduino-mk/Arduino.mk
+++ b/arduino-mk/Arduino.mk
@@ -503,6 +503,9 @@ endif
# Everything gets built in here (include BOARD_TAG now)
ifndef OBJDIR
OBJDIR = build-$(BOARD_TAG)
+ $(call show_config_variable,OBJDIR,[COMPUTED],(from BOARD_TAG))
+else
+ $(call show_config_variable,OBJDIR,[USER])
endif
########################################################################