Merge pull request #1 from Lekensteyn/fixes

Arduino SDK 1.6.3 fixes; allow direct inclusion of Makefile

Makefile

@@ -65,15 +65,15 @@ OSNAME =	$(shell uname)
 
 # Name of the program and source .ino (previously .pde) file.
 # No extension here (e.g. PROJECT = Blink).
-PROJECT =	Blink
+PROJECT ?=	Blink
 
 # Project version. Only used for packing the source into an archive.
-VERSION =	1.0
+VERSION ?=	1.0
 
 # Arduino model. E.g. atmega328, mega2560, uno.
 # Valid model names can be found in $(ARDUINO_DIR)/hardware/arduino/avr/boards.txt
 # This must be set to a valid model name.
-ARDUINO_MODEL = micro
+ARDUINO_MODEL ?= micro
 #ARDUINO_MODEL = uno
 #ARDUINO_MODEL = nano328  # Is set to a 168 CPU
 #ARDUINO_MODEL = atmega2560
@@ -87,36 +87,40 @@ ARDUINO_MODEL = micro
 # Directory containing the pins_arduino.h file.
 #ARDUINO_VARIANT=$(ARDUINO_DIR)/hardware/arduino/avr/variants/micro
 
+# MCU architecture.
+# Currently hardcoded to avr (sam, etc. are unsupported.)
+ARCH ?= avr
+
 # USB port the Arduino board is connected to.
 # Linux: e.g. /dev/ttyUSB0, or /dev/ttyACM0 for the Uno.
 # BSD:   e.g. /dev/cuaU0
 # It is a good idea to use udev rules to create a device name that is constant,
 # based on the serial number etc. of the USB device.
 #PORT =		/dev/ttyACM1
