Merge remote-tracking branch 'origin/master'

[fw/altos] / src / telescience-pwm / Makefile

diff --git a/src/telescience-pwm/Makefile b/src/telescience-pwm/Makefile
index ce2a8fde70f957a168e6d3909c1880ba5c6bd563..7f39d3f1405aa90b5c0c1a4cfa8a80ef58b1f23d 100644 (file)
--- a/src/telescience-pwm/Makefile
+++ b/src/telescience-pwm/Makefile
@@ -5,20 +5,14 @@
 vpath % ..:../core:../product:../drivers:../avr
 vpath ao-make-product.5c ../util
 
+include ../avr/Makefile.defs
+
 MCU=atmega32u4
 DUDECPUTYPE=m32u4
 #PROGRAMMER=stk500v2 -P usb
-PROGRAMMER=usbtiny
-LOADCMD=avrdude
 LOADARG=-p $(DUDECPUTYPE) -c $(PROGRAMMER) -e -U flash:w:
-CC=avr-gcc
-OBJCOPY=avr-objcopy
-
-LDFLAGS=-L/usr/lib/ldscripts -Tavr5.x
 
-ifndef VERSION
-include ../Version
-endif
+LDFLAGS=-L$(LDSCRIPTS) -Tavr5.x
 
 INC = \
        ao.h \