From c74e9debd521cf874c4cb322bc65f85da92d9dd0 Mon Sep 17 00:00:00 2001 From: Felix Ruess Date: Thu, 13 Sep 2012 15:05:23 +0200 Subject: [PATCH] clean trailing whitespaces in Makefiles --- conf/gps/Makefile | 2 +- sw/airborne/arch/lpc21/test/Makefile | 58 ++++++++++++------------- sw/airborne/booz/test/Makefile | 12 ++--- sw/airborne/firmwares/vor/Makefile | 2 +- sw/airborne/fms/Makefile | 4 +- sw/ground_segment/modem/Makefile | 6 +-- sw/ground_segment/multimon/Makefile | 8 ++-- sw/ground_segment/tmtc/Makefile | 10 ++--- sw/in_progress/inertial/C/Makefile | 6 +-- sw/in_progress/turbine/Makefile | 2 +- sw/logalizer/Makefile | 2 +- sw/simulator/old_booz/tests/Makefile | 2 +- sw/simulator/scilab/q3d/povray/Makefile | 2 +- sw/simulator/scilab/q6d/povray/Makefile | 2 +- sw/supervision/Makefile | 2 +- sw/tools/wiki_gen/Makefile | 2 +- 16 files changed, 61 insertions(+), 61 deletions(-) diff --git a/conf/gps/Makefile b/conf/gps/Makefile index 22992cc067..9cc7e8a4ec 100644 --- a/conf/gps/Makefile +++ b/conf/gps/Makefile @@ -4,7 +4,7 @@ MODCFLAGS=-Wall all: ublox_conf -clean: +clean: rm -f core *.o ublox_conf ublox_conf: ublox_conf.c Makefile diff --git a/sw/airborne/arch/lpc21/test/Makefile b/sw/airborne/arch/lpc21/test/Makefile index ffca0c003d..374f0684bd 100644 --- a/sw/airborne/arch/lpc21/test/Makefile +++ b/sw/airborne/arch/lpc21/test/Makefile @@ -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 # # # 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) *~ diff --git a/sw/airborne/booz/test/Makefile b/sw/airborne/booz/test/Makefile index 6db259e69e..f218803525 100644 --- a/sw/airborne/booz/test/Makefile +++ b/sw/airborne/booz/test/Makefile @@ -1,24 +1,24 @@ ## # $Id$ -# +# # Copyright (C) 2008-2009 Antoine Drouin -# +# # 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 diff --git a/sw/airborne/firmwares/vor/Makefile b/sw/airborne/firmwares/vor/Makefile index 031b559b29..2a8cdd9f0c 100644 --- a/sw/airborne/firmwares/vor/Makefile +++ b/sw/airborne/firmwares/vor/Makefile @@ -1,4 +1,4 @@ -all: +all: CFLAGS = -Wall -I.. LDFLAGS = -lm diff --git a/sw/airborne/fms/Makefile b/sw/airborne/fms/Makefile index 160e58a630..21795d25a3 100644 --- a/sw/airborne/fms/Makefile +++ b/sw/airborne/fms/Makefile @@ -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) diff --git a/sw/ground_segment/modem/Makefile b/sw/ground_segment/modem/Makefile index 083b10a6f1..275b1b3050 100644 --- a/sw/ground_segment/modem/Makefile +++ b/sw/ground_segment/modem/Makefile @@ -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 diff --git a/sw/ground_segment/multimon/Makefile b/sw/ground_segment/multimon/Makefile index 7d33e3cd25..fba91e3d81 100644 --- a/sw/ground_segment/multimon/Makefile +++ b/sw/ground_segment/multimon/Makefile @@ -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 $@ diff --git a/sw/ground_segment/tmtc/Makefile b/sw/ground_segment/tmtc/Makefile index 977de67274..51bce9d290 100644 --- a/sw/ground_segment/tmtc/Makefile +++ b/sw/ground_segment/tmtc/Makefile @@ -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 diff --git a/sw/in_progress/inertial/C/Makefile b/sw/in_progress/inertial/C/Makefile index abc9ef18ab..2c893ed041 100644 --- a/sw/in_progress/inertial/C/Makefile +++ b/sw/in_progress/inertial/C/Makefile @@ -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 \ diff --git a/sw/in_progress/turbine/Makefile b/sw/in_progress/turbine/Makefile index 38b7855486..08d8029d5d 100644 --- a/sw/in_progress/turbine/Makefile +++ b/sw/in_progress/turbine/Makefile @@ -4,7 +4,7 @@ MODCFLAGS=-Wall all: turb_simu -clean: +clean: rm -f core *.o turb_simu ublox_conf: ublox_conf.c Makefile diff --git a/sw/logalizer/Makefile b/sw/logalizer/Makefile index 01800db627..086b91a9f3 100644 --- a/sw/logalizer/Makefile +++ b/sw/logalizer/Makefile @@ -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 diff --git a/sw/simulator/old_booz/tests/Makefile b/sw/simulator/old_booz/tests/Makefile index 4784790c47..eb7ed64047 100644 --- a/sw/simulator/old_booz/tests/Makefile +++ b/sw/simulator/old_booz/tests/Makefile @@ -70,4 +70,4 @@ test_sensors : $(TEST_SENSORS_SRCS) gcc $(CFLAGS) -o $@ $^ $(LDFLAGS) clean: - + diff --git a/sw/simulator/scilab/q3d/povray/Makefile b/sw/simulator/scilab/q3d/povray/Makefile index 48e70b6cc0..2d511221a7 100644 --- a/sw/simulator/scilab/q3d/povray/Makefile +++ b/sw/simulator/scilab/q3d/povray/Makefile @@ -1,2 +1,2 @@ clean: - rm -f *~ foo*.png test.avi q3d.pov \ No newline at end of file + rm -f *~ foo*.png test.avi q3d.pov \ No newline at end of file diff --git a/sw/simulator/scilab/q6d/povray/Makefile b/sw/simulator/scilab/q6d/povray/Makefile index fb14a22913..f799787b8a 100644 --- a/sw/simulator/scilab/q6d/povray/Makefile +++ b/sw/simulator/scilab/q6d/povray/Makefile @@ -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 diff --git a/sw/supervision/Makefile b/sw/supervision/Makefile index abfa686910..51f596d63d 100644 --- a/sw/supervision/Makefile +++ b/sw/supervision/Makefile @@ -44,6 +44,6 @@ clean: .depend: ocamldep -I ../lib/ocaml *.ml* > .depend -ifneq ($(MAKECMDGOALS),clean) +ifneq ($(MAKECMDGOALS),clean) -include .depend endif diff --git a/sw/tools/wiki_gen/Makefile b/sw/tools/wiki_gen/Makefile index c4e2cd54f3..3bc985ba00 100644 --- a/sw/tools/wiki_gen/Makefile +++ b/sw/tools/wiki_gen/Makefile @@ -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 *~