clean trailing whitespaces in Makefiles

This commit is contained in:
Felix Ruess
2012-09-13 15:05:23 +02:00
parent 3345e0e896
commit c74e9debd5
16 changed files with 61 additions and 61 deletions
+1 -1
View File
@@ -4,7 +4,7 @@ MODCFLAGS=-Wall
all: ublox_conf
clean:
clean:
rm -f core *.o ublox_conf
ublox_conf: ublox_conf.c Makefile
+29 -29
View File
@@ -1,7 +1,7 @@
# Hey Emacs, this is a -*- makefile -*-
#
# WinARM template makefile
# by Martin Thomas, Kaiserslautern, Germany
# WinARM template makefile
# by Martin Thomas, Kaiserslautern, Germany
# <eversmith@heizung-thomas.de>
#
# based on the WinAVR makefile written by Eric B. Weddington, Jörg Wunsch, et al.
@@ -58,16 +58,16 @@ SRC = $(TARGET).c
# List C source files here which must be compiled in ARM-Mode.
# use file-extension c for "c-only"-files
SRCARM =
SRCARM =
# List C++ source files here.
# use file-extension cpp for C++-files
CPPSRC =
CPPSRC =
# List C++ source files here which must be compiled in ARM-Mode.
# use file-extension cpp for C++-files
# CPPSRCARM = $(TARGET).cpp
CPPSRCARM =
CPPSRCARM =
# List Assembler source files here.
# Make them always end in a capital .S. Files ending in a lowercase .s
@@ -76,12 +76,12 @@ CPPSRCARM =
# Even though the DOS/Win* filesystem matches both .s and .S the same,
# it will preserve the spelling of the filenames, and gcc itself does
# care about how the name is spelled on its command-line.
ASRC =
ASRC =
# List Assembler source files here which must be assembled in ARM-Mode..
ASRCARM = crt0.S
ASRCARM = crt0.S
# Optimization level, can be [0, 1, 2, 3, s].
# Optimization level, can be [0, 1, 2, 3, s].
# 0 = turn off optimization. s = optimize for size.
# (Note: 3 is not always the best optimization level. See avr-libc FAQ.)
OPT = s
@@ -95,7 +95,7 @@ DEBUG = dwarf-2
# List any extra directories to look for include files here.
# Each directory must be seperated by a space.
#EXTRAINCDIRS = ./include
EXTRAINCDIRS =
EXTRAINCDIRS =
# Compiler flag to set the C Standard level.
# c89 - "ANSI" C
@@ -126,16 +126,16 @@ ADEFS = -D$(RUN_MODE)
CFLAGS = -g$(DEBUG)
CFLAGS += $(CDEFS) $(CINCS)
CFLAGS += -O$(OPT)
CFLAGS += -Wall -Wcast-align -Wcast-qual -Wimplicit
CFLAGS += -Wall -Wcast-align -Wcast-qual -Wimplicit
CFLAGS += -Wpointer-arith -Wswitch
CFLAGS += -Wredundant-decls -Wreturn-type -Wshadow -Wunused
#CFLAGS += -Wa,-adhlns=$(<:.c=.lst)
CFLAGS += -Wa,-adhlns=$(subst $(suffix $<),.lst,$<)
#CFLAGS += -Wa,-adhlns=$(<:.c=.lst)
CFLAGS += -Wa,-adhlns=$(subst $(suffix $<),.lst,$<)
CFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))
# flags only for C
CONLYFLAGS = -Wstrict-prototypes -Wmissing-declarations
CONLYFLAGS += -Wmissing-prototypes -Wnested-externs
CONLYFLAGS += -Wmissing-prototypes -Wnested-externs
CONLYFLAGS += $(CSTANDARD)
# flags only for C++ (arm-elf-g++)
@@ -148,7 +148,7 @@ CPPFLAGS =
# for use in COFF files, additional information about filenames
# and function names needs to be present in the assembler source
# files -- see avr-libc docs [FIXME: not yet described there]
##ASFLAGS = -Wa,-adhlns=$(<:.S=.lst),-gstabs
##ASFLAGS = -Wa,-adhlns=$(<:.S=.lst),-gstabs
ASFLAGS = $(ADEFS) -Wa,-adhlns=$(<:.S=.lst),-g$(DEBUG)
#Additional libraries.
@@ -173,7 +173,7 @@ LDFLAGS += -n
# Set Linker-Script Depending On Selected Memory
ifeq ($(RUN_MODE),RAM_RUN)
LDFLAGS +=-T$(SUBMDL)-RAM.ld
else
else
LDFLAGS +=-T$(SUBMDL)-ROM-bl.ld
endif
@@ -184,7 +184,7 @@ DIRARM = /usr
DIRARMBIN = $(DIRARM)/bin/
# ---------------------------------------------------------------------------
# Flash-Programming support using lpc21isp by Martin Maurer
# Flash-Programming support using lpc21isp by Martin Maurer
# Settings and variables:
LPC21ISP = $(DIRARMBIN)/lpc21isp
@@ -220,7 +220,7 @@ COPY = cp
MSG_ERRORS_NONE = Errors: none
MSG_BEGIN = -------- begin --------
MSG_END = -------- end --------
MSG_SIZE_BEFORE = Size before:
MSG_SIZE_BEFORE = Size before:
MSG_SIZE_AFTER = Size after:
MSG_FLASH = Creating load file for Flash:
MSG_EXTENDED_LISTING = Creating Extended Listing:
@@ -237,11 +237,11 @@ MSG_LPC21_RESETREMINDER = You may have to bring the target in bootloader-mode no
# Define all object files.
COBJ = $(SRC:.c=.o)
COBJ = $(SRC:.c=.o)
AOBJ = $(ASRC:.S=.o)
COBJARM = $(SRCARM:.c=.o)
AOBJARM = $(ASRCARM:.S=.o)
CPPOBJ = $(CPPSRC:.cpp=.o)
CPPOBJ = $(CPPSRC:.cpp=.o)
CPPOBJARM = $(CPPSRCARM:.cpp=.o)
# Define all listing files.
@@ -265,7 +265,7 @@ build: elf hex lss sym
elf: $(TARGET).elf
hex: $(TARGET).hex
lss: $(TARGET).lss
lss: $(TARGET).lss
sym: $(TARGET).sym
# Eye candy.
@@ -292,15 +292,15 @@ sizeafter:
# Display compiler version information.
gccversion :
gccversion :
@$(CC) --version
# Program the device.
# Program the device.
load upload program: $(TARGET).hex
ifeq ($(FLASH_MODE),IAP)
$(LPC21IAP) $(TARGET).elf
else
else
@echo
@echo $(MSG_LPC21_RESETREMINDER)
$(LPC21ISP) $(LPC21ISP_CONTROL) $(LPC21ISP_DEBUG) $(LPC21ISP_FLASHFILE) $(LPC21ISP_PORT) $(LPC21ISP_BAUD) $(LPC21ISP_XTAL)
@@ -342,25 +342,25 @@ endif
$(COBJ) : %.o : %.c
@echo
@echo $(MSG_COMPILING) $<
$(CC) -c $(THUMB) $(ALL_CFLAGS) $(CONLYFLAGS) $< -o $@
$(CC) -c $(THUMB) $(ALL_CFLAGS) $(CONLYFLAGS) $< -o $@
# Compile: create object files from C source files. ARM-only
$(COBJARM) : %.o : %.c
@echo
@echo $(MSG_COMPILING_ARM) $<
$(CC) -c $(ALL_CFLAGS) $(CONLYFLAGS) $< -o $@
$(CC) -c $(ALL_CFLAGS) $(CONLYFLAGS) $< -o $@
# Compile: create object files from C++ source files. ARM/Thumb
$(CPPOBJ) : %.o : %.cpp
@echo
@echo $(MSG_COMPILINGCPP) $<
$(CPP) -c $(THUMB) $(ALL_CFLAGS) $(CPPFLAGS) $< -o $@
$(CPP) -c $(THUMB) $(ALL_CFLAGS) $(CPPFLAGS) $< -o $@
# Compile: create object files from C++ source files. ARM-only
$(CPPOBJARM) : %.o : %.cpp
@echo
@echo $(MSG_COMPILINGCPP_ARM) $<
$(CPP) -c $(ALL_CFLAGS) $(CPPFLAGS) $< -o $@
$(CPP) -c $(ALL_CFLAGS) $(CPPFLAGS) $< -o $@
# Compile: create assembler files from C source files. ARM/Thumb
@@ -410,9 +410,9 @@ clean_list :
$(REMOVE) $(SRC:.c=.d)
$(REMOVE) $(SRCARM:.c=.s)
$(REMOVE) $(SRCARM:.c=.d)
$(REMOVE) $(CPPSRC:.cpp=.s)
$(REMOVE) $(CPPSRC:.cpp=.s)
$(REMOVE) $(CPPSRC:.cpp=.d)
$(REMOVE) $(CPPSRCARM:.cpp=.s)
$(REMOVE) $(CPPSRCARM:.cpp=.s)
$(REMOVE) $(CPPSRCARM:.cpp=.d)
$(REMOVE) -r .dep
$(REMOVE) *~
+6 -6
View File
@@ -1,24 +1,24 @@
##
# $Id$
#
#
# Copyright (C) 2008-2009 Antoine Drouin <poinix@gmail.com>
#
#
# This file is part of paparazzi.
#
#
# paparazzi is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
#
# paparazzi is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
#
# You should have received a copy of the GNU General Public License
# along with paparazzi; see the file COPYING. If not, write to
# the Free Software Foundation, 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA.
# Boston, MA 02111-1307, USA.
##
CC = gcc
+1 -1
View File
@@ -1,4 +1,4 @@
all:
all:
CFLAGS = -Wall -I..
LDFLAGS = -lm
+2 -2
View File
@@ -7,7 +7,7 @@ fms: fms_main.c fms_ap_link.c fms_serial_port.c fms_gs_link.c fms_network.c
TT_CFLAGS = -Wall
TT_CFLAGS = -Wall
TT_CFLAGS += -I../../include
TT_CFLAGS += -I..
TT_CFLAGS += -I../../../var/include
@@ -37,7 +37,7 @@ OVERO_OE=/overo-oe
CROSS_CC=$(OVERO_OE)/tmp/cross/armv7a/bin/arm-angstrom-linux-gnueabi-gcc
CROSS_CFLAGS = -Wall
CROSS_LDFLAGS =
CROSS_LDFLAGS =
test_telemetry: test_telemetry.c
$(CROSS_CC) $(CROSS_CFLAGS) -o $@ $^ $(CROSS_LDFLAGS)
+3 -3
View File
@@ -1,4 +1,4 @@
#
#
# modem $Id$
# Copyright (C) 2003 Pascal Brisset, Antoine Drouin
#
@@ -17,8 +17,8 @@
# You should have received a copy of the GNU General Public License
# along with paparazzi; see the file COPYING. If not, write to
# the Free Software Foundation, 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA.
#
# Boston, MA 02111-1307, USA.
#
ARCH = atmega8
TARGET = modem_gnd
+4 -4
View File
@@ -19,10 +19,10 @@ OCAMLC =ocamlc
CFLAGS =-Wall -Wstrict-prototypes -I/usr/X11R6/include -I`$(OCAMLC) -where`
ifeq ($(DEBUG),y)
CFLAGS +=-g -O
CFLAGS +=-g -O
else
CFLAGS +=-O3
endif
CFLAGS +=-O3
endif
LBITS := $(shell getconf LONG_BIT)
ifeq ($(LBITS),64)
@@ -50,7 +50,7 @@ ifeq ("$(UNAME)","Darwin")
ALLTARGETS=multimon.cma
endif
all: $(ALLTARGETS)
all: $(ALLTARGETS)
multimon.cma: $(OBJFILES)
@echo OLD $@
+5 -5
View File
@@ -1,4 +1,4 @@
#
#
# $Id$
# Copyright (C) 2003-2006 Pascal Brisset, Antoine Drouin
#
@@ -17,15 +17,15 @@
# You should have received a copy of the GNU General Public License
# along with paparazzi; see the file COPYING. If not, write to
# the Free Software Foundation, 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA.
#
# Boston, MA 02111-1307, USA.
#
# Quiet
Q=@
LBITS := $(shell getconf LONG_BIT)
ifeq ($(LBITS),64)
FPIC = -fPIC
FPIC = -fPIC
else
FPIC =
endif
@@ -169,7 +169,7 @@ ivy_serial_bridge: ivy_serial_bridge.c
.depend: Makefile
ocamldep -I ../../lib/ocaml *.ml* > .depend
ifneq ($(MAKECMDGOALS),clean)
ifneq ($(MAKECMDGOALS),clean)
-include .depend
endif
+3 -3
View File
@@ -6,7 +6,7 @@ LDFLAGS = `pkg-config glib-2.0 --libs` -lm
gcc -c -Wall $(CFLAGS) -o $@ $<
CFLAGS += `pkg-config gtk+-2.0 --cflags`
LDFLAGS += `pkg-config gtk+-2.0 --libs` -lgtkdatabox
LDFLAGS += `pkg-config gtk+-2.0 --libs` -lgtkdatabox
#
#
@@ -36,7 +36,7 @@ OBJS_TILT_EKF = tilt_data.o \
#CFLAGS += -DEKF_UPDATE_DISCRETE
CFLAGS += -DEKF_UPDATE_CONTINUOUS
tilt_ekf: $(OBJS_TILT_EKF)
gcc -o $@ $^ $(LDFLAGS)
gcc -o $@ $^ $(LDFLAGS)
OBJS_TILT_FAST_EKF = tilt_data.o \
@@ -115,7 +115,7 @@ OBJS_TEST_MATRIX = test_matrix.o \
matrix.o
test_matrix: $(OBJS_TEST_MATRIX)
gcc -o $@ $^ $(LDFLAGS)
gcc -o $@ $^ $(LDFLAGS)
OBJS_TEST_UKF = main.o \
linalg.o \
+1 -1
View File
@@ -4,7 +4,7 @@ MODCFLAGS=-Wall
all: turb_simu
clean:
clean:
rm -f core *.o turb_simu
ublox_conf: ublox_conf.c Makefile
+1 -1
View File
@@ -50,7 +50,7 @@ sd2log : sd2log.cmo
$(Q)$(OCAMLC) $(INCLUDES) -custom -o $@ unix.cma str.cma xml-light.cma glibivy-ocaml.cma lib-pprz.cma $^
CC = gcc
CFLAGS=-g -O2 -Wall
CFLAGS=-g -O2 -Wall
LDFLAGS=
openlog2tlm: openlog2tlm.c
+1 -1
View File
@@ -70,4 +70,4 @@ test_sensors : $(TEST_SENSORS_SRCS)
gcc $(CFLAGS) -o $@ $^ $(LDFLAGS)
clean:
+1 -1
View File
@@ -1,2 +1,2 @@
clean:
rm -f *~ foo*.png test.avi q3d.pov
rm -f *~ foo*.png test.avi q3d.pov
+1 -1
View File
@@ -2,4 +2,4 @@ test:
povray test.pov +Oimg001.png Display=false +W800 +H600 +Q9 +A0.3 +R5
clean:
rm -f *~ img*.png test.avi q3d.pov
rm -f *~ img*.png test.avi q3d.pov
+1 -1
View File
@@ -44,6 +44,6 @@ clean:
.depend:
ocamldep -I ../lib/ocaml *.ml* > .depend
ifneq ($(MAKECMDGOALS),clean)
ifneq ($(MAKECMDGOALS),clean)
-include .depend
endif
+1 -1
View File
@@ -46,4 +46,4 @@ OCAMLNETCMA=$(shell ocamlfind query -r -a-format -predicates byte netstring)
$(Q)$(OCAMLYACC) $<
clean:
rm -f *.cm* *.out *~
rm -f *.cm* *.out *~