diff options
| author | ladislas <ladislas@weareleka.com> | 2014-08-18 23:27:01 +0200 |
|---|---|---|
| committer | ladislas <ladislas@weareleka.com> | 2014-08-18 23:27:01 +0200 |
| commit | 58f303a5d358f68e1b53012790225e8d677f8f0e (patch) | |
| tree | 0d9de610e1c066b8874903fdf56948789b87d173 | |
| parent | f33b14715bc786f7aba8e9b4969b16c1e0a03ed0 (diff) | |
| parent | 08c3ff6809e2debd5a47de095048dc5a54bcbae2 (diff) | |
Merge branch 'master' of https://github.com/sudar/Arduino-Makefile into update
| -rw-r--r-- | Arduino.mk | 2 | ||||
| -rw-r--r-- | HISTORY.md | 4 | ||||
| -rw-r--r-- | examples/MakefileExample/Makefile-example.mk | 2 |
3 files changed, 4 insertions, 4 deletions
@@ -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) @@ -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) 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. |