-PORT =		/dev/serial/by-id/*Arduino*
+PORT ?=		/dev/serial/by-id/*Arduino*
 
 # Arduino version (e.g. 23 for 0023, or 105 for 1.0.5).
 # Make sure this matches ARDUINO_DIR below!
 #ARDUINO = 	23
-ARDUINO = 	161
+ARDUINO ?= 	161
 
 # Location of the official Arduino IDE.
 # E.g. /usr/local/arduino, or $(HOME)/arduino
 # Make sure this matches ARDUINO above!
 #ARDUINO_DIR =	/usr/local/pckg/arduino/arduino-0023
-ARDUINO_DIR =	/usr/share/arduino
+ARDUINO_DIR ?=	/usr/share/arduino
 
 # Arduino 0.x based on 328P now need the new programmer protocol.
-# Arudino 1.6+ uses the avr109 programmer by default
-ifeq ($(AVRDUDE_PROGRAMMER),)
-AVRDUDE_PROGRAMMER = avr109
-endif
+# Arduino 1.6+ uses the avr109 programmer by default
+# If unset, a default is chosen based on ARDUINO_MODEL and ARDUINO_FAMILY.
+#AVRDUDE_PROGRAMMER = avr109
 
 # Arduino core sources.
-ARDUINO_CORE =	$(ARDUINO_DIR)/hardware/arduino/avr/cores/arduino
+#ARDUINO_CORE ?=	$(ARDUINO_DIR)/hardware/arduino/avr/cores/arduino
 
 # Standard Arduino libraries used, e.g. EEPROM, LiquidCrystal.
 # Give the name of the directory containing the library source files.
+ifndef ARDUINO_LIBS
 ARDUINO_LIBS =
 ARDUINO_LIBS += EEPROM
 ARDUINO_LIBS += Wire
@@ -124,11 +128,12 @@ ARDUINO_LIBS += SPI
 ifdef SD  # Comment out this condition to always use the SD library.
 ARDUINO_LIBS += SD
 endif
+endif
 
 # User libraries (in ~/sketchbook/libraries/).
 # Give the name of the directory containing the library source files.
-USER_LIBDIR =	./libraries
-USER_LIBS =
+USER_LIBDIR ?=	./libraries
+USER_LIBS ?=
 
 # Additional pre-compiled libraries to link with.
 # Always leave the math (m) library last!
@@ -136,7 +141,7 @@ USER_LIBS =
 # If the library is in a location the compiler doesn't already know, also
 # give the directory with -L.
 # Note this is dealing with real libraries (libXXX.a), not Arduino "libraries"!
-LDLIBS =
+LDLIBS ?=
 LDLIBS +=	-lm
 
 LISTING_ARGS =	-h -S
@@ -147,20 +152,20 @@ SYMBOL_ARGS +=	-C
 
 # Directory in which files are created.
 # Using the current directory ('.') is untested (and probably unwise).
-OUTPUT =	bin
+OUTPUT ?=	bin
 
 # Where are tools like avr-gcc located on your system?
 # If you set this, it must end with a slash!
 #AVR_TOOLS_PATH = $(ARDUINO_DIR)/hardware/tools/avr/bin/
 #AVR_TOOLS_PATH = /usr/bin/
-AVR_TOOLS_PATH =
+AVR_TOOLS_PATH ?=
 
 # Reset command to use.
 # Possible values are: "stty", "python", "perl".
-RESETCMD =	stty
+#RESETCMD =	stty
 
 ### Macro definitions. Place -D or -U options here.
-CDEFS =
+CDEFS ?=
 ifdef LTO
 CDEFS +=	-DLTO
 endif
@@ -201,31 +206,19 @@ else
 MODEL_PATTERN_MATCHING = $(ARDUINO_MODEL)
 endif
 
-UPLOAD_RATE ?= $(shell \
-	sed "/\($(MODEL_PATTERN_MATCHING)\)\.upload.speed/ { s/.*=//; q }; d" \
-		$(ARDUINO_DIR)/hardware/arduino/avr/boards.txt \
-	)
-MCU ?= $(shell \
-	sed "/\($(MODEL_PATTERN_MATCHING)\)\.build.mcu/ { s/.*=//; q }; d" \
-		$(ARDUINO_DIR)/hardware/arduino/avr/boards.txt \
-	)
-F_CPU ?= $(shell \
-	sed "/\($(MODEL_PATTERN_MATCHING)\)\.build.f_cpu/ { s/.*=//; q }; d" \
-		$(ARDUINO_DIR)/hardware/arduino/avr/boards.txt \
-	)
-AVRDUDE_PROGRAMMER ?= $(shell \
-	sed "/\($(MODEL_PATTERN_MATCHING)\)\.upload.protocol/ { s/.*=//; q }; d" \
-		$(ARDUINO_DIR)/hardware/arduino/avr/boards.txt \
-	)
-VID ?= $(shell \
-	sed "/\($(MODEL_PATTERN_MATCHING)\)\.build.vid/ { s/.*=//; q }; d" \
-		$(ARDUINO_DIR)/hardware/arduino/avr/boards.txt \
-	)
-PID ?= $(shell \
-	sed "/$(ARDUINO_MODEL)\.build.pid/ { s/.*=//; q }; d" \
+getboardvar = $(shell \
+	sed "/^\($(MODEL_PATTERN_MATCHING)\)\.$(1)=/ { s/.*=//; q }; d" \
 		$(ARDUINO_DIR)/hardware/arduino/avr/boards.txt \
 	)
 
+UPLOAD_RATE ?=	$(call getboardvar,upload.speed)
+MCU ?=		$(call getboardvar,build.mcu)
+F_CPU ?=	$(call getboardvar,build.f_cpu)
+AVRDUDE_PROGRAMMER ?= $(call getboardvar,upload.protocol)
+VID ?=		$(call getboardvar,build.vid)
+PID ?=		$(call getboardvar,build.pid)
+BOARD ?=	$(call getboardvar,build.board)
+
 # Try and guess PORT if it wasn't set previously.
 # Note using shell globs most likely won't work, so try first port.
 ifeq "$(OSNAME)" "Linux"
@@ -264,9 +257,19 @@ CORESRC =	$(wildcard $(ARDUINO_CORE)/*.c)
 CORECXXSRC =	$(wildcard $(ARDUINO_CORE)/*.cpp)
 
 # Arduino official library sources.
+# 1.0.x: search in root and utility folders
+# 1.5.x: search in src folder as well.
+# 1.5.x: search also in src/$(ARCH) (for Servo)
+# https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5:-Library-specification
+# 1.5.x: search in hardware folder + utility (for Wire/twi)
+# https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5---3rd-party-Hardware-specification
 ALIBDIRS = $(wildcard \
 		$(ARDUINO_LIBS:%=$(ARDUINO_DIR)/libraries/%) \
 		$(ARDUINO_LIBS:%=$(ARDUINO_DIR)/libraries/%/utility) \
+		$(ARDUINO_LIBS:%=$(ARDUINO_DIR)/libraries/%/src) \
+		$(ARDUINO_LIBS:%=$(ARDUINO_DIR)/libraries/%/src/$(ARCH)) \
+		$(ARDUINO_LIBS:%=$(ARDUINO_DIR)/hardware/arduino/avr/libraries/%) \
+		$(ARDUINO_LIBS:%=$(ARDUINO_DIR)/hardware/arduino/avr/libraries/%/utility) \
 		)
 ALIBSRC =	$(wildcard $(ALIBDIRS:%=%/*.c))
 ALIBCXXSRC =	$(wildcard $(ALIBDIRS:%=%/*.cpp))
@@ -382,6 +385,8 @@ ALLDEPS =	$(ALLOBJ:%.o=%.d)
 ### More macro definitions.
 # -DF_CPU and -DARDUINO are mandatory.
 CDEFS += 	-DF_CPU=$(F_CPU) -DARDUINO=$(ARDUINO)
+CDEFS +=	-DARDUINO_$(BOARD)
+CDEFS +=	-DARDUINO_ARCH_$(shell echo $(ARCH) | tr '[a-z]' '[A-Z]')
 
 
 ### C/C++ Compiler flags.
@@ -428,6 +433,7 @@ OPT_DEBUG =	-g2 -gstabs
 # Turning on all warnings shows a large number of less-than-optimal program
 # locations in the Arduino sources. Some might turn into errors. Either fix
 # your Arduino sources, or turn the warnings off.
+ifndef OPT_WARN
 OPT_WARN =	-Wall
 OPT_WARN +=	-pedantic
 OPT_WARN +=	-Wextra
@@ -435,11 +441,17 @@ OPT_WARN +=	-Wmissing-declarations
 OPT_WARN +=	-Wmissing-field-initializers
 OPT_WARN +=	-Wsystem-headers
 OPT_WARN +=	-Wno-variadic-macros
+endif
+ifndef OPT_WARN_C
 OPT_WARN_C =	$(OPT_WARN)
 OPT_WARN_C +=	-Wmissing-prototypes
+endif
+ifndef OPT_WARN_CXX
 OPT_WARN_CXX =	$(OPT_WARN)
+endif
 
 # Other.
+ifndef OPT_OTHER
 OPT_OTHER =
 # Save gcc temp files (pre-processor, assembler):
 #OPT_OTHER +=	-save-temps
@@ -447,6 +459,7 @@ OPT_OTHER =
 # Automatically enable build.extra_flags if needed
 # Used by Micro and other devices to fill in USB_PID and USB_VID
 OPT_OTHER +=	-DUSB_VID=$(VID) -DUSB_PID=$(PID)
+endif
 
 # Final combined.
 CFLAGS =	-mmcu=$(MCU) \