Remove trailing whitespace from the Makefile.

This commit is contained in:
Dan Villiom Podlaski Christiansen 2012-09-12 13:27:04 +02:00
parent b3765d7eb6
commit 5e4d4f684d

View file

@ -6,7 +6,7 @@
# Copyright (C) 2010,2011,2012 Martin Oldfield <m@mjo.tc>, based on # Copyright (C) 2010,2011,2012 Martin Oldfield <m@mjo.tc>, based on
# work that is copyright Nicholas Zambetti, David A. Mellis & Hernando # work that is copyright Nicholas Zambetti, David A. Mellis & Hernando
# Barragan. # Barragan.
# #
# This file is free software; you can redistribute it and/or modify it # This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as # under the terms of the GNU Lesser General Public License as
# published by the Free Software Foundation; either version 2.1 of the # published by the Free Software Foundation; either version 2.1 of the
@ -39,13 +39,13 @@
# #
# 0.6 22.vi.2011 M J Oldfield # 0.6 22.vi.2011 M J Oldfield
# - added ard-parse-boards supports # - added ard-parse-boards supports
# - added -lc to linker opts, # - added -lc to linker opts,
# on Fabien Le Lez's advice # on Fabien Le Lez's advice
# #
# 0.7 12.vii.2011 M J Oldfield # 0.7 12.vii.2011 M J Oldfield
# - moved -lm to the end of linker opts, # - moved -lm to the end of linker opts,
# to solve Frank Knopf's problem; # to solve Frank Knopf's problem;
# - added -F to stty opts: Craig Hollabaugh # - added -F to stty opts: Craig Hollabaugh
# reckons it's good for Ubuntu # reckons it's good for Ubuntu
# #
# 0.8 12.ii.2012 M J Oldfield # 0.8 12.ii.2012 M J Oldfield
@ -72,12 +72,12 @@
# defined (ex Peplin) # defined (ex Peplin)
# - Added a monitor target which talks to the # - Added a monitor target which talks to the
# Arduino serial port (Peplin's suggestion) # Arduino serial port (Peplin's suggestion)
# - Rejigged PATH calculations for general # - Rejigged PATH calculations for general
# tidiness (ex Peplin) # tidiness (ex Peplin)
# - Moved the reset target to Perl for # - Moved the reset target to Perl for
# clarity and better error handling (ex # clarity and better error handling (ex
# Daniele Vergini) # Daniele Vergini)
# #
######################################################################## ########################################################################
# #
# PATHS YOU NEED TO SET UP # PATHS YOU NEED TO SET UP
@ -90,7 +90,7 @@
# 1. Things which are included in this distribution e.g. ard-parse-boards # 1. Things which are included in this distribution e.g. ard-parse-boards
# => ARDMK_DIR # => ARDMK_DIR
# #
# 2. Things which are always in the Arduino distribution e.g. # 2. Things which are always in the Arduino distribution e.g.
# boards.txt, libraries, &c. # boards.txt, libraries, &c.
# => ARDUINO_DIR # => ARDUINO_DIR
# #
@ -114,13 +114,13 @@
# ARDMK_DIR = /usr/local # ARDMK_DIR = /usr/local
# AVR_TOOLS_DIR = /usr # AVR_TOOLS_DIR = /usr
# #
# You can either set these up in the Makefile, or put them in your # You can either set these up in the Makefile, or put them in your
# environment e.g. in your .bashrc # environment e.g. in your .bashrc
# #
# If you don't install the ard-... binaries to /usr/local/bin, but # 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 # instead copy them to e.g. /home/mjo/arduino.mk/bin then set
# ARDML_DIR = /home/mjo/arduino.mk # ARDML_DIR = /home/mjo/arduino.mk
# #
######################################################################## ########################################################################
# #
# DEPENDENCIES # DEPENDENCIES
@ -148,7 +148,7 @@
# #
# ARDUINO_LIBS - A list of any libraries used by the sketch (we # 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
# #
# ARDUINO_PORT - The port where the Arduino can be found (only needed # ARDUINO_PORT - The port where the Arduino can be found (only needed
# when uploading # when uploading
@ -182,7 +182,7 @@
# SERIAL MONITOR # SERIAL MONITOR
# #
# The serial monitor just invokes the GNU screen program with suitable # The serial monitor just invokes the GNU screen program with suitable
# options. For more information see screen (1) and search for # options. For more information see screen (1) and search for
# 'character special device'. # 'character special device'.
# #
# The really useful thing to know is that ^A-k gets you out! # The really useful thing to know is that ^A-k gets you out!
@ -207,7 +207,7 @@
# 1. Things which are included in this distribution e.g. ard-parse-boards # 1. Things which are included in this distribution e.g. ard-parse-boards
# => ARDMK_DIR # => ARDMK_DIR
# #
# 2. Things which are always in the Arduino distribution e.g. # 2. Things which are always in the Arduino distribution e.g.
# boards.txt, libraries, &c. # boards.txt, libraries, &c.
# => ARDUINO_DIR # => ARDUINO_DIR
# #
@ -232,7 +232,7 @@
# AVR_TOOLS_DIR = /usr # AVR_TOOLS_DIR = /usr
# #
# #
# #
# #
######################################################################## ########################################################################
# #
@ -246,7 +246,7 @@
# #
# You might also need to set the fuse bits, but typically they'll be # You might also need to set the fuse bits, but typically they'll be
# read from boards.txt, based on the BOARD_TAG variable: # read from boards.txt, based on the BOARD_TAG variable:
# #
# ISP_LOCK_FUSE_PRE = 0x3f # ISP_LOCK_FUSE_PRE = 0x3f
# ISP_LOCK_FUSE_POST = 0xcf # ISP_LOCK_FUSE_POST = 0xcf
# ISP_HIGH_FUSE = 0xdf # ISP_HIGH_FUSE = 0xdf
@ -255,7 +255,7 @@
# #
# I think the fuses here are fine for uploading to the ATmega168 # I think the fuses here are fine for uploading to the ATmega168
# without bootloader. # without bootloader.
# #
# To actually do this upload use the ispload target: # To actually do this upload use the ispload target:
# #
# make ispload # make ispload
@ -264,7 +264,7 @@
######################################################################## ########################################################################
######################################################################## ########################################################################
# #
# Default TARGET to cwd (ex Daniele Vergini) # Default TARGET to cwd (ex Daniele Vergini)
ifndef TARGET ifndef TARGET
TARGET = $(notdir $(CURDIR)) TARGET = $(notdir $(CURDIR))
@ -661,19 +661,19 @@ raw_upload: $(TARGET_HEX)
$(AVRDUDE) $(AVRDUDE_COM_OPTS) $(AVRDUDE_ARD_OPTS) \ $(AVRDUDE) $(AVRDUDE_COM_OPTS) $(AVRDUDE_ARD_OPTS) \
-U flash:w:$(TARGET_HEX):i -U flash:w:$(TARGET_HEX):i
reset: reset:
$(RESET_CMD) $(ARD_PORT) $(RESET_CMD) $(ARD_PORT)
# stty on MacOS likes -F, but on Debian it likes -f redirecting # 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 # stdin/out appears to work but generates a spurious error on MacOS at
# least. Perhaps it would be better to just do it in perl ? # least. Perhaps it would be better to just do it in perl ?
reset_stty: reset_stty:
for STTYF in 'stty -F' 'stty --file' 'stty -f' 'stty <' ; \ for STTYF in 'stty -F' 'stty --file' 'stty -f' 'stty <' ; \
do $$STTYF /dev/tty >/dev/null 2>/dev/null && break ; \ do $$STTYF /dev/tty >/dev/null 2>/dev/null && break ; \
done ;\ done ;\
$$STTYF $(ARD_PORT) hupcl ;\ $$STTYF $(ARD_PORT) hupcl ;\
(sleep 0.1 || sleep 1) ;\ (sleep 0.1 || sleep 1) ;\
$$STTYF $(ARD_PORT) -hupcl $$STTYF $(ARD_PORT) -hupcl
ispload: $(TARGET_HEX) ispload: $(TARGET_HEX)
$(AVRDUDE) $(AVRDUDE_COM_OPTS) $(AVRDUDE_ISP_OPTS) -e \ $(AVRDUDE) $(AVRDUDE_COM_OPTS) $(AVRDUDE_ISP_OPTS) -e \
@ -695,7 +695,7 @@ depends: $(DEPS)
size: $(OBJDIR) $(TARGET_HEX) size: $(OBJDIR) $(TARGET_HEX)
$(SIZE) $(TARGET_HEX) $(SIZE) $(TARGET_HEX)
show_boards: show_boards:
$(PARSE_BOARD_CMD) --boards $(PARSE_BOARD_CMD) --boards
monitor: monitor: