diff --git a/conf/Makefile.jsbsim b/conf/Makefile.jsbsim
index b09675fc0e..97ee1663b5 100644
--- a/conf/Makefile.jsbsim
+++ b/conf/Makefile.jsbsim
@@ -1,5 +1,5 @@
 # Hey Emacs, this is a -*- makefile -*-
-# 
+#
 #   $Id: Makefile.sim 3505 2009-06-17 12:59:32Z hecto $
 #   Copyright (C) 2006 Pascal Brisset, Antoine Drouin
 #
@@ -18,8 +18,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.
+#
 
 #
 # This is the Makefile for the JSBSim target.
@@ -93,8 +93,8 @@ $(OBJDIR)/.depend:
 	@echo DEPEND $@
 	$(Q)$(CC) -MM -MG $(CFLAGS) $($(TARGET).srcs) | sed 's|\([^\.]*\.o\)|$(OBJDIR)/\1|' > $@
 
-ifneq ($(MAKECMDGOALS),clean) 
-ifneq ($(MAKECMDGOALS),erase) 
+ifneq ($(MAKECMDGOALS),clean)
+ifneq ($(MAKECMDGOALS),erase)
 -include $(OBJDIR)/.depend
 endif
 endif
diff --git a/conf/Makefile.omap b/conf/Makefile.omap
index 51ca86d5eb..ed065c5dca 100644
--- a/conf/Makefile.omap
+++ b/conf/Makefile.omap
@@ -18,8 +18,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.
+#
 
 # Define programs and commands.
 
@@ -56,17 +56,17 @@ CFLAGS += -Wredundant-decls -Wreturn-type -Wshadow -Wunused
 
 # flags only for C
 CFLAGS + = -Wstrict-prototypes -Wmissing-declarations
-CFLAGS += -Wmissing-prototypes -Wnested-externs 
+CFLAGS += -Wmissing-prototypes -Wnested-externs
 CFLAGS += $(CSTANDARD)
-CFLAGS += $($(TARGET).CFLAGS)		
+CFLAGS += $($(TARGET).CFLAGS)
 
 
 CXX = /opt/paparazzi/omap/overo-oe/tmp/sysroots/i686-linux/usr/armv7a/bin/arm-angstrom-linux-gnueabi-g++
 CXXFLAGS = -pipe -O3 -fshow-column -ffast-math -fPIC
-CXXFLAGS += -g -ffunction-sections -fdata-sections 
+CXXFLAGS += -g -ffunction-sections -fdata-sections
 CXXFLAGS += -mfloat-abi=softfp -mtune=cortex-a8 -mfpu=vfp -march=armv7-a
 CXXFLAGS += -Wall -Wextra
-CXXFLAGS += $($(TARGET).CXXFLAGS)	
+CXXFLAGS += $($(TARGET).CXXFLAGS)
 
 
 SRC_C_OMAP  = $($(TARGET).srcs)
@@ -81,7 +81,7 @@ build: elf
 
 elf: $(OBJDIR)/$(TARGET).elf
 
-# Program the device.  
+# Program the device.
 load upload program: $(OBJDIR)/$(TARGET).elf
 	scp $(OBJDIR)/$(TARGET).elf $(USER)@$(HOST):$(TARGET_DIR)
 
@@ -91,20 +91,20 @@ load upload program: $(OBJDIR)/$(TARGET).elf
 %.elf:   $(OBJ_C_OMAP) $(OBJ_CPP_OMAP)
 	@echo LD $@
 	$(Q)if (expr "$($(TARGET).cpp_srcs)"); \
-          then $(CXX) $(CXXFLAGS) $(OBJ_CPP_OMAP) $(OBJ_C_OMAP) --output $@ $(LDFLAGS) $($(TARGET).LDFLAGS); \
-          else $(CC) $(CFLAGS) $(OBJ_C_OMAP) --output $@ $(LDFLAGS) $($(TARGET).LDFLAGS); fi
+		  then $(CXX) $(CXXFLAGS) $(OBJ_CPP_OMAP) $(OBJ_C_OMAP) --output $@ $(LDFLAGS) $($(TARGET).LDFLAGS); \
+		  else $(CC) $(CFLAGS) $(OBJ_C_OMAP) --output $@ $(LDFLAGS) $($(TARGET).LDFLAGS); fi
 
 # Compile: create object files from C source files
 $(OBJDIR)/%.o : %.c $(OBJDIR)/../Makefile.ac
 	@echo CC $@
 	$(Q)test -d $(dir $@) || mkdir -p $(dir $@)
-	$(Q)$(CC) -c $(CFLAGS) $< -o $@ 
+	$(Q)$(CC) -c $(CFLAGS) $< -o $@
 
 # Compile: create object files from C++ source files
 $(OBJDIR)/%.o : %.cpp $(OBJDIR)/../Makefile.ac
 	@echo CXX $@
 	$(Q)test -d $(dir $@) || mkdir -p $(dir $@)
-	$(Q)$(CXX) -c $(CXXFLAGS) $< -o $@ 
+	$(Q)$(CXX) -c $(CXXFLAGS) $< -o $@
 
 # Listing of phony targets.
 .PHONY : all build elf clean clean_list
@@ -118,8 +118,8 @@ $(OBJDIR)/.depend:
 	@test -d $(OBJDIR) || mkdir -p $(OBJDIR)
 	$(Q)$(CC) -MM -MG $(CFLAGS) $($(TARGET).CFLAGS) $($(TARGET).srcs) | sed 's|\([^\.]*\.o\)|$(OBJDIR)/\1|' > $@
 
-ifneq ($(MAKECMDGOALS),clean) 
-ifneq ($(MAKECMDGOALS),erase) 
+ifneq ($(MAKECMDGOALS),clean)
+ifneq ($(MAKECMDGOALS),erase)
 -include $(OBJDIR)/.depend
 endif
 endif
diff --git a/conf/Makefile.pentium-m b/conf/Makefile.pentium-m
index a6a6f4712e..bd42bc5476 100644
--- a/conf/Makefile.pentium-m
+++ b/conf/Makefile.pentium-m
@@ -18,8 +18,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.
+#
 
 # Define programs and commands.
 CC		= gcc
@@ -54,9 +54,9 @@ CFLAGS += -m32
 
 # flags only for C
 CFLAGS += -Wstrict-prototypes -Wmissing-declarations
-CFLAGS += -Wmissing-prototypes -Wnested-externs 
+CFLAGS += -Wmissing-prototypes -Wnested-externs
 CFLAGS += $(CSTANDARD)
-CFLAGS += $($(TARGET).CFLAGS) $(LOCAL_CFLAGS)		
+CFLAGS += $($(TARGET).CFLAGS) $(LOCAL_CFLAGS)
 
 #Additional libraries.
 MATH_LIB = -lm
@@ -72,7 +72,7 @@ build: elf
 
 elf: $(OBJDIR)/$(TARGET).elf
 
-# Program the device.  
+# Program the device.
 load upload program: $(OBJDIR)/$(TARGET).elf
 ifdef USER
 	ssh $(USER)@$(HOST) "sudo mount -o remount,rw /"
@@ -93,7 +93,7 @@ endif
 $(OBJDIR)/%.o : %.c $(OBJDIR)/../Makefile.ac
 	@echo CC $@
 	$(Q)test -d $(dir $@) || mkdir -p $(dir $@)
-	$(Q)$(CC) -c $(CFLAGS) $< -o $@ 
+	$(Q)$(CC) -c $(CFLAGS) $< -o $@
 
 # Listing of phony targets.
 .PHONY : all build elf clean clean_list
@@ -107,8 +107,8 @@ $(OBJDIR)/.depend:
 	@test -d $(OBJDIR) || mkdir -p $(OBJDIR)
 	$(Q)$(CC) -MM -MG $(CFLAGS) $($(TARGET).CFLAGS) $($(TARGET).srcs) | sed 's|\([^\.]*\.o\)|$(OBJDIR)/\1|' > $@
 
-ifneq ($(MAKECMDGOALS),clean) 
-ifneq ($(MAKECMDGOALS),erase) 
+ifneq ($(MAKECMDGOALS),clean)
+ifneq ($(MAKECMDGOALS),erase)
 -include $(OBJDIR)/.depend
 endif
 endif