Merge pull request #103 from wingunder/master

An attempt to make the teensy3/Makefile completely Arduino independent

teensy3/Makefile

@@ -8,9 +8,15 @@ MCU_LD = $(LOWER_MCU).ld
 # The name of your project (used to name the compiled .hex file)
 TARGET = main
 
+# Those that specify a NO_ARDUINO environment variable will
+# be able to use this Makefile with no Arduino dependency.
+# Please note that if ARDUINOPATH was set, it will override
+# the NO_ARDUINO behaviour.
+ifndef NO_ARDUINO
 # Path to your arduino installation
 ARDUINOPATH ?= ../../../../..
 #ARDUINOPATH ?= ../../../..
+endif
 
 # configurable options
 OPTIONS = -DF_CPU=48000000 -DUSB_SERIAL -DLAYOUT_US_ENGLISH -DUSING_MAKEFILE
@@ -32,14 +38,23 @@ OPTIONS += -D__$(MCU)__ -DARDUINO=10600 -DTEENSYDUINO=121
 # locations and edit the pathnames.  The rest of Arduino is not needed.
 #************************************************************************
 
+ifdef ARDUINOPATH
+
 # path location for Teensy Loader, teensy_post_compile and teensy_reboot
-TOOLSPATH = $(ARDUINOPATH)/hardware/tools   # on Linux
+TOOLSPATH = $(abspath $(ARDUINOPATH)/hardware/tools)   # on Linux
 
 # path location for Arduino libraries (currently not used)
-LIBRARYPATH = $(ARDUINOPATH)/libraries
+LIBRARYPATH = $(abspath $(ARDUINOPATH)/libraries)
 
 # path location for the arm-none-eabi compiler
-COMPILERPATH = $(ARDUINOPATH)/hardware/tools/arm/bin
+COMPILERPATH = $(abspath $(ARDUINOPATH)/hardware/tools/arm/bin)
+
+else
+# Default to the normal GNU/Linux compiler path if NO_ARDUINO
+# and ARDUINOPATH was not set.
+COMPILERPATH ?= /usr/bin
+
+endif
 
 #************************************************************************
 # Settings below this point usually do not need to be edited
@@ -62,10 +77,10 @@ LIBS = -lm
 
 
 # names for the compiler programs
-CC = $(abspath $(COMPILERPATH))/arm-none-eabi-gcc
-CXX = $(abspath $(COMPILERPATH))/arm-none-eabi-g++
-OBJCOPY = $(abspath $(COMPILERPATH))/arm-none-eabi-objcopy
-SIZE = $(abspath $(COMPILERPATH))/arm-none-eabi-size
+CC = $(COMPILERPATH)/arm-none-eabi-gcc
+CXX = $(COMPILERPATH)/arm-none-eabi-g++
+OBJCOPY = $(COMPILERPATH)/arm-none-eabi-objcopy
+SIZE = $(COMPILERPATH)/arm-none-eabi-size
 
 # automatically create lists of the sources and objects
 # TODO: this does not handle Arduino libraries yet...
@@ -84,9 +99,10 @@ $(TARGET).elf: $(OBJS) $(MCU_LD)
 %.hex: %.elf
 	$(SIZE) $<
 	$(OBJCOPY) -O ihex -R .eeprom $< $@
-	$(abspath $(TOOLSPATH))/teensy_post_compile -file=$(basename $@) -path=$(shell pwd) -tools=$(abspath $(TOOLSPATH))
-	-$(abspath $(TOOLSPATH))/teensy_reboot
-
+ifneq (,$(wildcard $(TOOLSPATH)))
+	$(TOOLSPATH)/teensy_post_compile -file=$(basename $@) -path=$(shell pwd) -tools=$(TOOLSPATH)
+	-$(TOOLSPATH)/teensy_reboot
+endif
 
 # compiler generated dependency info
 -include $(OBJS:.o=.d)