merge from sudar's branch

.gitignore

@@ -1,2 +1,3 @@
 *.o
 build-cli
+/.project

README.md

@@ -1,30 +1,17 @@
 # A Makefile for Arduino Sketches
 
-This is a very simple Makefile which knows how to build Arduino sketches.
+This is a very simple Makefile which knows how to build Arduino sketches. It defines the entire workflows for compiling code, flashing it to Arduino and even communicating through Serial monitor. You don't need to change anything in the Arduino sketches.
 
-Until March 2012, this was simply posted on my website where you can
+If you're using Debian or Ubuntu, you can find this in the `arduino-mk` package.
-still find [what
-documentation](http://mjo.tc/atelier/2009/02/arduino-cli.html
-"Documentation") exists.
 
-If you're using Debian or Ubuntu, you can find this in the
+## Credits
-arduino-mk package.
 
-# Important Changes, 2012-04-29
+This makefile was originally created by [Martin Oldfield](http://mjo.tc/atelier/2009/02/arduino-cli.html) and he maintained it till v0.10.2. 
+From May 2013, it is maintained by [Sudar](http://hardwarefun.com)
 
-I've rejigged the path calculations so that:
+## Usage
 
-1. Few, if any paths, need to specified in the project specific Makefiles.
+Download a copy of this repo some where in your system.
-
-1. The paths can be grabber from the environment e.g. set up in a user's .bashrc.
-
-1. It should be easier to move between e.g. Mac and Linux.
-
-I'm indebted to Christopher Peplin for making me think about this, and indeed for
-contributing code which did similar things in different ways.
-
-The upshot of all this is that you'll need to set up some variables if you want 
-this to work:
 
 On the Mac you might want to set:
 
@@ -38,12 +25,12 @@ On Linux, you might prefer:
     AVR_TOOLS_DIR = /usr
 
 The Makefile also delegates resetting the board to a short Perl program.
-You'll need to install Device::SerialPort to use it though. You'll also
+You'll need to install `Device::SerialPort` to use it though. You'll also
-need the YAML library to run ard-parse-boards.
+need the `YAML` library to run ard-parse-boards.
 
 On Debian or Ubuntu:
 
-       apt-get install libdevice-serial-perl
+       apt-get install libdevice-serialport-perl
        apt-get install libyaml-perl
 
 On Fedora:
@@ -51,6 +38,13 @@ On Fedora:
        yum install perl-Device-SerialPort
        yum install perl-YAML
 
+On Mac using MacPorts:
+
+       sudo port install p5-device-serialport
+       sudo port install p5-YAML
+
+      and use /opt/local/bin/perl5 instead of /usr/bin/perl
+
 On other systems:
 
        cpanm Device::SerialPort
@@ -62,3 +56,103 @@ In order to use Arduino libraries installed in the user's sketchbook folder (the
 standard location for custom libraries when using the Arduino IDE), you need to
 set the `ARDUINO_SKETCHBOOK` variable to point to this directory. By default it
 is set to `$HOME/sketchbook`.
+
+## Changelog
+
+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.10.2 15.xii.2012 Sudar
+- Added sketch size verification. (https://github.com/fornellas)
+- Show original line number for error messages (https://github.com/WizenedEE)
+- Removed -w from CPPFLAGS to show warnings (https://github.com/gaftech)
+- Changed shebang to use /usr/bin/env (https://github.com/anm)
+- set USB_VID and USB_PID only for leonardo boards(https://github.com/alohr)
+- Updated Readme (https://github.com/fr0sty1/)
+
+###  0.10.1 15.xii.2012 Sudar
+- Merged all changes from Upstream and the following changes from https://github.com/rpavlik
+- Allow passing extra flags
+- Make listing files more useful
+- Add knowledge of device-specific assembler
+- Use variables instead of hardcoded commands
+- Make disasm more helpful
+- Change .sym output
+- Provide symbol_sizes and generated_assembly targets.
+- Be able to silence configuration output
+- Make everybody depend on the makefile, in case cflags are changed, etc.
+- Make the makefile error if the arduino port is not present.
+
+###   0.10 17.ix.12   M J Oldfield
+- Merged all changes from Upstream
+
+###   0.9.3.2 10.ix.2012 Sudar
+- Fixed a typo in README. Issue reported at upstream (https://github.com/mjoldfield/Arduino-Makefile/issues/21)
+
+###   0.9.3.1 18.viii.2012 jeffkowalski
+
+- Autodetect ARDUINO_LIBS from includes in LOCAL_SRCS
+- Autodetect ARDUINO_SKETCHBOOK from file set by Arduino IDE
+- Autodetect ARDMK_DIR based on location of this file
+- Added support for utility directory within SYS and USER libraries
+
+### 0.9.3 13.vi.2012 
+
+- Auto detect ARDUINO_DIR, Arduino version (https://github.com/rpavlik/)
+- Categorize libs into user and system (https://github.com/rpavlik/)
+- Dump size at the end of the build (https://github.com/rpavlik/)
+- Lots and lots of improvements (https://github.com/rpavlik/)
+- Changed bytes option for the head shell command, so that it works in Mac as well
+- Auto detect Serial Baud rate from sketch if possible
+
+### 0.9.2 06.vi.2012 
+
+- Allow user to choose source files (LOCAL_*_SRCS flags) (https://github.com/Gaftech)
+- Modified "make size" behavior: using --mcu option and targeting .elf file instead of .hex file.(https://github.com/Gaftech)
+
+### 0.9.1 06.vi.2012 
+
+- Corrected the ubuntu package names
+- Prevent the *file-not-found* error if the depends.mk file is not needed
+- Delete the build-cli folder as well while doing make clean
+- Added support for compiling .pde files in Arduino 1.0 environment
+- Replaced = with += in CPPFLAGS assignment so that we can set CPPFLAGS per sketch if needed
+- Changed AVRDUDE_CONF so it can be defined in per-project makefile (https://github.com/WizenedEE)
+- Cleaner way to delete the build-cli directory when make clean is invoked
+- The package name in Debian and Ubuntu is arduino-mk (https://github.com/maqifrnswa)
+
+### 2012-02-12, version 0.8
+- Patches for version 1.0 of the Arduino IDE. Older versions might still work, but I’ve not tested it.
+- A change to the build process: rather than link all the system objects directly into the executable, bundle them in a library first. This should make the final executable smaller.
+- If TARGET isn’t explicitly set, default to the current directory name. Thanks to Daniele Vergini for this patch.
+- Add support for .c files in system libraries: Dirk-Willem van Gulik and Evan Goldenberg both reported this and provided patches in the same spirit.
+- Added a size target as suggested by Alex Satrapa.
+
+### Unreleased, version 0.7
+- Added -lm to the linker options, and -F to stty.
+
+### 2011-06-23, version 0.6
+- Added ard-parse-boards. Mark Sproul suggested doing something like this ages ago, but I’ve only recently looked at it in detail.
+- Fabien Le Lez reported that one needs to link with -lc to avoid [linker errors](http://forum.arduino.cc/index.php/topic,40215.0.html).
+
+### 2011-06-23, version 0.5
+- Imported changes from Debian/Ubuntu, which incorporate a patch from Stefan Tomanek so that libraries would be compiled too.
+
+Note: Many other people sent me similar patches, but I didn’t get around to using them. In the end, I took the patch from Debian and Ubuntu: there seems merit in not forking the code and using a tested version. So, thanks and apologies to Nick Andrew, Leandro Coletto Biazon, Thibaud Chupin, Craig Hollabaugh, Johannes H. Jensen, Fabien Le Lez, Craig Leres, and Mark Sproul.
+
+### 2010-05-24, version 0.4
+Tweaked rules for the reset target on Philip Hands’ advice.
+
+### 2010-05-21, version 0.3
+- Tidied up the licensing, making it clear that it’s released under LGPL 2.1.
+- [Philip Hands](http://hands.com/~phil/) sent me some code to reset the Arduino by dropping DTR for 100ms, and I added it.
+- Tweaked the Makefile to handle version 0018 of the Arduino software which now includes main.cpp. Accordingly we don’t need to—and indeed must not—add main.cxx to the .pde sketch file. The paths seem to have changed a bit too.
+
+## Know Issues
+- Because of the way the makefile is structured, the configuration parameters gets printed twice. 
+- Doesn't work with Leonardo yet.
+- More todo's at https://github.com/sudar/Arduino-Makefile/issues/
+
+## Similar works
+- It's not a derivative of this, but Alan Burlison has written a [similar thing](http://bleaklow.com/2010/06/04/a_makefile_for_arduino_sketches.html).
+- Alan's Makefile was used in a [Pragmatic Programmer's article](http://pragprog.com/magazines/2011-04/advanced-arduino-hacking).
+- Rei Vilo wrote to tell me that he's using the Makefile ina Xcode 4 template called [embedXcode](http://embedxcode.weebly.com/). Apparently it supports many platforms and boards, including AVR-based Arduino, AVR-based Wiring, PIC32-based chipKIT, MSP430-based LaunchPad and ARM3-based Maple.

arduino-mk/Arduino.mk

@@ -3,6 +3,9 @@
 # Arduino command line tools Makefile
 # System part (i.e. project independent)
 #
+# Copyright (C) 2012 Sudar <http://sudarmuthu.com>, based on
+# - M J Oldfield work: https://github.com/mjoldfield/Arduino-Makefile
+#
 # Copyright (C) 2010,2011,2012 Martin Oldfield <m@mjo.tc>, based on
 # work that is copyright Nicholas Zambetti, David A. Mellis & Hernando
 # Barragan.
@@ -78,6 +81,41 @@
 #                            clarity and better error handling (ex
 #                            Daniele Vergini)
 #
+#         0.9.1 06.vi.2012 Sudar
+#                          - Corrected the ubuntu package names
+#                          - Prevent the *file-not-found* error if the depends.mk file is not needed
+#                          - Delete the build-cli folder as well while doing make clean
+#                          - Added support for compiling .pde files in Arduino 1.0 environment
+#                          - Replaced = with += in CPPFLAGS assignment so that we can set CPPFLAGS per sketch if needed
+#                          - Changed AVRDUDE_CONF so it can be defined in per-project makefile (https://github.com/WizenedEE)
+#                          - Cleaner way to delete the build-cli directory when make clean is invoked
+#                          - The package name in Debian and Ubuntu is arduino-mk (https://github.com/maqifrnswa)
+#
+#
+#         0.9.2 06.vi.2012 Sudar
+#                          - Allow user to choose source files (LOCAL_*_SRCS flags) (https://github.com/Gaftech)
+#                          - Modified 'make size' behavior: using --mcu option and targeting .elf file instead of .hex file.(https://github.com/Gaftech)
+#
+#         0.9.3 13.vi.2012 Sudar
+#                          - Autodetect ARDUINO_DIR, Arduino version (https://github.com/rpavlik/)
+#                          - Categorize libs into user and system (https://github.com/rpavlik/)
+#                          - Dump size at the end of the build (https://github.com/rpavlik/)
+#                          - Lots and lots of improvements (https://github.com/rpavlik/)
+#                          - Changed bytes option for the head shell command, so that it works in Mac as well
+#                          - Auto detect Serial Baud rate from sketch if possible
+#
+#         0.9.3.1 18.viii.2012 jeffkowalski
+#                          - Autodetect ARDUINO_LIBS from includes in LOCAL_SRCS
+#                          - Autodetect ARDUINO_SKETCHBOOK from file
+#                            set by Arduino IDE
+#                          - Autodetect ARDMK_DIR based on location of
+#                            this file
+#                          - Added support for utility directory
+#                            within SYS and USER libraries
+#
+#   	0.9.3.2 10.ix.2012 Sudar
+# 						   - Fixed a typo in README. Issue reported at upstream (https://github.com/mjoldfield/Arduino-Makefile/issues/21)
+#
 #          0.10 17.ix.12   M J Oldfield
 #            - Added installation notes for Fedora (ex Rickard Lindberg).
 #            - Changed size target so that it looks at the ELF object, 
@@ -90,12 +128,37 @@
 #            - Added support for USB_PID/VID used by the Leonardo (ex Dan
 #              Villiom Podlaski Christiansen and Marc Plano-Lesay).
 #
-#         0.11  3.x.2013    Ben Hildred
-#			   - Fixed off by one problem on line numbers
-#			     in error messages.
-#			   - Basic autodetection of libraries.
 #
 #                      
+#   	0.10.1 15.xii.2012 Sudar
+#   		- Merged all changes from Upstream and from https://github.com/rpavlik
+#   		- Allow passing extra flags (https://github.com/rpavlik)
+#   		- Make listing files more useful (https://github.com/rpavlik)
+#   		- Add knowledge of device-specific assembler (https://github.com/rpavlik)
+#   		- Use variables instead of hardcoded commands (https://github.com/rpavlik)
+#   		- Make disasm more helpful (https://github.com/rpavlik)
+#   		- Change .sym output (https://github.com/rpavlik)
+#   		- Provide symbol_sizes and generated_assembly targets. (https://github.com/rpavlik)
+#   		- Be able to silence configuration output (https://github.com/rpavlik)
+#   		- Make everybody depend on the makefile, in case cflags are changed, etc. (https://github.com/rpavlik)
+#   		- Make the makefile error if the arduino port is not present. (https://github.com/rpavlik)
+#
+#   	0.10.2 15.xii.2012 Sudar
+#   		- Added sketch size verification. (https://github.com/fornellas)
+#   		- Show original line number for error messages (https://github.com/WizenedEE)
+#   		- Removed -w from CPPFLAGS to show warnings (https://github.com/gaftech)
+#   		- Changed shebang to use /usr/bin/env (https://github.com/anm)
+#   		- set USB_VID and USB_PID only for leonardo boards(https://github.com/alohr)
+#
+#		0.10.3 16.xii 2012 gaftech
+#           - Enabling creation of EEPROM file (.eep)
+#           - EEPROM upload: eeprom and raw_eeprom targets
+#           - Auto EEPROM upload with isp mode: ISP_EEPROM option.
+#           - Allow custom OBJDIR
+#
+#         0.10  3.x.2013    Ben Hildred
+#			   - Basic autodetection of libraries.
+#
 ########################################################################
 #
 # PATHS YOU NEED TO SET UP
@@ -135,10 +198,15 @@
 # You can either set these up in the Makefile, or put them in your
 # environment e.g. in your .bashrc
 #
+# If you don't specify these, we can try to guess, but that might not work
+# or work the way you want it to.
+#
 # If you don't install the ard-... binaries to /usr/local/bin, but
 # instead copy them to e.g. /home/mjo/arduino.mk/bin then set
 #   ARDML_DIR = /home/mjo/arduino.mk
 #
+# If you'd rather not see the configuration output, define ARDUINO_QUIET.
+#
 ########################################################################
 #
 # DEPENDENCIES
@@ -165,16 +233,28 @@
 # Hopefully these will be self-explanatory but in case they're not:
 #
 #    ARDUINO_LIBS - A list of any libraries used by the sketch (we
-#                   assume these are in
+#                   assume these are in $(ARDUINO_DIR)/hardware/libraries
-#                   $(ARDUINO_DIR)/hardware/libraries 
+#                   or your sketchbook's libraries directory)
 #
 #    ARDUINO_PORT - The port where the Arduino can be found (only needed
-#                   when uploading
+#                   when uploading)
 #
 #    BOARD_TAG    - The ard-parse-boards tag for the board e.g. uno or mega
 #                   'make show_boards' shows a list
 #
-# Once this file has been created the typical workflow is just
+# If you have your additional libraries relative to your source, rather
+# than in your "sketchbook", also set USER_LIB_PATH, like this example:
+#
+#        USER_LIB_PATH := $(realpath ../../libraries)
+#
+# If you've added the Arduino-Makefile repository to your git repo as a
+# submodule (or other similar arrangement), you might have lines like this
+# in your Makefile:
+#
+#        ARDMK_DIR := $(realpath ../../tools/Arduino-Makefile)
+#        include $(ARDMK_DIR)/arduino-mk/Arduino.mk
+#
+# In any case, once this file has been created the typical workflow is just
 #
 #   $ make upload
 #
@@ -194,6 +274,15 @@
 #   make raw_upload  - upload without first resetting
 #   make show_boards - list all the boards defined in boards.txt
 #   make monitor     - connect to the Arduino's serial port
+#   make size        - show the size of the compiled output (relative to
+#                      resources, if you have a patched avr-size)
+#   make disasm      - generate a .lss file in build-cli that contains
+#                      disassembly of the compiled file interspersed
+#                      with your original source code.
+#   make verify_size - Verify that the size of the final file is less than
+#   				   the capacity of the micro controller.
+#   make eeprom      - upload the eep file
+#	make raw_eeprom  - upload the eep file without first resetting
 #
 ########################################################################
 #
@@ -211,46 +300,8 @@
 #    bindkey ^C kill
 #
 # If you want to change the baudrate, just set MONITOR_BAUDRATE. If you
-# don't set it, it defaults to 9600 baud.
+# don't set it, it tries to read from the sketch. If it couldn't read
-#
+# from the sketch, then it defaults to 9600 baud.
-########################################################################
-#
-# PATHS
-#
-# I've reworked the way paths to executables are constructed in this
-# version of Makefile.
-#
-# We need to worry about three different sorts of file:
-#
-# 1. Things which are included in this distribution e.g. ard-parse-boards
-#    => ARDMK_DIR
-#
-# 2. Things which are always in the Arduino distribution e.g. 
-#    boards.txt, libraries, &c.
-#    => ARDUINO_DIR
-#
-# 3. Things which might be bundled with the Arduino distribution, but
-#    might come from the system. Most of the toolchain is like this:
-#    on Linux it's supplied by the system.
-#    => AVR_TOOLS_DIR
-#
-# Having set these three variables, we can work out the rest assuming
-# that things are canonically arranged beneath the directories defined
-# above.
-#
-# So, on the Mac you might want to set:
-#
-#   ARDUINO_DIR   = /Applications/Arduino.app/Contents/Resources/Java
-#   ARDMK_DIR     = /usr/local
-#
-# On Linux, you might prefer:
-#
-#   ARDUINO_DIR   = /usr/share/arduino
-#   ARDMK_DIR     = /usr/local
-#   AVR_TOOLS_DIR = /usr
-#
-#
-#  
 #
 ########################################################################
 #
@@ -271,6 +322,9 @@
 #     ISP_LOW_FUSE       = 0xff
 #     ISP_EXT_FUSE       = 0x01
 #
+# You can specify to also upload the EEPROM file:
+#     ISP_EEPROM   = 1
+#
 # I think the fuses here are fine for uploading to the ATmega168
 # without bootloader.
 #
@@ -281,6 +335,49 @@
 #
 ########################################################################
 
+# Useful functions
+# Returns the first argument (typically a directory), if the file or directory
+# named by concatenating the first and optionally second argument
+# (directory and optional filename) exists
+dir_if_exists = $(if $(wildcard $(1)$(2)),$(1))
+
+# For message printing: pad the right side of the first argument with spaces to
+# the number of bytes indicated by the second argument.
+space_pad_to = $(shell echo $(1) "                                                      " | head -c$(2))
+
+ifndef ARDUINO_QUIET
+    arduino_output = $(info $(1))
+else
+    arduino_output =
+endif
+
+# Call with some text, and a prefix tag if desired (like [AUTODETECTED]),
+show_config_info = $(call arduino_output,- $(call space_pad_to,$(2),20) $(1))
+
+# 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))
+
+# Just a nice simple visual separator
+show_separator = $(call arduino_output,-------------------------)
+
+
+$(call show_separator)
+$(call arduino_output,Arduino.mk Configuration:)
+
+ifndef ARDUINO_DIR
+    AUTO_ARDUINO_DIR := $(firstword \
+        $(call dir_if_exists,/usr/share/arduino) \
+        $(call dir_if_exists,/Applications/Arduino.app/Contents/Resources/Java) )
+    ifdef AUTO_ARDUINO_DIR
+       ARDUINO_DIR = $(AUTO_ARDUINO_DIR)
+       $(call show_config_variable,ARDUINO_DIR,[AUTODETECTED])
+    endif
+
+else
+    $(call show_config_variable,ARDUINO_DIR)
+endif
+
 ########################################################################
 #
 # Default TARGET to cwd (ex Daniele Vergini)
@@ -289,11 +386,21 @@ TARGET  = $(notdir $(CURDIR))
 endif
 
 ########################################################################
-
-#
 # Arduino version number
 ifndef ARDUINO_VERSION
+
+    # Remove all the decimals, and right-pad with zeros, and finally grab the first 3 bytes.
+    # Works for 1.0 and 1.0.1
+    AUTO_ARDUINO_VERSION := $(shell cat $(ARDUINO_DIR)/lib/version.txt | sed -e 's/[.]//g' -e 's/$$/0000/' | head -c3)
+    ifdef AUTO_ARDUINO_VERSION
+        ARDUINO_VERSION = $(AUTO_ARDUINO_VERSION)
+        $(call show_config_variable,ARDUINO_VERSION,[AUTODETECTED])
+    else
         ARDUINO_VERSION = 100
+        $(call show_config_variable,ARDUINO_VERSION,[DEFAULT])
+    endif
+else
+    $(call show_config_variable,ARDUINO_VERSION)
 endif
 
 ########################################################################
@@ -302,18 +409,31 @@ endif
 ifdef ARDUINO_DIR
 
     ifndef AVR_TOOLS_DIR
-AVR_TOOLS_DIR     = $(ARDUINO_DIR)/hardware/tools/avr
-# The avrdude bundled with Arduino can't find its config
-ifndef AVRDUDE_CONF
-AVRDUDE_CONF	  = $(AVR_TOOLS_DIR)/etc/avrdude.conf
-endif
-endif
 
-ifndef AVR_TOOLS_PATH
+        BUNDLED_AVR_TOOLS_DIR := $(call dir_if_exists,$(ARDUINO_DIR)/hardware/tools/avr)
-AVR_TOOLS_PATH    = $(AVR_TOOLS_DIR)/bin
+        ifdef BUNDLED_AVR_TOOLS_DIR
-endif
+            AVR_TOOLS_DIR     = $(BUNDLED_AVR_TOOLS_DIR)
+            # The avrdude bundled with Arduino can't find it's config
+            AVRDUDE_CONF	  = $(AVR_TOOLS_DIR)/etc/avrdude.conf
+            $(call show_config_variable,AVR_TOOLS_DIR,[BUNDLED],(in Arduino distribution))
+
+        else
+
+            SYSTEMPATH_AVR_TOOLS_DIR := $(call dir_if_exists,$(abspath $(dir $(shell which avr-gcc))/..))
+            ifdef SYSTEMPATH_AVR_TOOLS_DIR
+                AVR_TOOLS_DIR     = $(SYSTEMPATH_AVR_TOOLS_DIR)
+                $(call show_config_variable,AVR_TOOLS_DIR,[AUTODETECTED],(found in $$PATH))
+            endif # SYSTEMPATH_AVR_TOOLS_DIR
+
+        endif # BUNDLED_AVR_TOOLS_DIR
+
+    else
+
+        $(call show_config_variable,AVR_TOOLS_DIR)
+    endif #ndef AVR_TOOLS_DIR
 
     ARDUINO_LIB_PATH  = $(ARDUINO_DIR)/libraries
+    $(call show_config_variable,ARDUINO_LIB_PATH,[COMPUTED],(from ARDUINO_DIR))
     ARDUINO_CORE_PATH = $(ARDUINO_DIR)/hardware/arduino/cores/arduino
     ARDUINO_VAR_PATH  = $(ARDUINO_DIR)/hardware/arduino/variants
 
@@ -323,30 +443,69 @@ echo $(error "ARDUINO_DIR is not defined")
 
 endif
 
+ifdef AVR_TOOLS_DIR
+
+    ifndef AVR_TOOLS_PATH
+        AVR_TOOLS_PATH    = $(AVR_TOOLS_DIR)/bin
+    endif
+
+endif
+
 ########################################################################
 # Makefile distribution path
 #
-ifdef ARDMK_DIR
+ifndef ARDMK_DIR
+    # presume it's a level above the path to our own file
+    ARDMK_DIR := $(realpath $(dir $(realpath $(lastword $(MAKEFILE_LIST))))/..)
+    $(call show_config_variable,ARDMK_DIR,[COMPUTED],(relative to $(notdir $(lastword $(MAKEFILE_LIST)))))
+else
+    $(call show_config_variable,ARDMK_DIR,[USER])
+endif
 
+ifdef ARDMK_DIR
     ifndef ARDMK_PATH
         ARDMK_PATH = $(ARDMK_DIR)/bin
-endif
+        $(call show_config_variable,ARDMK_PATH,[COMPUTED],(relative to ARDMK_DIR))
-
     else
-
+        $(call show_config_variable,ARDMK_PATH)
-echo $(error "ARDMK_DIR is not defined")
-
     endif
+else
+    echo $(error "ARDMK_DIR is not defined")
+endif
+
 
 ########################################################################
 # Miscellanea
 #
 ifndef ARDUINO_SKETCHBOOK
+    ifneq ($(wildcard $(HOME)/.arduino/preferences.txt),)
+	ARDUINO_SKETCHBOOK = $(shell grep --max-count=1 --regexp="sketchbook.path=" \
+                                          $(HOME)/.arduino/preferences.txt | \
+                                     sed -e 's/sketchbook.path=//' )
+    endif
+
+	# on mac
+    ifneq ($(wildcard $(HOME)/Library/Arduino/preferences.txt),)
+	ARDUINO_SKETCHBOOK = $(shell grep --max-count=1 --regexp="sketchbook.path=" \
+                                          $(HOME)/Library/Arduino/preferences.txt | \
+                                     sed -e 's/sketchbook.path=//' )
+    endif
+
+    ifneq ($(ARDUINO_SKETCHBOOK),)
+        $(call show_config_variable,ARDUINO_SKETCHBOOK,[AUTODETECTED],(in arduino preferences file))
+    else
         ARDUINO_SKETCHBOOK = $(HOME)/sketchbook
+        $(call show_config_variable,ARDUINO_SKETCHBOOK,[DEFAULT])
+    endif
+else
+    $(call show_config_variable,ARDUINO_SKETCHBOOK)
 endif
 
 ifndef USER_LIB_PATH
     USER_LIB_PATH = $(ARDUINO_SKETCHBOOK)/libraries
+    $(call show_config_variable,USER_LIB_PATH,[DEFAULT],(in user sketchbook))
+else
+    $(call show_config_variable,USER_LIB_PATH)
 endif
 
 ########################################################################
@@ -357,7 +516,18 @@ endif
 # for more information (search for 'character special device').
 #
 ifndef MONITOR_BAUDRATE
+	#This works only in linux. TODO: Port it to MAC OS also
+	SPEED = $(shell grep --max-count=1 --regexp="Serial.begin" $$(ls -1 *.ino) | sed -e 's/\t//g' -e 's/\/\/.*$$//g' -e 's/(/\t/' -e 's/)/\t/' | awk -F '\t' '{print $$2}' )
+	MONITOR_BAUDRATE = $(findstring $(SPEED),300 1200 2400 4800 9600 14400 19200 28800 38400 57600 115200)
+
+	ifeq ($(MONITOR_BAUDRATE),)
 		MONITOR_BAUDRATE = 9600
+       $(call show_config_variable,MONITOR_BAUDRATE,[ASSUMED])
+	else
+       $(call show_config_variable,MONITOR_BAUDRATE,[DETECTED], (in sketch))
+	endif
+else
+    $(call show_config_variable,MONITOR_BAUDRATE, [SPECIFIED])
 endif
 
 ifndef MONITOR_CMD
@@ -375,6 +545,9 @@ endif
 #
 ifndef BOARD_TAG
     BOARD_TAG   = uno
+    $(call show_config_variable,BOARD_TAG,[DEFAULT])
+else
+    $(call show_config_variable,BOARD_TAG)
 endif
 
 ifndef BOARDS_TXT
@@ -407,6 +580,7 @@ ifndef F_CPU
     F_CPU = $(shell $(PARSE_BOARD_CMD) $(BOARD_TAG) build.f_cpu)
 endif
 
+ifeq ($(VARIANT),leonardo) 
 # USB IDs for the Leonardo
 ifndef USB_VID
 USB_VID = $(shell $(PARSE_BOARD_CMD) $(BOARD_TAG) build.vid)
@@ -415,6 +589,7 @@ endif
 ifndef USB_PID
 USB_PID = $(shell $(PARSE_BOARD_CMD) $(BOARD_TAG) build.pid)
 endif
+endif
 
 # normal programming info
 ifndef AVRDUDE_ARD_PROGRAMMER
@@ -451,15 +626,22 @@ ifndef OBJDIR
 OBJDIR  	  = build-$(BOARD_TAG)
 endif
 
+ifndef HEX_MAXIMUM_SIZE
+HEX_MAXIMUM_SIZE  = $(shell $(PARSE_BOARD_CMD) $(BOARD_TAG) upload.maximum_size)
+endif
+
 ########################################################################
 # Local sources
 #
-LOCAL_C_SRCS    = $(wildcard *.c)
+LOCAL_C_SRCS    ?= $(wildcard *.c)
-LOCAL_CPP_SRCS  = $(wildcard *.cpp)
+LOCAL_CPP_SRCS  ?= $(wildcard *.cpp)
-LOCAL_CC_SRCS   = $(wildcard *.cc)
+LOCAL_CC_SRCS   ?= $(wildcard *.cc)
-LOCAL_PDE_SRCS  = $(wildcard *.pde)
+LOCAL_PDE_SRCS  ?= $(wildcard *.pde)
-LOCAL_INO_SRCS  = $(wildcard *.ino)
+LOCAL_INO_SRCS  ?= $(wildcard *.ino)
-LOCAL_AS_SRCS   = $(wildcard *.S)
+LOCAL_AS_SRCS   ?= $(wildcard *.S)
+LOCAL_SRCS      = $(LOCAL_C_SRCS)   $(LOCAL_CPP_SRCS) \
+		$(LOCAL_CC_SRCS)   $(LOCAL_PDE_SRCS) \
+		$(LOCAL_INO_SRCS) $(LOCAL_AS_SRCS)
 LOCAL_OBJ_FILES = $(LOCAL_C_SRCS:.c=.o)   $(LOCAL_CPP_SRCS:.cpp=.o) \
 		$(LOCAL_CC_SRCS:.cc=.o)   $(LOCAL_PDE_SRCS:.pde=.o) \
 		$(LOCAL_INO_SRCS:.ino=.o) $(LOCAL_AS_SRCS:.S=.o)
@@ -476,14 +658,27 @@ CORE_CPP_SRCS   = $(wildcard $(ARDUINO_CORE_PATH)/*.cpp)
 
         ifneq ($(strip $(NO_CORE_MAIN_CPP)),)
             CORE_CPP_SRCS := $(filter-out %main.cpp, $(CORE_CPP_SRCS))
+            $(call show_config_info,NO_CORE_MAIN_CPP set so core library will not include main.cpp,[MANUAL])
         endif
 
         CORE_OBJ_FILES  = $(CORE_C_SRCS:.c=.o) $(CORE_CPP_SRCS:.cpp=.o)
         CORE_OBJS       = $(patsubst $(ARDUINO_CORE_PATH)/%,  \
 			        $(OBJDIR)/%,$(CORE_OBJ_FILES))
     endif
+else
+    $(call show_config_info,NO_CORE set so core library will not be built,[MANUAL])
 endif
 
+########################################################################
+# Determine ARDUINO_LIBS automatically
+#
+ifndef ARDUINO_LIBS
+    # automatically determine included libraries
+    ARDUINO_LIBS += $(filter $(notdir $(wildcard $(ARDUINO_DIR)/libraries/*)), \
+        $(shell sed -ne "s/^ *\# *include *[<\"]\(.*\)\.h[>\"]/\1/p" $(LOCAL_SRCS)))
+    ARDUINO_LIBS += $(filter $(notdir $(wildcard $(ARDUINO_SKETCHBOOK)/libraries/*)), \
+        $(shell sed -ne "s/^ *\# *include *[<\"]\(.*\)\.h[>\"]/\1/p" $(LOCAL_SRCS)))
+endif
 
 ########################################################################
 # Rules for making stuff
@@ -492,6 +687,7 @@ endif
 # The name of the main targets
 TARGET_HEX = $(OBJDIR)/$(TARGET).hex
 TARGET_ELF = $(OBJDIR)/$(TARGET).elf
+TARGET_EEP = $(OBJDIR)/$(TARGET).eep
 TARGETS    = $(OBJDIR)/$(TARGET).*
 CORE_LIB   = $(OBJDIR)/libcore.a
 
@@ -506,19 +702,33 @@ endif
 # Names of executables
 CC      = $(AVR_TOOLS_PATH)/avr-gcc
 CXX     = $(AVR_TOOLS_PATH)/avr-g++
+AS      = $(AVR_TOOLS_PATH)/avr-as
 OBJCOPY = $(AVR_TOOLS_PATH)/avr-objcopy
 OBJDUMP = $(AVR_TOOLS_PATH)/avr-objdump
 AR      = $(AVR_TOOLS_PATH)/avr-ar
 SIZE    = $(AVR_TOOLS_PATH)/avr-size
 NM      = $(AVR_TOOLS_PATH)/avr-nm
-REMOVE  = rm -f
+REMOVE  = rm -rf
 MV      = mv -f
 CAT     = cat
 ECHO    = echo
 
 # General arguments
-SYS_LIBS      = $(patsubst %,$(ARDUINO_LIB_PATH)/%,$(ARDUINO_LIBS))
+USER_LIBS     = $(wildcard $(patsubst %,$(USER_LIB_PATH)/%,$(ARDUINO_LIBS)))
-USER_LIBS     = $(patsubst %,$(USER_LIB_PATH)/%,$(ARDUINO_LIBS))
+USER_LIB_NAMES= $(patsubst $(USER_LIB_PATH)/%,%,$(USER_LIBS))
+
+# Let user libraries override system ones.
+SYS_LIBS      = $(wildcard $(patsubst %,$(ARDUINO_LIB_PATH)/%,$(filter-out $(USER_LIB_NAMES),$(ARDUINO_LIBS))))
+SYS_LIB_NAMES = $(patsubst $(ARDUINO_LIB_PATH)/%,%,$(SYS_LIBS))
+
+# Error here if any are missing.
+LIBS_NOT_FOUND = $(filter-out $(USER_LIB_NAMES) $(SYS_LIB_NAMES),$(ARDUINO_LIBS))
+ifneq (,$(strip $(LIBS_NOT_FOUND)))
+    $(error The following libraries specified in ARDUINO_LIBS could not be found (searched USER_LIB_PATH and ARDUINO_LIB_PATH): $(LIBS_NOT_FOUND))
+endif
+
+SYS_LIBS     := $(wildcard $(SYS_LIBS) $(addsuffix /utility,$(SYS_LIBS)))
+USER_LIBS    := $(wildcard $(USER_LIBS) $(addsuffix /utility,$(USER_LIBS)))
 SYS_INCLUDES  = $(patsubst %,-I%,$(SYS_LIBS))
 USER_INCLUDES = $(patsubst %,-I%,$(USER_LIBS))
 LIB_C_SRCS    = $(wildcard $(patsubst %,%/*.c,$(SYS_LIBS)))
@@ -530,19 +740,50 @@ LIB_OBJS      = $(patsubst $(ARDUINO_LIB_PATH)/%.c,$(OBJDIR)/libs/%.o,$(LIB_C_SR
 USER_LIB_OBJS = $(patsubst $(USER_LIB_PATH)/%.cpp,$(OBJDIR)/libs/%.o,$(USER_LIB_CPP_SRCS)) \
 		$(patsubst $(USER_LIB_PATH)/%.c,$(OBJDIR)/libs/%.o,$(USER_LIB_C_SRCS))
 
-CPPFLAGS      = -mmcu=$(MCU) -DF_CPU=$(F_CPU) -DARDUINO=$(ARDUINO_VERSION) \
+# Using += instead of =, so that CPPFLAGS can be set per sketch level
+CPPFLAGS      += -mmcu=$(MCU) -DF_CPU=$(F_CPU) -DARDUINO=$(ARDUINO_VERSION) \
 			-I. -I$(ARDUINO_CORE_PATH) -I$(ARDUINO_VAR_PATH)/$(VARIANT) \
-			$(SYS_INCLUDES) $(USER_INCLUDES) -g -Os -w -Wall \
+			$(SYS_INCLUDES) $(USER_INCLUDES) -g -Os -Wall \
 			-DUSB_VID=$(USB_VID) -DUSB_PID=$(USB_PID) \
 			-ffunction-sections -fdata-sections
+CFLAGS        += -std=gnu99 $(EXTRA_FLAGS) $(EXTRA_CFLAGS)
+CXXFLAGS      += -fno-exceptions $(EXTRA_FLAGS) $(EXTRA_CXXFLAGS)
+ASFLAGS       += -mmcu=$(MCU) -I. -x assembler-with-cpp
+LDFLAGS       += -mmcu=$(MCU) -Wl,--gc-sections -Os $(EXTRA_FLAGS) $(EXTRA_CXXFLAGS)
+SIZEFLAGS     ?= --mcu=$(MCU) -C
 
-CFLAGS        = -std=gnu99
+# Returns the Arduino port (first wildcard expansion) if it exists, otherwise it errors.
-CXXFLAGS      = -fno-exceptions
+get_arduino_port = $(if $(wildcard $(ARDUINO_PORT)),$(firstword $(wildcard $(ARDUINO_PORT))),$(error Arduino port $(ARDUINO_PORT) not found!))
-ASFLAGS       = -mmcu=$(MCU) -I. -x assembler-with-cpp
+
-LDFLAGS       = -mmcu=$(MCU) -Wl,--gc-sections -Os
+# Command for avr_size: do $(call avr_size,elffile,hexfile)
+ifneq (,$(findstring AVR,$(shell $(SIZE) --help)))
+    # We have a patched version of binutils that mentions AVR - pass the MCU
+    # and the elf to get nice output.
+    #avr_size = $(SIZE) --mcu=$(MCU) --format=avr $(1)
+    avr_size = $(SIZE) $(SIZEFLAGS) --format=avr $(1)
+    $(call show_config_info,Size utility: AVR-aware for enhanced output,[AUTODETECTED])
+else
+    # We have a plain-old binutils version - just give it the hex.
+    avr_size = $(SIZE) $(2)
+    $(call show_config_info,Size utility: Basic (not AVR-aware),[AUTODETECTED])
+endif
+
+
+ifneq (,$(strip $(ARDUINO_LIBS)))
+    $(call arduino_output,-)
+    $(call show_config_info,ARDUINO_LIBS =)
+endif
+ifneq (,$(strip $(USER_LIB_NAMES)))
+    $(foreach lib,$(USER_LIB_NAMES),$(call show_config_info,  $(lib),[USER]))
+endif
+
+ifneq (,$(strip $(SYS_LIB_NAMES)))
+    $(foreach lib,$(SYS_LIB_NAMES),$(call show_config_info,  $(lib),[SYSTEM]))
+endif
+
+# end of config output
+$(call show_separator)
 
-# Expand and pick the first port
-ARD_PORT      = $(firstword $(wildcard $(ARDUINO_PORT)))
 
 # Implicit rules for building everything (needed to get everything in
 # the right directory)
@@ -572,36 +813,39 @@ $(OBJDIR)/libs/%.o: $(USER_LIB_PATH)/%.c
 # normal local sources
 # .o rules are for objects, .d for dependency tracking
 # there seems to be an awful lot of duplication here!!!
-$(OBJDIR)/%.o: %.c
+COMMON_DEPS := Makefile
+$(OBJDIR)/%.o: %.c $(COMMON_DEPS)
 	$(CC) -c $(CPPFLAGS) $(CFLAGS) $< -o $@
 
-$(OBJDIR)/%.o: %.cc
+$(OBJDIR)/%.o: %.cc $(COMMON_DEPS)
 	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $< -o $@
 
-$(OBJDIR)/%.o: %.cpp
+$(OBJDIR)/%.o: %.cpp $(COMMON_DEPS)
 	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $< -o $@
 
-$(OBJDIR)/%.o: %.S
+$(OBJDIR)/%.o: %.S $(COMMON_DEPS)
 	$(CC) -c $(CPPFLAGS) $(ASFLAGS) $< -o $@
 
-$(OBJDIR)/%.o: %.s
+$(OBJDIR)/%.o: %.s $(COMMON_DEPS)
 	$(CC) -c $(CPPFLAGS) $(ASFLAGS) $< -o $@
 
-$(OBJDIR)/%.d: %.c
+$(OBJDIR)/%.d: %.c $(COMMON_DEPS)
 	$(CC) -MM $(CPPFLAGS) $(CFLAGS) $< -MF $@ -MT $(@:.d=.o)
 
-$(OBJDIR)/%.d: %.cc
+$(OBJDIR)/%.d: %.cc $(COMMON_DEPS)
 	$(CXX) -MM $(CPPFLAGS) $(CXXFLAGS) $< -MF $@ -MT $(@:.d=.o)
 
-$(OBJDIR)/%.d: %.cpp
+$(OBJDIR)/%.d: %.cpp $(COMMON_DEPS)
 	$(CXX) -MM $(CPPFLAGS) $(CXXFLAGS) $< -MF $@ -MT $(@:.d=.o)
 
-$(OBJDIR)/%.d: %.S
+$(OBJDIR)/%.d: %.S $(COMMON_DEPS)
 	$(CC) -MM $(CPPFLAGS) $(ASFLAGS) $< -MF $@ -MT $(@:.d=.o)
 
-$(OBJDIR)/%.d: %.s
+$(OBJDIR)/%.d: %.s $(COMMON_DEPS)
 	$(CC) -MM $(CPPFLAGS) $(ASFLAGS) $< -MF $@ -MT $(@:.d=.o)
 
+#backward compatibility for .pde files
+# We should check for Arduino version, if the file is .pde because a .pde file might be used in Arduino 1.0
 # the pde -> cpp -> o file
 $(OBJDIR)/%.cpp: %.pde
 	$(ECHO) '#include "WProgram.h"' > $@
@@ -614,32 +858,42 @@ $(OBJDIR)/%.cpp: %.ino
 	$(ECHO) '#line 1' \"$<\" >> $@
 	$(CAT)  $< >> $@
 
-$(OBJDIR)/%.o: $(OBJDIR)/%.cpp
+$(OBJDIR)/%.o: $(OBJDIR)/%.cpp $(COMMON_DEPS)
 	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $< -o $@
 
-$(OBJDIR)/%.d: $(OBJDIR)/%.cpp
+$(OBJDIR)/%.d: $(OBJDIR)/%.cpp $(COMMON_DEPS)
 	$(CXX) -MM $(CPPFLAGS) $(CXXFLAGS) $< -MF $@ -MT $(@:.d=.o)
 
+# generated assembly
+$(OBJDIR)/%.s: $(OBJDIR)/%.cpp $(COMMON_DEPS)
+	$(CXX) -S -fverbose-asm $(CPPFLAGS) $(CXXFLAGS) $< -o $@
+
+#$(OBJDIR)/%.lst: $(OBJDIR)/%.s
+#	$(AS) -mmcu=$(MCU) -alhnd $< > $@
+
 # core files
-$(OBJDIR)/%.o: $(ARDUINO_CORE_PATH)/%.c
+$(OBJDIR)/%.o: $(ARDUINO_CORE_PATH)/%.c $(COMMON_DEPS)
 	$(CC) -c $(CPPFLAGS) $(CFLAGS) $< -o $@
 
-$(OBJDIR)/%.o: $(ARDUINO_CORE_PATH)/%.cpp
+$(OBJDIR)/%.o: $(ARDUINO_CORE_PATH)/%.cpp $(COMMON_DEPS)
 	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $< -o $@
 
 # various object conversions
-$(OBJDIR)/%.hex: $(OBJDIR)/%.elf
+$(OBJDIR)/%.hex: $(OBJDIR)/%.elf $(COMMON_DEPS)
 	$(OBJCOPY) -O ihex -R .eeprom $< $@
+	@$(ECHO)
+	@$(ECHO)
+	$(call avr_size,$<,$@)
 
-$(OBJDIR)/%.eep: $(OBJDIR)/%.elf
+$(OBJDIR)/%.eep: $(OBJDIR)/%.elf $(COMMON_DEPS)
 	-$(OBJCOPY) -j .eeprom --set-section-flags=.eeprom="alloc,load" \
 		--change-section-lma .eeprom=0 -O ihex $< $@
 
-$(OBJDIR)/%.lss: $(OBJDIR)/%.elf
+$(OBJDIR)/%.lss: $(OBJDIR)/%.elf $(COMMON_DEPS)
-	$(OBJDUMP) -h -S $< > $@
+	$(OBJDUMP) -h --source --demangle --wide $< > $@
 
-$(OBJDIR)/%.sym: $(OBJDIR)/%.elf
+$(OBJDIR)/%.sym: $(OBJDIR)/%.elf $(COMMON_DEPS)
-	$(NM) -n $< > $@
+	$(NM) --size-sort --demangle --reverse-sort --line-numbers $< > $@
 
 ########################################################################
 #
@@ -649,26 +903,49 @@ ifndef AVRDUDE
     AVRDUDE          = $(AVR_TOOLS_PATH)/avrdude
 endif
 
+ifndef AVRDUDE_CONF
+ifndef AVR_TOOLS_DIR
+# The avrdude bundled with Arduino can't find its config
+AVRDUDE_CONF	  = $(AVR_TOOLS_DIR)/etc/avrdude.conf
+endif
+# If avrdude is installed separately, it can find its own config flie
+endif
+
 AVRDUDE_COM_OPTS = -q -V -p $(MCU)
 ifdef AVRDUDE_CONF
     AVRDUDE_COM_OPTS += -C $(AVRDUDE_CONF)
 endif
 
-AVRDUDE_ARD_OPTS = -c $(AVRDUDE_ARD_PROGRAMMER) -b $(AVRDUDE_ARD_BAUDRATE) -P $(ARD_PORT)
+AVRDUDE_ARD_OPTS = -c $(AVRDUDE_ARD_PROGRAMMER) -b $(AVRDUDE_ARD_BAUDRATE) -P $(call get_arduino_port)
 
 ifndef ISP_PROG
     ISP_PROG	   = -c stk500v2
 endif
 
+# usb seems to be a reasonable default, at least on linux
+ifndef ISP_PORT
+	ISP_PORT       = usb
+endif
+
 AVRDUDE_ISP_OPTS = -P $(ISP_PORT) $(ISP_PROG)
 
+ifndef ISP_EEPROM
+	ISP_EEPROM  = 0
+endif
+
+AVRDUDE_UPLOAD_HEX = -U flash:w:$(TARGET_HEX):i
+AVRDUDE_UPLOAD_EEP = -U eeprom:w:$(TARGET_EEP):i
+AVRDUDE_ISPLOAD_OPTS = $(AVRDUDE_UPLOAD_HEX)
+ifneq ($(ISP_EEPROM), 0)
+	AVRDUDE_ISPLOAD_OPTS += $(AVRDUDE_UPLOAD_EEP)
+endif
 
 ########################################################################
 #
 # Explicit targets start here
 #
 
-all: 		$(OBJDIR) $(TARGET_HEX)
+all: 		$(OBJDIR) $(TARGET_EEP) $(TARGET_HEX) verify_size
 
 $(OBJDIR):
 		mkdir $(OBJDIR)
@@ -686,14 +963,20 @@ $(LIB_DEP_FILE):	$(OBJDIR) *.ino *.cpp *.c *.h *.pde
 $(DEP_FILE):	$(OBJDIR) $(DEPS)
 		cat $(DEPS) > $(DEP_FILE)
 
-upload:		reset raw_upload
+upload:		raw_upload
 
-raw_upload:	$(TARGET_HEX)
+raw_upload:	reset $(TARGET_HEX) verify_size
 		$(AVRDUDE) $(AVRDUDE_COM_OPTS) $(AVRDUDE_ARD_OPTS) \
-			-U flash:w:$(TARGET_HEX):i
+			$(AVRDUDE_UPLOAD_HEX)
+
+eeprom:		reset raw_eeprom
+
+raw_eeprom:	$(TARGET_EEP) $(TARGET_HEX)
+		$(AVRDUDE) $(AVRDUDE_COM_OPTS) $(AVRDUDE_ARD_OPTS) \
+			$(AVRDUDE_UPLOAD_EEP)
 
 reset:
-		$(RESET_CMD) $(ARD_PORT)
+		$(RESET_CMD) $(call get_arduino_port)
 
 # stty on MacOS likes -F, but on Debian it likes -f redirecting
 # stdin/out appears to work but generates a spurious error on MacOS at
@@ -702,36 +985,54 @@ reset_stty:
 		for STTYF in 'stty -F' 'stty --file' 'stty -f' 'stty <' ; \
 		  do $$STTYF /dev/tty >/dev/null 2>/dev/null && break ; \
 		done ;\
-		$$STTYF $(ARD_PORT)  hupcl ;\
+		$$STTYF $(call get_arduino_port)  hupcl ;\
 		(sleep 0.1 || sleep 1)     ;\
-		$$STTYF $(ARD_PORT) -hupcl 
+		$$STTYF $(call get_arduino_port) -hupcl
 
-ispload:	$(TARGET_HEX)
+ispload:	$(TARGET_EEP) $(TARGET_HEX) verify_size
 		$(AVRDUDE) $(AVRDUDE_COM_OPTS) $(AVRDUDE_ISP_OPTS) -e \
 			-U lock:w:$(ISP_LOCK_FUSE_PRE):m \
 			-U hfuse:w:$(ISP_HIGH_FUSE):m \
 			-U lfuse:w:$(ISP_LOW_FUSE):m \
 			-U efuse:w:$(ISP_EXT_FUSE):m
 		$(AVRDUDE) $(AVRDUDE_COM_OPTS) $(AVRDUDE_ISP_OPTS) -D \
-			-U flash:w:$(TARGET_HEX):i
+			$(AVRDUDE_ISPLOAD_OPTS)
 		$(AVRDUDE) $(AVRDUDE_COM_OPTS) $(AVRDUDE_ISP_OPTS) \
 			-U lock:w:$(ISP_LOCK_FUSE_POST):m
 
 clean:
-		$(REMOVE) $(LOCAL_OBJS) $(CORE_OBJS) $(LIB_OBJS) $(CORE_LIB) $(TARGETS) $(DEP_FILE) $(DEPS) $(USER_LIB_OBJS)
+		$(REMOVE) $(LOCAL_OBJS) $(CORE_OBJS) $(LIB_OBJS) $(CORE_LIB) $(TARGETS) $(DEP_FILE) $(DEPS) $(USER_LIB_OBJS) ${OBJDIR}
 
 depends:	$(DEPS)
-		cat $(DEPS) > $(DEP_FILE)
+		$(CAT) $(DEPS) > $(DEP_FILE)
 
-size:		$(OBJDIR) $(TARGET_ELF)
+size:		$(OBJDIR) $(TARGET_HEX)
-		$(SIZE) -C --mcu=$(MCU) $(TARGET_ELF)
+		$(call avr_size,$(TARGET_ELF),$(TARGET_HEX))
 
 show_boards:
 		$(PARSE_BOARD_CMD) --boards
 
 monitor:
-		$(MONITOR_CMD) $(ARD_PORT) $(MONITOR_BAUDRATE)
+		$(MONITOR_CMD) $(call get_arduino_port) $(MONITOR_BAUDRATE)
 
-.PHONY:	all clean depends upload raw_upload reset reset_stty size show_boards monitor
+disasm: $(OBJDIR)/$(TARGET).lss
+	@$(ECHO) The compiled ELF file has been disassembled to $(OBJDIR)/$(TARGET).lss
 
-include $(DEP_FILE)
+symbol_sizes: $(OBJDIR)/$(TARGET).sym
+	@$(ECHO) A symbol listing sorted by their size have been dumped to $(OBJDIR)/$(TARGET).sym
+
+$(TARGET_HEX).sizeok: $(TARGET_HEX)
+		$(ARDMK_PATH)/ard-verify-size $(TARGET_HEX) $(HEX_MAXIMUM_SIZE)
+		touch $@
+
+verify_size:	$(TARGET_HEX) $(TARGET_HEX).sizeok
+
+generated_assembly: $(OBJDIR)/$(TARGET).s
+	@$(ECHO) Compiler-generated assembly for the main input source has been dumped to $(OBJDIR)/$(TARGET).s
+
+.PHONY:	all upload raw_upload reset reset_stty ispload clean depends size show_boards monitor disasm symbol_sizes generated_assembly verify_size
+
+# added - in the beginning, so that we don't get an error if the file is not present
+ifneq ($(MAKECMDGOALS),clean)
+-include $(DEP_FILE)
+endif

bin/ard-parse-boards

@@ -1,4 +1,4 @@
-#! /usr/bin/perl
+#! /usr/bin/env perl
 
 use strict;
 use warnings;
@@ -12,6 +12,11 @@ my %Opt =
     boards_txt => '/Applications/Arduino.app/Contents/Resources/Java/hardware/arduino/boards.txt',
    );
 
+# if the ARDUINO_DIR is defined, then use it
+if (defined $ENV{'ARDUINO_DIR'}) {
+    $Opt{boards_txt} = "$ENV{'ARDUINO_DIR'}/hardware/arduino/boards.txt";
+}
+
 GetOptions(\%Opt,
 	   "boards_txt=s", # filename of the boards.txt file
 	   "find!",        # search for data

bin/ard-reset-arduino

@@ -1,4 +1,4 @@
-#! /usr/bin/perl
+#! /usr/bin/env perl
 
 use strict;
 use warnings;

bin/ard-verify-size

@@ -0,0 +1,9 @@
+#!/bin/bash
+TARGET_HEX="$1"
+MAX_SIZE="$2"
+HEX_SIZE="$(cut -c12- < $TARGET_HEX | tr -d \\n | tr -d \\r | wc -c | awk '{print $1/2}')"
+if [ $HEX_SIZE -gt $MAX_SIZE ]
+then
+  echo "Sketch size is ${HEX_SIZE} bytes and maximum allowed is ${MAX_SIZE} bytes; see http://www.arduino.cc/en/Guide/Troubleshooting#size for tips on reducing it." 1>&2
+  exit 1
+fi