From a58062611e44e8f86f3fe07c8d85667ebddb7159 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Thu, 14 Aug 2014 12:14:40 -0400 Subject: [PATCH 1/2] MakefileExample: Fix AVR_TOOLS_DIR default Judging by the default for OS X directly above it and the fact that the current default doesn't work, it seems this should not include the `/bin`. --- examples/MakefileExample/Makefile-example.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/MakefileExample/Makefile-example.mk b/examples/MakefileExample/Makefile-example.mk index 964f9de..67e83e3 100644 --- a/examples/MakefileExample/Makefile-example.mk +++ b/examples/MakefileExample/Makefile-example.mk @@ -36,7 +36,7 @@ MONITOR_BAUDRATE = 115200 ### On OS X with `homebrew`: AVR_TOOLS_DIR = /usr/local ### or on Linux: (remove the one you don't want) -AVR_TOOLS_DIR = /usr/bin +AVR_TOOLS_DIR = /usr ### AVRDDUDE ### Path to avrdude directory. From 421a40e2616c17c12061c3263bfb9d56f8523c8e Mon Sep 17 00:00:00 2001 From: Simon John Date: Sat, 16 Aug 2014 19:31:07 +0200 Subject: [PATCH 2/2] allows "make clean" to be extended in the user's local makefile to clean other files out, e.g. backup/git files --- Arduino.mk | 2 +- HISTORY.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Arduino.mk b/Arduino.mk index 9e29e37..60bec1c 100644 --- a/Arduino.mk +++ b/Arduino.mk @@ -1333,7 +1333,7 @@ ifneq ($(strip $(AVRDUDE_ISP_FUSES_POST)),) $(AVRDUDE) $(AVRDUDE_COM_OPTS) $(AVRDUDE_ISP_OPTS) $(AVRDUDE_ISP_FUSES_POST) endif -clean: +clean:: $(REMOVE) $(OBJDIR) size: $(TARGET_HEX) diff --git a/HISTORY.md b/HISTORY.md index 1924534..072e695 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -12,10 +12,10 @@ I tried to give credit whenever possible. If I have missed anyone, kindly add it - Add: Add information about overriding system libs (Issue #229). (https://github.com/sej7278) - Add: Add information about reporting bugs to the correct project (Issue #231). (https://github.com/sej7278) - Fix: Allow the use of CFLAGS_STD and CXXFLAGS_STD and set defaults (Issue #234) (https://github.com/ladislas) -- Tweak: Remove \$(EXTRA_XXX) variables (Issue #234) (https://github.com/ladislas) +- Tweak: Remove $(EXTRA_XXX) variables (Issue #234) (https://github.com/ladislas) - Add: Add documentation about CFLAGS_STD and CXXFLAGS_STD (Issue #234) (https://github.com/ladislas) - Tweak: Update Malefile-example.mk with STD flags (https://github.com/ladislas) - +- Add: Allow "make clean" target to be extended (Issue #239). (https://github.com/sej7278) ### 1.3.4 (2014-07-12) - Tweak: Allow spaces in "Serial.begin (....)". (Issue #190) (https://github.com/pdav)