[PATCH 07/12] bsps: Avoid line continuation in Makefile.am

Sebastian Huber sebastian.huber at embedded-brains.de
Wed Apr 11 14:07:33 UTC 2018 

This patch is a part of the BSP source reorganization.

Update #3285.
---
 c/src/lib/libbsp/arm/csb336/Makefile.am            | 16 +++--
 c/src/lib/libbsp/arm/csb337/Makefile.am            | 20 +++---
 c/src/lib/libbsp/arm/edb7312/Makefile.am           | 15 +++--
 c/src/lib/libbsp/arm/gdbarmsim/Makefile.am         | 19 ++++--
 c/src/lib/libbsp/arm/gumstix/Makefile.am           | 19 ++++--
 c/src/lib/libbsp/arm/lpc176x/Makefile.am           |  4 +-
 c/src/lib/libbsp/arm/lpc24xx/Makefile.am           | 42 ++++++------
 c/src/lib/libbsp/arm/lpc32xx/Makefile.am           |  4 +-
 c/src/lib/libbsp/arm/raspberrypi/Makefile.am       |  3 +-
 c/src/lib/libbsp/arm/rtl22xx/Makefile.am           | 16 +++--
 c/src/lib/libbsp/arm/xilinx-zynq/Makefile.am       |  3 +-
 c/src/lib/libbsp/bfin/TLL6527M/Makefile.am         | 14 ++--
 c/src/lib/libbsp/bfin/bf537Stamp/Makefile.am       | 14 ++--
 c/src/lib/libbsp/bfin/eZKit533/Makefile.am         | 14 ++--
 c/src/lib/libbsp/i386/pc386/Makefile.am            |  3 +-
 c/src/lib/libbsp/m32c/m32cbsp/Makefile.am          |  6 +-
 c/src/lib/libbsp/m68k/av5282/Makefile.am           | 22 +++---
 c/src/lib/libbsp/m68k/csb360/Makefile.am           | 20 +++---
 c/src/lib/libbsp/m68k/gen68340/Makefile.am         | 23 ++++---
 c/src/lib/libbsp/m68k/gen68360/Makefile.am         | 24 ++++---
 c/src/lib/libbsp/m68k/genmcf548x/Makefile.am       | 21 +++---
 c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am     | 26 +++++---
 c/src/lib/libbsp/m68k/mcf52235/Makefile.am         | 24 ++++---
 c/src/lib/libbsp/m68k/mcf5225x/Makefile.am         | 21 +++---
 c/src/lib/libbsp/m68k/mcf5235/Makefile.am          | 24 ++++---
 c/src/lib/libbsp/m68k/mcf5329/Makefile.am          | 23 ++++---
 c/src/lib/libbsp/m68k/mrm332/Makefile.am           | 21 +++---
 c/src/lib/libbsp/m68k/mvme147/Makefile.am          | 21 +++---
 c/src/lib/libbsp/m68k/mvme147s/Makefile.am         | 30 +++++----
 c/src/lib/libbsp/m68k/mvme162/Makefile.am          | 22 +++---
 c/src/lib/libbsp/m68k/mvme167/Makefile.am          | 24 ++++---
 c/src/lib/libbsp/m68k/uC5282/Makefile.am           | 21 +++---
 c/src/lib/libbsp/moxie/moxiesim/Makefile.am        | 19 +++---
 c/src/lib/libbsp/nios2/nios2_iss/Makefile.am       |  6 +-
 c/src/lib/libbsp/no_cpu/no_bsp/Makefile.am         | 24 ++++---
 c/src/lib/libbsp/or1k/generic_or1k/Makefile.am     |  3 +-
 c/src/lib/libbsp/powerpc/beatnik/Makefile.am       | 60 +++++++++--------
 c/src/lib/libbsp/powerpc/gen5200/Makefile.am       | 78 +++++++++++++++-------
 c/src/lib/libbsp/powerpc/gen83xx/Makefile.am       | 31 +++++----
 c/src/lib/libbsp/powerpc/haleakala/Makefile.am     | 25 ++++---
 .../libbsp/powerpc/motorola_powerpc/Makefile.am    | 30 +++++----
 c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am    | 16 +++--
 c/src/lib/libbsp/powerpc/mvme3100/Makefile.am      | 57 ++++++++--------
 c/src/lib/libbsp/powerpc/mvme5500/Makefile.am      | 40 ++++++-----
 c/src/lib/libbsp/powerpc/psim/Makefile.am          | 29 +++++---
 c/src/lib/libbsp/powerpc/qemuppc/Makefile.am       |  6 +-
 c/src/lib/libbsp/powerpc/qoriq/Makefile.am         | 63 +++++++++--------
 c/src/lib/libbsp/powerpc/ss555/Makefile.am         | 16 +++--
 c/src/lib/libbsp/powerpc/t32mppc/Makefile.am       | 25 ++++---
 c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am        | 18 +++--
 c/src/lib/libbsp/powerpc/virtex/Makefile.am        | 18 +++--
 c/src/lib/libbsp/powerpc/virtex4/Makefile.am       | 22 +++---
 c/src/lib/libbsp/powerpc/virtex5/Makefile.am       | 22 +++---
 c/src/lib/libbsp/riscv/riscv_generic/Makefile.am   |  3 +-
 c/src/lib/libbsp/sh/gensh1/Makefile.am             | 20 +++---
 c/src/lib/libbsp/sh/gensh2/Makefile.am             | 23 ++++---
 c/src/lib/libbsp/sh/gensh4/Makefile.am             | 21 +++---
 c/src/lib/libbsp/sparc/erc32/Makefile.am           | 10 +--
 c/src/lib/libbsp/sparc/leon2/Makefile.am           | 17 ++---
 c/src/lib/libbsp/sparc/leon3/Makefile.am           | 41 +++++++-----
 c/src/lib/libbsp/sparc64/niagara/Makefile.am       |  6 +-
 c/src/lib/libbsp/sparc64/usiii/Makefile.am         |  7 +-
 62 files changed, 782 insertions(+), 553 deletions(-)

diff --git a/c/src/lib/libbsp/arm/csb336/Makefile.am b/c/src/lib/libbsp/arm/csb336/Makefile.am
index c5a4b2e693..b6a8f78bc2 100644
--- a/c/src/lib/libbsp/arm/csb336/Makefile.am
+++ b/c/src/lib/libbsp/arm/csb336/Makefile.am
@@ -18,12 +18,16 @@ project_lib_LIBRARIES = librtemsbsp.a
 librtemsbsp_a_SOURCES =
 
 # startup
-librtemsbsp_a_SOURCES += \
-    ../../shared/bspgetworkarea.c \
-    ../../shared/bsppredriverhook.c startup/bspstart.c ../../shared/bspclean.c \
-    ../../shared/bspreset.c startup/memmap.c ../../shared/bootcard.c \
-    ../../shared/getentropy-cpucounter.c \
-    ../../shared/sbrk.c ../../shared/gnatinstallhandler.c
+librtemsbsp_a_SOURCES += ../../shared/bspgetworkarea.c
+librtemsbsp_a_SOURCES += ../../shared/bsppredriverhook.c
+librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../shared/bspclean.c
+librtemsbsp_a_SOURCES += ../../shared/bspreset.c
+librtemsbsp_a_SOURCES += startup/memmap.c
+librtemsbsp_a_SOURCES += ../../shared/bootcard.c
+librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c
+librtemsbsp_a_SOURCES += ../../shared/sbrk.c
+librtemsbsp_a_SOURCES += ../../shared/gnatinstallhandler.c
 librtemsbsp_a_SOURCES += ../../shared/cpucounterread.c
 librtemsbsp_a_SOURCES += ../../shared/cpucounterdiff.c
 librtemsbsp_a_SOURCES += clock/clockdrv.c
diff --git a/c/src/lib/libbsp/arm/csb337/Makefile.am b/c/src/lib/libbsp/arm/csb337/Makefile.am
index 185b875bed..1038b74e28 100644
--- a/c/src/lib/libbsp/arm/csb337/Makefile.am
+++ b/c/src/lib/libbsp/arm/csb337/Makefile.am
@@ -26,13 +26,16 @@ dist_project_lib_DATA += startup/linkcmds.csb637
 project_lib_LIBRARIES = librtemsbsp.a
 
 # startup
-librtemsbsp_a_SOURCES = \
-    ../../shared/bsppredriverhook.c ../../shared/bspgetworkarea.c \
-    startup/bspstart.c \
-    ../../shared/bspclean.c startup/bspreset.c \
-    startup/memmap.c ../../shared/bootcard.c ../../shared/sbrk.c \
-    ../../shared/getentropy-cpucounter.c \
-    ../../shared/gnatinstallhandler.c
+librtemsbsp_a_SOURCES = ../../shared/bsppredriverhook.c
+librtemsbsp_a_SOURCES += ../../shared/bspgetworkarea.c
+librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../shared/bspclean.c
+librtemsbsp_a_SOURCES += startup/bspreset.c
+librtemsbsp_a_SOURCES += startup/memmap.c
+librtemsbsp_a_SOURCES += ../../shared/bootcard.c
+librtemsbsp_a_SOURCES += ../../shared/sbrk.c
+librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c
+librtemsbsp_a_SOURCES += ../../shared/gnatinstallhandler.c
 librtemsbsp_a_SOURCES += ../../shared/cpucounterread.c
 librtemsbsp_a_SOURCES += ../../shared/cpucounterdiff.c
 librtemsbsp_a_SOURCES += startup/pmc.c
@@ -49,7 +52,8 @@ librtemsbsp_a_SOURCES += console/usart.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
 librtemsbsp_a_SOURCES += irq/irq.c
 if ENABLE_LCD
-librtemsbsp_a_SOURCES += console/sed1356.c console/fbcons.c
+librtemsbsp_a_SOURCES += console/sed1356.c
+librtemsbsp_a_SOURCES += console/fbcons.c
 endif
 # umon
 if ENABLE_UMON
diff --git a/c/src/lib/libbsp/arm/edb7312/Makefile.am b/c/src/lib/libbsp/arm/edb7312/Makefile.am
index 5e09e77b23..61f4a883a8 100644
--- a/c/src/lib/libbsp/arm/edb7312/Makefile.am
+++ b/c/src/lib/libbsp/arm/edb7312/Makefile.am
@@ -17,12 +17,15 @@ project_lib_LIBRARIES = librtemsbsp.a
 librtemsbsp_a_SOURCES =
 
 # startup
-librtemsbsp_a_SOURCES += \
-    ../../shared/bspgetworkarea.c \
-    ../../shared/bsppredriverhook.c startup/bspstart.c \
-    ../../shared/bspclean.c ../../shared/bootcard.c ../../shared/sbrk.c \
-    ../../shared/getentropy-cpucounter.c \
-    startup/bspreset.c ../../shared/gnatinstallhandler.c
+librtemsbsp_a_SOURCES += ../../shared/bspgetworkarea.c
+librtemsbsp_a_SOURCES += ../../shared/bsppredriverhook.c
+librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../shared/bspclean.c
+librtemsbsp_a_SOURCES += ../../shared/bootcard.c
+librtemsbsp_a_SOURCES += ../../shared/sbrk.c
+librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c
+librtemsbsp_a_SOURCES += startup/bspreset.c
+librtemsbsp_a_SOURCES += ../../shared/gnatinstallhandler.c
 librtemsbsp_a_SOURCES += ../../shared/cpucounterread.c
 librtemsbsp_a_SOURCES += ../../shared/cpucounterdiff.c
 
diff --git a/c/src/lib/libbsp/arm/gdbarmsim/Makefile.am b/c/src/lib/libbsp/arm/gdbarmsim/Makefile.am
index 5a05800e0d..34559ad09b 100644
--- a/c/src/lib/libbsp/arm/gdbarmsim/Makefile.am
+++ b/c/src/lib/libbsp/arm/gdbarmsim/Makefile.am
@@ -18,16 +18,21 @@ project_lib_LIBRARIES = librtemsbsp.a
 librtemsbsp_a_SOURCES =
 
 # startup
-librtemsbsp_a_SOURCES += \
-    ../../shared/bspgetworkarea.c \
-    ../../shared/bsppredriverhook.c ../../shared/bspstart.c \
-    ../../shared/bspclean.c startup/bspreset.c ../../shared/bootcard.c \
-    ../../shared/getentropy-cpucounter.c \
-    ../../shared/sbrk.c ../../shared/gnatinstallhandler.c startup/syscalls.c
+librtemsbsp_a_SOURCES += ../../shared/bspgetworkarea.c
+librtemsbsp_a_SOURCES += ../../shared/bsppredriverhook.c
+librtemsbsp_a_SOURCES += ../../shared/bspstart.c
+librtemsbsp_a_SOURCES += ../../shared/bspclean.c
+librtemsbsp_a_SOURCES += startup/bspreset.c
+librtemsbsp_a_SOURCES += ../../shared/bootcard.c
+librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c
+librtemsbsp_a_SOURCES += ../../shared/sbrk.c
+librtemsbsp_a_SOURCES += ../../shared/gnatinstallhandler.c
+librtemsbsp_a_SOURCES += startup/syscalls.c
 librtemsbsp_a_SOURCES += ../../shared/cpucounterread.c
 librtemsbsp_a_SOURCES += ../../shared/cpucounterdiff.c
 # console
-librtemsbsp_a_SOURCES += ../../shared/console-polled.c console/console-io.c
+librtemsbsp_a_SOURCES += ../../shared/console-polled.c
+librtemsbsp_a_SOURCES += console/console-io.c
 # clock
 librtemsbsp_a_SOURCES += ../../shared/clock_driver_simidle.c
 # timer
diff --git a/c/src/lib/libbsp/arm/gumstix/Makefile.am b/c/src/lib/libbsp/arm/gumstix/Makefile.am
index 5a3b8df927..d31a38d5f9 100644
--- a/c/src/lib/libbsp/arm/gumstix/Makefile.am
+++ b/c/src/lib/libbsp/arm/gumstix/Makefile.am
@@ -17,12 +17,16 @@ project_lib_DATA += linkcmds
 project_lib_LIBRARIES = librtemsbsp.a
 
 librtemsbsp_a_SOURCES =
-librtemsbsp_a_SOURCES += \
-  ../../shared/bsppredriverhook.c ../../shared/bspgetworkarea.c \
-  ../../shared/bootcard.c ../../shared/sbrk.c \
-  ../../shared/getentropy-cpucounter.c \
-  ../../shared/gnatinstallhandler.c \
-  ../../shared/bspclean.c startup/bspstart.c startup/bspreset.c startup/memmap.c
+librtemsbsp_a_SOURCES += ../../shared/bsppredriverhook.c
+librtemsbsp_a_SOURCES += ../../shared/bspgetworkarea.c
+librtemsbsp_a_SOURCES += ../../shared/bootcard.c
+librtemsbsp_a_SOURCES += ../../shared/sbrk.c
+librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c
+librtemsbsp_a_SOURCES += ../../shared/gnatinstallhandler.c
+librtemsbsp_a_SOURCES += ../../shared/bspclean.c
+librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += startup/bspreset.c
+librtemsbsp_a_SOURCES += startup/memmap.c
 librtemsbsp_a_SOURCES += ../../shared/cpucounterread.c
 librtemsbsp_a_SOURCES += ../../shared/cpucounterdiff.c
 librtemsbsp_a_SOURCES += clock/clock.c
@@ -44,7 +48,8 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/cache/nocache.c
 if ON_SKYEYE
 librtemsbsp_a_SOURCES += fb/fb.c
 if HAS_NETWORKING
-librtemsbsp_a_SOURCES += rtl8019/rtl8019.c rtl8019/wd80x3.h
+librtemsbsp_a_SOURCES += rtl8019/rtl8019.c
+librtemsbsp_a_SOURCES += rtl8019/wd80x3.h
 endif
 endif
 
diff --git a/c/src/lib/libbsp/arm/lpc176x/Makefile.am b/c/src/lib/libbsp/arm/lpc176x/Makefile.am
index 9d68094cc4..1150edf03d 100644
--- a/c/src/lib/libbsp/arm/lpc176x/Makefile.am
+++ b/c/src/lib/libbsp/arm/lpc176x/Makefile.am
@@ -72,8 +72,8 @@ librtemsbsp_a_SOURCES += ../shared/lpc/clock/lpc-clock-config.c
 librtemsbsp_a_SOURCES += ../shared/armv7m/clock/armv7m-clock-config.c
 
 # RTC
-librtemsbsp_a_SOURCES += ../../shared/tod.c \
-			rtc/rtc-config.c
+librtemsbsp_a_SOURCES += ../../shared/tod.c
+librtemsbsp_a_SOURCES += rtc/rtc-config.c
 
 # GPIO
 librtemsbsp_a_SOURCES += gpio/lpc-gpio.c
diff --git a/c/src/lib/libbsp/arm/lpc24xx/Makefile.am b/c/src/lib/libbsp/arm/lpc24xx/Makefile.am
index f3c3066d2a..ac127a91bc 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/Makefile.am
+++ b/c/src/lib/libbsp/arm/lpc24xx/Makefile.am
@@ -49,15 +49,15 @@ project_lib_LIBRARIES = librtemsbsp.a
 librtemsbsp_a_SOURCES =
 
 # Shared
-librtemsbsp_a_SOURCES += ../../shared/bootcard.c \
-	../../shared/getentropy-cpucounter.c \
-	../../shared/bspclean.c \
-	../../shared/bspgetworkarea.c \
-	../../shared/bsppredriverhook.c \
-	../../shared/gnatinstallhandler.c \
-	../../shared/sbrk.c \
-	../../shared/src/stackalloc.c \
-	../../shared/src/uart-output-char.c
+librtemsbsp_a_SOURCES += ../../shared/bootcard.c
+librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c
+librtemsbsp_a_SOURCES += ../../shared/bspclean.c
+librtemsbsp_a_SOURCES += ../../shared/bspgetworkarea.c
+librtemsbsp_a_SOURCES += ../../shared/bsppredriverhook.c
+librtemsbsp_a_SOURCES += ../../shared/gnatinstallhandler.c
+librtemsbsp_a_SOURCES += ../../shared/sbrk.c
+librtemsbsp_a_SOURCES += ../../shared/src/stackalloc.c
+librtemsbsp_a_SOURCES += ../../shared/src/uart-output-char.c
 librtemsbsp_a_SOURCES += ../../shared/cpucounterdiff.c
 
 # Startup
@@ -87,25 +87,25 @@ librtemsbsp_a_SOURCES += ../shared/lpc/clock/lpc-clock-config.c
 librtemsbsp_a_SOURCES += ../shared/armv7m/clock/armv7m-clock-config.c
 
 # RTC
-librtemsbsp_a_SOURCES += ../../shared/tod.c \
-	rtc/rtc-config.c
+librtemsbsp_a_SOURCES += ../../shared/tod.c
+librtemsbsp_a_SOURCES += rtc/rtc-config.c
 
 # Misc
-librtemsbsp_a_SOURCES += misc/system-clocks.c \
-	misc/dma.c \
-	misc/dma-copy.c \
-	misc/bspidle.c \
-	misc/io.c \
-	misc/lcd.c \
-	misc/restart.c \
-	misc/timer.c
+librtemsbsp_a_SOURCES += misc/system-clocks.c
+librtemsbsp_a_SOURCES += misc/dma.c
+librtemsbsp_a_SOURCES += misc/dma-copy.c
+librtemsbsp_a_SOURCES += misc/bspidle.c
+librtemsbsp_a_SOURCES += misc/io.c
+librtemsbsp_a_SOURCES += misc/lcd.c
+librtemsbsp_a_SOURCES += misc/restart.c
+librtemsbsp_a_SOURCES += misc/timer.c
 
 # SSP
 librtemsbsp_a_SOURCES += ssp/ssp.c
 
 # I2C
-librtemsbsp_a_SOURCES += i2c/i2c.c \
-	i2c/i2c-config.c
+librtemsbsp_a_SOURCES += i2c/i2c.c
+librtemsbsp_a_SOURCES += i2c/i2c-config.c
 
 # Framebuffer
 librtemsbsp_a_SOURCES += ../shared/arm-pl111-fb.c
diff --git a/c/src/lib/libbsp/arm/lpc32xx/Makefile.am b/c/src/lib/libbsp/arm/lpc32xx/Makefile.am
index 57a03b1b62..ca03cb0340 100644
--- a/c/src/lib/libbsp/arm/lpc32xx/Makefile.am
+++ b/c/src/lib/libbsp/arm/lpc32xx/Makefile.am
@@ -72,8 +72,8 @@ librtemsbsp_a_SOURCES += ../shared/lpc/clock/lpc-clock-config.c
 librtemsbsp_a_SOURCES += ../../shared/clockdrv_shell.h
 
 # RTC
-librtemsbsp_a_SOURCES += ../../shared/tod.c \
-	rtc/rtc-config.c
+librtemsbsp_a_SOURCES += ../../shared/tod.c
+librtemsbsp_a_SOURCES += rtc/rtc-config.c
 
 # Misc
 librtemsbsp_a_SOURCES += misc/boot.c
diff --git a/c/src/lib/libbsp/arm/raspberrypi/Makefile.am b/c/src/lib/libbsp/arm/raspberrypi/Makefile.am
index 0e516751b8..043295cedd 100644
--- a/c/src/lib/libbsp/arm/raspberrypi/Makefile.am
+++ b/c/src/lib/libbsp/arm/raspberrypi/Makefile.am
@@ -85,7 +85,8 @@ librtemsbsp_a_SOURCES += misc/mailbox.c
 librtemsbsp_a_SOURCES += misc/vc.c
 
 # clock
-librtemsbsp_a_SOURCES += clock/clockdrv.c ../../../shared/clockdrv_shell.h
+librtemsbsp_a_SOURCES += clock/clockdrv.c
+librtemsbsp_a_SOURCES += ../../../shared/clockdrv_shell.h
 
 # Timer
 librtemsbsp_a_SOURCES += misc/timer.c
diff --git a/c/src/lib/libbsp/arm/rtl22xx/Makefile.am b/c/src/lib/libbsp/arm/rtl22xx/Makefile.am
index 4c7e9714c7..1f1eee65a8 100644
--- a/c/src/lib/libbsp/arm/rtl22xx/Makefile.am
+++ b/c/src/lib/libbsp/arm/rtl22xx/Makefile.am
@@ -19,13 +19,15 @@ project_lib_LIBRARIES = librtemsbsp.a
 librtemsbsp_a_SOURCES =
 
 # startup
-librtemsbsp_a_SOURCES += \
-    ../../shared/bsppredriverhook.c \
-    ../../shared/bspgetworkarea.c startup/bspstart.c \
-    ../../shared/bspclean.c startup/bspreset.c \
-    ../../shared/bootcard.c ../../shared/sbrk.c \
-    ../../shared/getentropy-cpucounter.c \
-    ../../shared/gnatinstallhandler.c
+librtemsbsp_a_SOURCES += ../../shared/bsppredriverhook.c
+librtemsbsp_a_SOURCES += ../../shared/bspgetworkarea.c
+librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../shared/bspclean.c
+librtemsbsp_a_SOURCES += startup/bspreset.c
+librtemsbsp_a_SOURCES += ../../shared/bootcard.c
+librtemsbsp_a_SOURCES += ../../shared/sbrk.c
+librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c
+librtemsbsp_a_SOURCES += ../../shared/gnatinstallhandler.c
 librtemsbsp_a_SOURCES += ../../shared/cpucounterread.c
 librtemsbsp_a_SOURCES += ../../shared/cpucounterdiff.c
 librtemsbsp_a_SOURCES += timer/timer.c
diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/Makefile.am b/c/src/lib/libbsp/arm/xilinx-zynq/Makefile.am
index 4726565969..0cd295a9b6 100644
--- a/c/src/lib/libbsp/arm/xilinx-zynq/Makefile.am
+++ b/c/src/lib/libbsp/arm/xilinx-zynq/Makefile.am
@@ -78,7 +78,8 @@ librtemsbsp_a_SOURCES += i2c/cadence-i2c.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/cache/cache-l2c-310.c
 
 # Start hooks
-librtemsbsp_a_SOURCES += startup/bspstarthooks.c startup/bspstartmmu.c
+librtemsbsp_a_SOURCES += startup/bspstarthooks.c
+librtemsbsp_a_SOURCES += startup/bspstartmmu.c
 
 ###############################################################################
 #                  Special Rules                                              #
diff --git a/c/src/lib/libbsp/bfin/TLL6527M/Makefile.am b/c/src/lib/libbsp/bfin/TLL6527M/Makefile.am
index 9e8b4c55ae..7fe3cf489e 100644
--- a/c/src/lib/libbsp/bfin/TLL6527M/Makefile.am
+++ b/c/src/lib/libbsp/bfin/TLL6527M/Makefile.am
@@ -17,12 +17,14 @@ project_lib_DATA += linkcmds
 
 project_lib_LIBRARIES = librtemsbsp.a
 
-librtemsbsp_a_SOURCES = \
-	startup/bspstart.c \
-	../../shared/bspclean.c ../../shared/sbrk.c ../../shared/setvec.c \
-	../../shared/bootcard.c ../../shared/gnatinstallhandler.c \
-	../../shared/getentropy-cpucounter.c \
-	../../shared/bspgetworkarea.c
+librtemsbsp_a_SOURCES = startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../shared/bspclean.c
+librtemsbsp_a_SOURCES += ../../shared/sbrk.c
+librtemsbsp_a_SOURCES += ../../shared/setvec.c
+librtemsbsp_a_SOURCES += ../../shared/bootcard.c
+librtemsbsp_a_SOURCES += ../../shared/gnatinstallhandler.c
+librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c
+librtemsbsp_a_SOURCES += ../../shared/bspgetworkarea.c
 librtemsbsp_a_SOURCES += ../../shared/bspreset.c
 
 librtemsbsp_a_SOURCES += console/console.c
diff --git a/c/src/lib/libbsp/bfin/bf537Stamp/Makefile.am b/c/src/lib/libbsp/bfin/bf537Stamp/Makefile.am
index f30d726a68..4bb201ce83 100644
--- a/c/src/lib/libbsp/bfin/bf537Stamp/Makefile.am
+++ b/c/src/lib/libbsp/bfin/bf537Stamp/Makefile.am
@@ -18,12 +18,14 @@ project_lib_DATA += linkcmds
 project_lib_LIBRARIES = librtemsbsp.a
 librtemsbsp_a_SOURCES =
 
-librtemsbsp_a_SOURCES += \
-	startup/bspstart.c \
-	../../shared/bspclean.c ../../shared/sbrk.c ../../shared/setvec.c \
-	../../shared/bootcard.c ../../shared/gnatinstallhandler.c \
-	../../shared/getentropy-cpucounter.c \
-	../../shared/bspgetworkarea.c
+librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../shared/bspclean.c
+librtemsbsp_a_SOURCES += ../../shared/sbrk.c
+librtemsbsp_a_SOURCES += ../../shared/setvec.c
+librtemsbsp_a_SOURCES += ../../shared/bootcard.c
+librtemsbsp_a_SOURCES += ../../shared/gnatinstallhandler.c
+librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c
+librtemsbsp_a_SOURCES += ../../shared/bspgetworkarea.c
 librtemsbsp_a_SOURCES += ../../shared/bspreset.c
 
 librtemsbsp_a_SOURCES += console/console.c
diff --git a/c/src/lib/libbsp/bfin/eZKit533/Makefile.am b/c/src/lib/libbsp/bfin/eZKit533/Makefile.am
index 8246ea9ac9..95650ef894 100644
--- a/c/src/lib/libbsp/bfin/eZKit533/Makefile.am
+++ b/c/src/lib/libbsp/bfin/eZKit533/Makefile.am
@@ -18,12 +18,14 @@ project_lib_DATA += linkcmds
 project_lib_LIBRARIES = librtemsbsp.a
 librtemsbsp_a_SOURCES =
 
-librtemsbsp_a_SOURCES += \
-	startup/bspstart.c \
-	../../shared/bspclean.c ../../shared/sbrk.c ../../shared/setvec.c \
-	../../shared/bootcard.c ../../shared/gnatinstallhandler.c \
-	../../shared/getentropy-cpucounter.c \
-	../../shared/bspgetworkarea.c
+librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../shared/bspclean.c
+librtemsbsp_a_SOURCES += ../../shared/sbrk.c
+librtemsbsp_a_SOURCES += ../../shared/setvec.c
+librtemsbsp_a_SOURCES += ../../shared/bootcard.c
+librtemsbsp_a_SOURCES += ../../shared/gnatinstallhandler.c
+librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c
+librtemsbsp_a_SOURCES += ../../shared/bspgetworkarea.c
 librtemsbsp_a_SOURCES += ../../shared/bspreset.c
 
 librtemsbsp_a_SOURCES += console/console-io.c
diff --git a/c/src/lib/libbsp/i386/pc386/Makefile.am b/c/src/lib/libbsp/i386/pc386/Makefile.am
index 1051c4b67b..c9af4e800d 100644
--- a/c/src/lib/libbsp/i386/pc386/Makefile.am
+++ b/c/src/lib/libbsp/i386/pc386/Makefile.am
@@ -126,7 +126,8 @@ librtemsbsp_a_SOURCES += ../../i386/shared/irq/irq_asm.S
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
 
 # timer
-librtemsbsp_a_SOURCES += timer/timer.c timer/timerisr.S
+librtemsbsp_a_SOURCES += timer/timer.c
+librtemsbsp_a_SOURCES += timer/timerisr.S
 
 if HAS_IDE
 # ide
diff --git a/c/src/lib/libbsp/m32c/m32cbsp/Makefile.am b/c/src/lib/libbsp/m32c/m32cbsp/Makefile.am
index 90d891e03d..770c1c9088 100644
--- a/c/src/lib/libbsp/m32c/m32cbsp/Makefile.am
+++ b/c/src/lib/libbsp/m32c/m32cbsp/Makefile.am
@@ -27,8 +27,10 @@ console_SOURCES = ../../shared/console-polled.c console/console-io.c \
 timer_SOURCES = timer/timer.c
 
 project_lib_LIBRARIES = librtemsbsp.a
-librtemsbsp_a_SOURCES = $(startup_SOURCES) $(clock_SOURCES) $(console_SOURCES) \
-    $(timer_SOURCES)
+librtemsbsp_a_SOURCES = $(startup_SOURCES)
+librtemsbsp_a_SOURCES += $(clock_SOURCES)
+librtemsbsp_a_SOURCES += $(console_SOURCES)
+librtemsbsp_a_SOURCES += $(timer_SOURCES)
 
 # Cache
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/cache/nocache.c
diff --git a/c/src/lib/libbsp/m68k/av5282/Makefile.am b/c/src/lib/libbsp/m68k/av5282/Makefile.am
index 2e350274db..79d56c5d1e 100644
--- a/c/src/lib/libbsp/m68k/av5282/Makefile.am
+++ b/c/src/lib/libbsp/m68k/av5282/Makefile.am
@@ -18,16 +18,20 @@ project_lib_LIBRARIES = librtemsbsp.a
 librtemsbsp_a_SOURCES =
 
 # startup
-librtemsbsp_a_SOURCES += ../../shared/bspclean.c ../../shared/bsppredriverhook.c \
-    ../../shared/bspreset_loop.c \
-    ../../shared/bspgetworkarea.c \
-    startup/init5282.c startup/bspstart.c \
-    ../../shared/bootcard.c \
-    ../../shared/getentropy-cpucounter.c \
-    ../../shared/sbrk.c ../../shared/setvec.c \
-    ../../shared/gnatinstallhandler.c
+librtemsbsp_a_SOURCES += ../../shared/bspclean.c
+librtemsbsp_a_SOURCES += ../../shared/bsppredriverhook.c
+librtemsbsp_a_SOURCES += ../../shared/bspreset_loop.c
+librtemsbsp_a_SOURCES += ../../shared/bspgetworkarea.c
+librtemsbsp_a_SOURCES += startup/init5282.c
+librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../shared/bootcard.c
+librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c
+librtemsbsp_a_SOURCES += ../../shared/sbrk.c
+librtemsbsp_a_SOURCES += ../../shared/setvec.c
+librtemsbsp_a_SOURCES += ../../shared/gnatinstallhandler.c
 # clock
-librtemsbsp_a_SOURCES += clock/clock.c ../../../shared/clockdrv_shell.h
+librtemsbsp_a_SOURCES += clock/clock.c
+librtemsbsp_a_SOURCES += ../../../shared/clockdrv_shell.h
 # console
 librtemsbsp_a_SOURCES += console/console.c
 # timer
diff --git a/c/src/lib/libbsp/m68k/csb360/Makefile.am b/c/src/lib/libbsp/m68k/csb360/Makefile.am
index 1e47dcaa5a..8343ff234e 100644
--- a/c/src/lib/libbsp/m68k/csb360/Makefile.am
+++ b/c/src/lib/libbsp/m68k/csb360/Makefile.am
@@ -18,16 +18,20 @@ project_lib_LIBRARIES = librtemsbsp.a
 librtemsbsp_a_SOURCES =
 
 # startup
-librtemsbsp_a_SOURCES += ../../shared/bspclean.c \
-    ../../shared/bsppredriverhook.c \
-    ../../shared/bspgetworkarea.c \
-    ../../shared/bspstart.c startup/init5272.c ../../shared/bootcard.c \
-    ../../shared/getentropy-cpucounter.c \
-    ../../shared/sbrk.c ../../shared/setvec.c \
-    ../../shared/gnatinstallhandler.c
+librtemsbsp_a_SOURCES += ../../shared/bspclean.c
+librtemsbsp_a_SOURCES += ../../shared/bsppredriverhook.c
+librtemsbsp_a_SOURCES += ../../shared/bspgetworkarea.c
+librtemsbsp_a_SOURCES += ../../shared/bspstart.c
+librtemsbsp_a_SOURCES += startup/init5272.c
+librtemsbsp_a_SOURCES += ../../shared/bootcard.c
+librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c
+librtemsbsp_a_SOURCES += ../../shared/sbrk.c
+librtemsbsp_a_SOURCES += ../../shared/setvec.c
+librtemsbsp_a_SOURCES += ../../shared/gnatinstallhandler.c
 librtemsbsp_a_SOURCES += ../../shared/bspreset.c
 # console
-librtemsbsp_a_SOURCES += console/console-io.c ../../shared/console-polled.c
+librtemsbsp_a_SOURCES += console/console-io.c
+librtemsbsp_a_SOURCES += ../../shared/console-polled.c
 
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/cache/nocache.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/shared/memProbe.c
diff --git a/c/src/lib/libbsp/m68k/gen68340/Makefile.am b/c/src/lib/libbsp/m68k/gen68340/Makefile.am
index c763b19272..d8a9bcf6ba 100644
--- a/c/src/lib/libbsp/m68k/gen68340/Makefile.am
+++ b/c/src/lib/libbsp/m68k/gen68340/Makefile.am
@@ -18,19 +18,24 @@ project_lib_LIBRARIES = librtemsbsp.a
 librtemsbsp_a_SOURCES =
 
 # startup
-librtemsbsp_a_SOURCES += ../../shared/bspclean.c \
-    ../../shared/bsppredriverhook.c ../../shared/bspgetworkarea.c \
-    ../../shared/bspstart.c startup/init68340.c \
-    ../../shared/bootcard.c \
-    ../../shared/getentropy-cpucounter.c \
-    ../../shared/sbrk.c ../../shared/setvec.c \
-    startup/dumpanic.c ../../shared/gnatinstallhandler.c
+librtemsbsp_a_SOURCES += ../../shared/bspclean.c
+librtemsbsp_a_SOURCES += ../../shared/bsppredriverhook.c
+librtemsbsp_a_SOURCES += ../../shared/bspgetworkarea.c
+librtemsbsp_a_SOURCES += ../../shared/bspstart.c
+librtemsbsp_a_SOURCES += startup/init68340.c
+librtemsbsp_a_SOURCES += ../../shared/bootcard.c
+librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c
+librtemsbsp_a_SOURCES += ../../shared/sbrk.c
+librtemsbsp_a_SOURCES += ../../shared/setvec.c
+librtemsbsp_a_SOURCES += startup/dumpanic.c
+librtemsbsp_a_SOURCES += ../../shared/gnatinstallhandler.c
 librtemsbsp_a_SOURCES += ../../shared/bspreset.c
 # clock
 librtemsbsp_a_SOURCES += clock/ckinit.c
 # console
-librtemsbsp_a_SOURCES += console/console.c console/m340uart.c \
-    ../../shared/dummy_printk_support.c
+librtemsbsp_a_SOURCES += console/console.c
+librtemsbsp_a_SOURCES += console/m340uart.c
+librtemsbsp_a_SOURCES += ../../shared/dummy_printk_support.c
 # timer
 librtemsbsp_a_SOURCES += timer/timer.c
 
diff --git a/c/src/lib/libbsp/m68k/gen68360/Makefile.am b/c/src/lib/libbsp/m68k/gen68360/Makefile.am
index a17fe529f1..4c76c1f9e0 100644
--- a/c/src/lib/libbsp/m68k/gen68360/Makefile.am
+++ b/c/src/lib/libbsp/m68k/gen68360/Makefile.am
@@ -20,18 +20,24 @@ project_lib_LIBRARIES = librtemsbsp.a
 librtemsbsp_a_SOURCES =
 
 # startup
-librtemsbsp_a_SOURCES += startup/alloc360.c ../../shared/bspclean.c \
-    ../../shared/bsppredriverhook.c \
-    ../../shared/bspgetworkarea.c ../../shared/bspstart.c \
-    startup/init68360.c ../../shared/bootcard.c \
-    ../../shared/getentropy-cpucounter.c \
-    ../../shared/sbrk.c ../../shared/setvec.c \
-    ../../shared/gnatinstallhandler.c
+librtemsbsp_a_SOURCES += startup/alloc360.c
+librtemsbsp_a_SOURCES += ../../shared/bspclean.c
+librtemsbsp_a_SOURCES += ../../shared/bsppredriverhook.c
+librtemsbsp_a_SOURCES += ../../shared/bspgetworkarea.c
+librtemsbsp_a_SOURCES += ../../shared/bspstart.c
+librtemsbsp_a_SOURCES += startup/init68360.c
+librtemsbsp_a_SOURCES += ../../shared/bootcard.c
+librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c
+librtemsbsp_a_SOURCES += ../../shared/sbrk.c
+librtemsbsp_a_SOURCES += ../../shared/setvec.c
+librtemsbsp_a_SOURCES += ../../shared/gnatinstallhandler.c
 librtemsbsp_a_SOURCES += ../../shared/bspreset.c
 # clock
-librtemsbsp_a_SOURCES += clock/clock.c ../../../shared/clockdrv_shell.h
+librtemsbsp_a_SOURCES += clock/clock.c
+librtemsbsp_a_SOURCES += ../../../shared/clockdrv_shell.h
 # console
-librtemsbsp_a_SOURCES += console/console.c ../../shared/dummy_printk_support.c
+librtemsbsp_a_SOURCES += console/console.c
+librtemsbsp_a_SOURCES += ../../shared/dummy_printk_support.c
 # timer
 librtemsbsp_a_SOURCES += timer/timer.c
 
diff --git a/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am b/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am
index 8064d3abd4..05b7981401 100644
--- a/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am
+++ b/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am
@@ -22,15 +22,20 @@ librtemsbsp_a_SOURCES =
 librtemsbsp_a_CPPFLAGS = $(AM_CPPFLAGS)
 
 # startup
-librtemsbsp_a_SOURCES += \
-  ../../shared/bspclean.c ../../shared/bspgetworkarea.c \
-  ../../shared/bspreset_loop.c \
-  ../../shared/bsppredriverhook.c startup/init548x.c startup/bspstart.c \
-  ../../shared/bootcard.c ../../shared/sbrk.c ../../shared/setvec.c \
-  ../../shared/getentropy-cpucounter.c \
-  ../../shared/gnatinstallhandler.c
+librtemsbsp_a_SOURCES += ../../shared/bspclean.c
+librtemsbsp_a_SOURCES += ../../shared/bspgetworkarea.c
+librtemsbsp_a_SOURCES += ../../shared/bspreset_loop.c
+librtemsbsp_a_SOURCES += ../../shared/bsppredriverhook.c
+librtemsbsp_a_SOURCES += startup/init548x.c
+librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../shared/bootcard.c
+librtemsbsp_a_SOURCES += ../../shared/sbrk.c
+librtemsbsp_a_SOURCES += ../../shared/setvec.c
+librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c
+librtemsbsp_a_SOURCES += ../../shared/gnatinstallhandler.c
 # clock
-librtemsbsp_a_SOURCES += clock/clock.c ../../../shared/clockdrv_shell.h
+librtemsbsp_a_SOURCES += clock/clock.c
+librtemsbsp_a_SOURCES += ../../../shared/clockdrv_shell.h
 # console
 librtemsbsp_a_SOURCES += console/console.c
 # timer
diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am b/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am
index e1b45ce147..854144bdfd 100644
--- a/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am
@@ -23,19 +23,27 @@ project_lib_LIBRARIES = librtemsbsp.a
 librtemsbsp_a_SOURCES =
 
 # startup
-librtemsbsp_a_SOURCES += ../../shared/bspclean.c \
-    ../../shared/bsppredriverhook.c ../../shared/bspgetworkarea.c \
-    ../../shared/bspstart.c startup/init5206e.c ../../shared/bootcard.c \
-    ../../shared/getentropy-cpucounter.c \
-    ../../shared/sbrk.c ../../shared/setvec.c \
-    ../../shared/gnatinstallhandler.c
+librtemsbsp_a_SOURCES += ../../shared/bspclean.c
+librtemsbsp_a_SOURCES += ../../shared/bsppredriverhook.c
+librtemsbsp_a_SOURCES += ../../shared/bspgetworkarea.c
+librtemsbsp_a_SOURCES += ../../shared/bspstart.c
+librtemsbsp_a_SOURCES += startup/init5206e.c
+librtemsbsp_a_SOURCES += ../../shared/bootcard.c
+librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c
+librtemsbsp_a_SOURCES += ../../shared/sbrk.c
+librtemsbsp_a_SOURCES += ../../shared/setvec.c
+librtemsbsp_a_SOURCES += ../../shared/gnatinstallhandler.c
 librtemsbsp_a_SOURCES += ../../shared/bspreset.c
 # console
-librtemsbsp_a_SOURCES += console/console.c ../../shared/dummy_printk_support.c
+librtemsbsp_a_SOURCES += console/console.c
+librtemsbsp_a_SOURCES += ../../shared/dummy_printk_support.c
 # i2c
-librtemsbsp_a_SOURCES += i2c/i2c.c i2c/i2cdrv.c
+librtemsbsp_a_SOURCES += i2c/i2c.c
+librtemsbsp_a_SOURCES += i2c/i2cdrv.c
 # tod
-librtemsbsp_a_SOURCES += tod/ds1307.c tod/todcfg.c ../../shared/tod.c
+librtemsbsp_a_SOURCES += tod/ds1307.c
+librtemsbsp_a_SOURCES += tod/todcfg.c
+librtemsbsp_a_SOURCES += ../../shared/tod.c
 # nvram
 librtemsbsp_a_SOURCES += nvram/nvram.c
 
diff --git a/c/src/lib/libbsp/m68k/mcf52235/Makefile.am b/c/src/lib/libbsp/m68k/mcf52235/Makefile.am
index 283291c516..5256c4acd3 100644
--- a/c/src/lib/libbsp/m68k/mcf52235/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mcf52235/Makefile.am
@@ -18,16 +18,22 @@ project_lib_LIBRARIES = librtemsbsp.a
 librtemsbsp_a_SOURCES =
 
 # startup
-librtemsbsp_a_SOURCES += ../../shared/bspclean.c ../../shared/bsppredriverhook.c \
-    ../../shared/bspreset_loop.c \
-    ../../shared/bspgetworkarea.c \
-    startup/init52235.c ../../shared/bspstart.c startup/cfinit.c \
-    startup/bspgetcpuclockspeed.c ../../shared/bootcard.c \
-    ../../shared/getentropy-cpucounter.c \
-    ../../shared/sbrk.c ../../shared/setvec.c \
-    ../../shared/gnatinstallhandler.c
+librtemsbsp_a_SOURCES += ../../shared/bspclean.c
+librtemsbsp_a_SOURCES += ../../shared/bsppredriverhook.c
+librtemsbsp_a_SOURCES += ../../shared/bspreset_loop.c
+librtemsbsp_a_SOURCES += ../../shared/bspgetworkarea.c
+librtemsbsp_a_SOURCES += startup/init52235.c
+librtemsbsp_a_SOURCES += ../../shared/bspstart.c
+librtemsbsp_a_SOURCES += startup/cfinit.c
+librtemsbsp_a_SOURCES += startup/bspgetcpuclockspeed.c
+librtemsbsp_a_SOURCES += ../../shared/bootcard.c
+librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c
+librtemsbsp_a_SOURCES += ../../shared/sbrk.c
+librtemsbsp_a_SOURCES += ../../shared/setvec.c
+librtemsbsp_a_SOURCES += ../../shared/gnatinstallhandler.c
 # clock
-librtemsbsp_a_SOURCES += clock/clock.c ../../../shared/clockdrv_shell.h
+librtemsbsp_a_SOURCES += clock/clock.c
+librtemsbsp_a_SOURCES += ../../../shared/clockdrv_shell.h
 # console
 librtemsbsp_a_SOURCES += console/console.c
 # debugio
diff --git a/c/src/lib/libbsp/m68k/mcf5225x/Makefile.am b/c/src/lib/libbsp/m68k/mcf5225x/Makefile.am
index d8aa813f3e..2fc7362a22 100644
--- a/c/src/lib/libbsp/m68k/mcf5225x/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mcf5225x/Makefile.am
@@ -15,16 +15,17 @@ project_lib_DATA = start.$(OBJEXT)
 project_lib_DATA += linkcmds
 
 project_lib_LIBRARIES = librtemsbsp.a
-librtemsbsp_a_SOURCES = \
-    ../../shared/bspclean.c \
-    ../../shared/bspreset_loop.c \
-    ../../shared/bsppredriverhook.c \
-    ../../shared/bspgetworkarea.c \
-    startup/init5225x.c startup/bspstart.c \
-    ../../shared/bootcard.c \
-    ../../shared/getentropy-cpucounter.c \
-    ../../shared/sbrk.c ../../shared/setvec.c \
-    ../../shared/gnatinstallhandler.c
+librtemsbsp_a_SOURCES = ../../shared/bspclean.c
+librtemsbsp_a_SOURCES += ../../shared/bspreset_loop.c
+librtemsbsp_a_SOURCES += ../../shared/bsppredriverhook.c
+librtemsbsp_a_SOURCES += ../../shared/bspgetworkarea.c
+librtemsbsp_a_SOURCES += startup/init5225x.c
+librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../shared/bootcard.c
+librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c
+librtemsbsp_a_SOURCES += ../../shared/sbrk.c
+librtemsbsp_a_SOURCES += ../../shared/setvec.c
+librtemsbsp_a_SOURCES += ../../shared/gnatinstallhandler.c
 librtemsbsp_a_SOURCES += clock/clock.c
 librtemsbsp_a_SOURCES += console/console.c
 librtemsbsp_a_SOURCES += console/debugio.c
diff --git a/c/src/lib/libbsp/m68k/mcf5235/Makefile.am b/c/src/lib/libbsp/m68k/mcf5235/Makefile.am
index 4a7a47f788..35e4dfe9a4 100644
--- a/c/src/lib/libbsp/m68k/mcf5235/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mcf5235/Makefile.am
@@ -20,16 +20,22 @@ project_lib_LIBRARIES = librtemsbsp.a
 librtemsbsp_a_SOURCES =
 
 # startup
-librtemsbsp_a_SOURCES += ../../shared/bspclean.c ../../shared/bsppredriverhook.c \
-    ../../shared/bspreset_loop.c \
-    startup/bspgetcpuclockspeed.c \
-    ../../shared/bspgetworkarea.c startup/init5235.c startup/bspstart.c \
-    ../../shared/bootcard.c ../../shared/sbrk.c ../../shared/setvec.c \
-    ../../shared/getentropy-cpucounter.c \
-    ../../shared/gnatinstallhandler.c \
-    startup/copyvectors.c
+librtemsbsp_a_SOURCES += ../../shared/bspclean.c
+librtemsbsp_a_SOURCES += ../../shared/bsppredriverhook.c
+librtemsbsp_a_SOURCES += ../../shared/bspreset_loop.c
+librtemsbsp_a_SOURCES += startup/bspgetcpuclockspeed.c
+librtemsbsp_a_SOURCES += ../../shared/bspgetworkarea.c
+librtemsbsp_a_SOURCES += startup/init5235.c
+librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../shared/bootcard.c
+librtemsbsp_a_SOURCES += ../../shared/sbrk.c
+librtemsbsp_a_SOURCES += ../../shared/setvec.c
+librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c
+librtemsbsp_a_SOURCES += ../../shared/gnatinstallhandler.c
+librtemsbsp_a_SOURCES += startup/copyvectors.c
 # clock
-librtemsbsp_a_SOURCES += clock/clock.c ../../../shared/clockdrv_shell.h
+librtemsbsp_a_SOURCES += clock/clock.c
+librtemsbsp_a_SOURCES += ../../../shared/clockdrv_shell.h
 # console
 librtemsbsp_a_SOURCES += console/console.c
 # timer
diff --git a/c/src/lib/libbsp/m68k/mcf5329/Makefile.am b/c/src/lib/libbsp/m68k/mcf5329/Makefile.am
index 0c73683081..2fc6bb9024 100644
--- a/c/src/lib/libbsp/m68k/mcf5329/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mcf5329/Makefile.am
@@ -19,16 +19,21 @@ project_lib_LIBRARIES = librtemsbsp.a
 librtemsbsp_a_SOURCES =
 
 # startup
-librtemsbsp_a_SOURCES += ../../shared/bspclean.c ../../shared/bsppredriverhook.c \
-    ../../shared/bspreset_loop.c \
-    ../../shared/bspgetworkarea.c \
-    startup/init5329.c startup/bspstart.c startup/cfinit.c\
-    ../../shared/bootcard.c \
-    ../../shared/getentropy-cpucounter.c \
-    ../../shared/sbrk.c ../../shared/setvec.c \
-    ../../shared/gnatinstallhandler.c
+librtemsbsp_a_SOURCES += ../../shared/bspclean.c
+librtemsbsp_a_SOURCES += ../../shared/bsppredriverhook.c
+librtemsbsp_a_SOURCES += ../../shared/bspreset_loop.c
+librtemsbsp_a_SOURCES += ../../shared/bspgetworkarea.c
+librtemsbsp_a_SOURCES += startup/init5329.c
+librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += startup/cfinit.c
+librtemsbsp_a_SOURCES += ../../shared/bootcard.c
+librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c
+librtemsbsp_a_SOURCES += ../../shared/sbrk.c
+librtemsbsp_a_SOURCES += ../../shared/setvec.c
+librtemsbsp_a_SOURCES += ../../shared/gnatinstallhandler.c
 # clock
-librtemsbsp_a_SOURCES += clock/clock.c ../../../shared/clockdrv_shell.h
+librtemsbsp_a_SOURCES += clock/clock.c
+librtemsbsp_a_SOURCES += ../../../shared/clockdrv_shell.h
 # console
 librtemsbsp_a_SOURCES += console/console.c
 # timer
diff --git a/c/src/lib/libbsp/m68k/mrm332/Makefile.am b/c/src/lib/libbsp/m68k/mrm332/Makefile.am
index 26c32f37da..c3e877214c 100644
--- a/c/src/lib/libbsp/m68k/mrm332/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mrm332/Makefile.am
@@ -17,18 +17,23 @@ project_lib_LIBRARIES = librtemsbsp.a
 librtemsbsp_a_SOURCES =
 
 # startup
-librtemsbsp_a_SOURCES += startup/start_c.c \
-    ../../shared/bspstart.c startup/bsppredriverhook.c \
-    ../../shared/bootcard.c ../../shared/sbrk.c \
-    ../../shared/getentropy-cpucounter.c \
-    ../../shared/bspclean.c \
-    ../../shared/setvec.c \
-    ../../shared/bspgetworkarea.c ../../shared/gnatinstallhandler.c 
+librtemsbsp_a_SOURCES += startup/start_c.c
+librtemsbsp_a_SOURCES += ../../shared/bspstart.c
+librtemsbsp_a_SOURCES += startup/bsppredriverhook.c
+librtemsbsp_a_SOURCES += ../../shared/bootcard.c
+librtemsbsp_a_SOURCES += ../../shared/sbrk.c
+librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c
+librtemsbsp_a_SOURCES += ../../shared/bspclean.c
+librtemsbsp_a_SOURCES += ../../shared/setvec.c
+librtemsbsp_a_SOURCES += ../../shared/bspgetworkarea.c
+librtemsbsp_a_SOURCES += ../../shared/gnatinstallhandler.c 
 librtemsbsp_a_SOURCES += ../../shared/bspreset.c
 # clock
 librtemsbsp_a_SOURCES += clock/ckinit.c
 # console
-librtemsbsp_a_SOURCES += console/console.c console/sci.c console/sci.h
+librtemsbsp_a_SOURCES += console/console.c
+librtemsbsp_a_SOURCES += console/sci.c
+librtemsbsp_a_SOURCES += console/sci.h
 # spurious
 librtemsbsp_a_SOURCES += spurious/spinit.c
 # timer
diff --git a/c/src/lib/libbsp/m68k/mvme147/Makefile.am b/c/src/lib/libbsp/m68k/mvme147/Makefile.am
index f15f5376db..0371dacc2c 100644
--- a/c/src/lib/libbsp/m68k/mvme147/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme147/Makefile.am
@@ -20,19 +20,24 @@ project_lib_LIBRARIES = librtemsbsp.a
 librtemsbsp_a_SOURCES =
 
 # startup
-librtemsbsp_a_SOURCES += startup/bspclean.c \
-    startup/bspstart.c ../../shared/bootcard.c \
-    ../../shared/getentropy-cpucounter.c \
-    ../../shared/bsppredriverhook.c \
-    ../../shared/bspgetworkarea.c ../../shared/sbrk.c \
-    ../../shared/setvec.c ../../shared/gnatinstallhandler.c
+librtemsbsp_a_SOURCES += startup/bspclean.c
+librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../shared/bootcard.c
+librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c
+librtemsbsp_a_SOURCES += ../../shared/bsppredriverhook.c
+librtemsbsp_a_SOURCES += ../../shared/bspgetworkarea.c
+librtemsbsp_a_SOURCES += ../../shared/sbrk.c
+librtemsbsp_a_SOURCES += ../../shared/setvec.c
+librtemsbsp_a_SOURCES += ../../shared/gnatinstallhandler.c
 librtemsbsp_a_SOURCES += ../../shared/bspreset.c
 # clock
 librtemsbsp_a_SOURCES += clock/ckinit.c
 # console
-librtemsbsp_a_SOURCES += console/console.c ../../shared/dummy_printk_support.c
+librtemsbsp_a_SOURCES += console/console.c
+librtemsbsp_a_SOURCES += ../../shared/dummy_printk_support.c
 # timer
-librtemsbsp_a_SOURCES += timer/timer.c timer/timerisr.S
+librtemsbsp_a_SOURCES += timer/timer.c
+librtemsbsp_a_SOURCES += timer/timerisr.S
 
 librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/shared/cache/cache.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/shared/m68kidle.c
diff --git a/c/src/lib/libbsp/m68k/mvme147s/Makefile.am b/c/src/lib/libbsp/m68k/mvme147s/Makefile.am
index 08dbc6639b..562f5b04e7 100644
--- a/c/src/lib/libbsp/m68k/mvme147s/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme147s/Makefile.am
@@ -20,26 +20,32 @@ project_lib_LIBRARIES = librtemsbsp.a
 librtemsbsp_a_SOURCES =
 
 # startup
-librtemsbsp_a_SOURCES += ../../shared/bspclean.c \
-    ../../shared/bsppredriverhook.c \
-    startup/bspstart.c ../../shared/bootcard.c \
-    ../../shared/getentropy-cpucounter.c \
-    ../../shared/setvec.c \
-    ../../shared/bspgetworkarea.c ../../shared/setvec.c \
-    ../../shared/sbrk.c ../../shared/gnatinstallhandler.c
+librtemsbsp_a_SOURCES += ../../shared/bspclean.c
+librtemsbsp_a_SOURCES += ../../shared/bsppredriverhook.c
+librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../shared/bootcard.c
+librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c
+librtemsbsp_a_SOURCES += ../../shared/setvec.c
+librtemsbsp_a_SOURCES += ../../shared/bspgetworkarea.c
+librtemsbsp_a_SOURCES += ../../shared/setvec.c
+librtemsbsp_a_SOURCES += ../../shared/sbrk.c
+librtemsbsp_a_SOURCES += ../../shared/gnatinstallhandler.c
 librtemsbsp_a_SOURCES += ../../shared/bspreset.c
 # clock
 librtemsbsp_a_SOURCES += ../mvme147/clock/ckinit.c
 # console
-librtemsbsp_a_SOURCES += ../mvme147/console/console.c \
-    ../../shared/dummy_printk_support.c
+librtemsbsp_a_SOURCES += ../mvme147/console/console.c
+librtemsbsp_a_SOURCES += ../../shared/dummy_printk_support.c
 # timer
-librtemsbsp_a_SOURCES += ../mvme147/timer/timer.c ../mvme147/timer/timerisr.S
+librtemsbsp_a_SOURCES += ../mvme147/timer/timer.c
+librtemsbsp_a_SOURCES += ../mvme147/timer/timerisr.S
 
 if HAS_MP
 # shmsupp
-librtemsbsp_a_SOURCES += shmsupp/addrconv.c shmsupp/getcfg.c shmsupp/lock.c \
-    shmsupp/mpisr.c
+librtemsbsp_a_SOURCES += shmsupp/addrconv.c
+librtemsbsp_a_SOURCES += shmsupp/getcfg.c
+librtemsbsp_a_SOURCES += shmsupp/lock.c
+librtemsbsp_a_SOURCES += shmsupp/mpisr.c
 endif
 
 librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/shared/cache/cache.c
diff --git a/c/src/lib/libbsp/m68k/mvme162/Makefile.am b/c/src/lib/libbsp/m68k/mvme162/Makefile.am
index fcb9e83fe8..7861b48974 100644
--- a/c/src/lib/libbsp/m68k/mvme162/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme162/Makefile.am
@@ -19,21 +19,25 @@ project_lib_LIBRARIES = librtemsbsp.a
 librtemsbsp_a_SOURCES =
 
 # startup
-librtemsbsp_a_SOURCES += startup/bspclean.c \
-    ../../shared/bsppredriverhook.c \
-    startup/bspstart.c ../../shared/bootcard.c  \
-    ../../shared/getentropy-cpucounter.c \
-    startup/page_table.c \
-    ../../shared/bspgetworkarea.c startup/page_table.c \
-    ../../shared/sbrk.c ../../shared/setvec.c \
-    ../../shared/gnatinstallhandler.c
+librtemsbsp_a_SOURCES += startup/bspclean.c
+librtemsbsp_a_SOURCES += ../../shared/bsppredriverhook.c
+librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../shared/bootcard.c
+librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c
+librtemsbsp_a_SOURCES += startup/page_table.c
+librtemsbsp_a_SOURCES += ../../shared/bspgetworkarea.c
+librtemsbsp_a_SOURCES += startup/page_table.c
+librtemsbsp_a_SOURCES += ../../shared/sbrk.c
+librtemsbsp_a_SOURCES += ../../shared/setvec.c
+librtemsbsp_a_SOURCES += ../../shared/gnatinstallhandler.c
 librtemsbsp_a_SOURCES += ../../shared/bspreset.c
 # clock
 librtemsbsp_a_SOURCES += clock/ckinit.c
 # console
 librtemsbsp_a_SOURCES += console/console.c
 # timer
-librtemsbsp_a_SOURCES += timer/timer.c timer/timerisr.S
+librtemsbsp_a_SOURCES += timer/timer.c
+librtemsbsp_a_SOURCES += timer/timerisr.S
 # tod
 librtemsbsp_a_SOURCES += tod/tod.c
 
diff --git a/c/src/lib/libbsp/m68k/mvme167/Makefile.am b/c/src/lib/libbsp/m68k/mvme167/Makefile.am
index 43a3f96477..24a917a272 100644
--- a/c/src/lib/libbsp/m68k/mvme167/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme167/Makefile.am
@@ -18,21 +18,25 @@ project_lib_LIBRARIES = librtemsbsp.a
 librtemsbsp_a_SOURCES =
 
 # startup
-librtemsbsp_a_SOURCES += startup/bspclean.c \
-    ../../shared/bsppredriverhook.c \
-    ../../shared/bspgetworkarea.c \
-    startup/bspstart.c ../../shared/bootcard.c \
-    ../../shared/getentropy-cpucounter.c \
-    startup/page_table.c \
-    ../../shared/sbrk.c ../../shared/setvec.c \
-    ../../shared/gnatinstallhandler.c
+librtemsbsp_a_SOURCES += startup/bspclean.c
+librtemsbsp_a_SOURCES += ../../shared/bsppredriverhook.c
+librtemsbsp_a_SOURCES += ../../shared/bspgetworkarea.c
+librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../shared/bootcard.c
+librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c
+librtemsbsp_a_SOURCES += startup/page_table.c
+librtemsbsp_a_SOURCES += ../../shared/sbrk.c
+librtemsbsp_a_SOURCES += ../../shared/setvec.c
+librtemsbsp_a_SOURCES += ../../shared/gnatinstallhandler.c
 librtemsbsp_a_SOURCES += ../../shared/bspreset.c
 # clock
 librtemsbsp_a_SOURCES += clock/ckinit.c
 # console
-librtemsbsp_a_SOURCES += console/console.c console/console-recording.h
+librtemsbsp_a_SOURCES += console/console.c
+librtemsbsp_a_SOURCES += console/console-recording.h
 # timer
-librtemsbsp_a_SOURCES += timer/timer.c timer/timerisr.S
+librtemsbsp_a_SOURCES += timer/timer.c
+librtemsbsp_a_SOURCES += timer/timerisr.S
 
 if HAS_NETWORKING
 librtemsbsp_a_SOURCES += network/network.c
diff --git a/c/src/lib/libbsp/m68k/uC5282/Makefile.am b/c/src/lib/libbsp/m68k/uC5282/Makefile.am
index 5ca681813b..71d0be151b 100644
--- a/c/src/lib/libbsp/m68k/uC5282/Makefile.am
+++ b/c/src/lib/libbsp/m68k/uC5282/Makefile.am
@@ -18,15 +18,20 @@ project_lib_LIBRARIES = librtemsbsp.a
 librtemsbsp_a_SOURCES =
 
 # startup
-librtemsbsp_a_SOURCES += startup/bspclean.c startup/bspreset.c \
-    ../../shared/bsppredriverhook.c \
-    ../../shared/bspgetworkarea.c \
-    startup/init5282.c startup/bspstart.c ../../shared/bootcard.c \
-    ../../shared/getentropy-cpucounter.c \
-    ../../shared/sbrk.c ../../shared/setvec.c \
-    ../../shared/gnatinstallhandler.c
+librtemsbsp_a_SOURCES += startup/bspclean.c
+librtemsbsp_a_SOURCES += startup/bspreset.c
+librtemsbsp_a_SOURCES += ../../shared/bsppredriverhook.c
+librtemsbsp_a_SOURCES += ../../shared/bspgetworkarea.c
+librtemsbsp_a_SOURCES += startup/init5282.c
+librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../shared/bootcard.c
+librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c
+librtemsbsp_a_SOURCES += ../../shared/sbrk.c
+librtemsbsp_a_SOURCES += ../../shared/setvec.c
+librtemsbsp_a_SOURCES += ../../shared/gnatinstallhandler.c
 # clock
-librtemsbsp_a_SOURCES += clock/clock.c ../../../clockdrv_shell.h
+librtemsbsp_a_SOURCES += clock/clock.c
+librtemsbsp_a_SOURCES += ../../../clockdrv_shell.h
 # console
 librtemsbsp_a_SOURCES += console/console.c
 # timer
diff --git a/c/src/lib/libbsp/moxie/moxiesim/Makefile.am b/c/src/lib/libbsp/moxie/moxiesim/Makefile.am
index 93ef529586..46562ebcfd 100644
--- a/c/src/lib/libbsp/moxie/moxiesim/Makefile.am
+++ b/c/src/lib/libbsp/moxie/moxiesim/Makefile.am
@@ -21,18 +21,21 @@ project_lib_LIBRARIES = librtemsbsp.a
 librtemsbsp_a_SOURCES =
 
 # startup
-librtemsbsp_a_SOURCES += ../../shared/bspclean.c \
-    ../../shared/bsppredriverhook.c \
-    ../../shared/bspgetworkarea.c \
-    ../../shared/bspstart.c ../../shared/bootcard.c ../../shared/sbrk.c \
-    ../../shared/getentropy-cpucounter.c \
-    ../../shared/gnatinstallhandler.c
+librtemsbsp_a_SOURCES += ../../shared/bspclean.c
+librtemsbsp_a_SOURCES += ../../shared/bsppredriverhook.c
+librtemsbsp_a_SOURCES += ../../shared/bspgetworkarea.c
+librtemsbsp_a_SOURCES += ../../shared/bspstart.c
+librtemsbsp_a_SOURCES += ../../shared/bootcard.c
+librtemsbsp_a_SOURCES += ../../shared/sbrk.c
+librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c
+librtemsbsp_a_SOURCES += ../../shared/gnatinstallhandler.c
 librtemsbsp_a_SOURCES += ../../shared/bspreset.c
 # clock
 librtemsbsp_a_SOURCES += ../../shared/clock_driver_simidle.c
 # console
-librtemsbsp_a_SOURCES += ../../shared/console-polled.c console/console-io.c \
-   console/syscalls.S
+librtemsbsp_a_SOURCES += ../../shared/console-polled.c
+librtemsbsp_a_SOURCES += console/console-io.c
+librtemsbsp_a_SOURCES += console/syscalls.S
 # timer
 librtemsbsp_a_SOURCES += ../../shared/timerstub.c
 
diff --git a/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am b/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am
index 0bd4412fa3..af4c20a0b9 100644
--- a/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am
+++ b/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am
@@ -32,9 +32,11 @@ librtemsbsp_a_SOURCES += ../../shared/gnatinstallhandler.c
 librtemsbsp_a_SOURCES += ../../shared/bsppredriverhook.c
 
 # clock
-librtemsbsp_a_SOURCES += clock/clock.c ../../../shared/clockdrv_shell.h
+librtemsbsp_a_SOURCES += clock/clock.c
+librtemsbsp_a_SOURCES += ../../../shared/clockdrv_shell.h
 # console
-librtemsbsp_a_SOURCES += console/console.c ../../shared/console-polled.c
+librtemsbsp_a_SOURCES += console/console.c
+librtemsbsp_a_SOURCES += ../../shared/console-polled.c
 # timer
 librtemsbsp_a_SOURCES += timer/timer.c
 
diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/Makefile.am b/c/src/lib/libbsp/no_cpu/no_bsp/Makefile.am
index bf730ea8a2..d5f8362389 100644
--- a/c/src/lib/libbsp/no_cpu/no_bsp/Makefile.am
+++ b/c/src/lib/libbsp/no_cpu/no_bsp/Makefile.am
@@ -13,22 +13,28 @@ project_lib_LIBRARIES = librtemsbsp.a
 librtemsbsp_a_SOURCES =
 
 # startup
-librtemsbsp_a_SOURCES += ../../shared/bspclean.c \
-    ../../shared/bsppredriverhook.c \
-    ../../shared/startup/bspgetworkarea.c \
-    startup/bspstart.c ../../shared/bootcard.c ../../shared/sbrk.c \
-    ../../shared/getentropy-cpucounter.c \
-    startup/setvec.c ../../shared/gnatinstallhandler.c
+librtemsbsp_a_SOURCES += ../../shared/bspclean.c
+librtemsbsp_a_SOURCES += ../../shared/bsppredriverhook.c
+librtemsbsp_a_SOURCES += ../../shared/startup/bspgetworkarea.c
+librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../shared/bootcard.c
+librtemsbsp_a_SOURCES += ../../shared/sbrk.c
+librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c
+librtemsbsp_a_SOURCES += startup/setvec.c
+librtemsbsp_a_SOURCES += ../../shared/gnatinstallhandler.c
 librtemsbsp_a_SOURCES += ../../shared/bspreset.c
 # clock
 librtemsbsp_a_SOURCES += clock/ckinit.c
 # console
 librtemsbsp_a_SOURCES += console/console.c
 # timer
-librtemsbsp_a_SOURCES += timer/timer.c timer/timerisr.c
+librtemsbsp_a_SOURCES += timer/timer.c
+librtemsbsp_a_SOURCES += timer/timerisr.c
 # shmsupp
-librtemsbsp_a_SOURCES += shmsupp/addrconv.c shmsupp/getcfg.c shmsupp/lock.c \
-    shmsupp/mpisr.c
+librtemsbsp_a_SOURCES += shmsupp/addrconv.c
+librtemsbsp_a_SOURCES += shmsupp/getcfg.c
+librtemsbsp_a_SOURCES += shmsupp/lock.c
+librtemsbsp_a_SOURCES += shmsupp/mpisr.c
 
 
 include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/or1k/generic_or1k/Makefile.am b/c/src/lib/libbsp/or1k/generic_or1k/Makefile.am
index 63ce7ae797..4da4d1dd64 100644
--- a/c/src/lib/libbsp/or1k/generic_or1k/Makefile.am
+++ b/c/src/lib/libbsp/or1k/generic_or1k/Makefile.am
@@ -61,7 +61,8 @@ librtemsbsp_a_SOURCES += console/uart.c
 librtemsbsp_a_SOURCES += timer/timer.c
 
 # clock
-librtemsbsp_a_SOURCES += clock/clockdrv.c ../../../shared/clockdrv_shell.h
+librtemsbsp_a_SOURCES += clock/clockdrv.c
+librtemsbsp_a_SOURCES += ../../../shared/clockdrv_shell.h
 
 # IRQ
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
diff --git a/c/src/lib/libbsp/powerpc/beatnik/Makefile.am b/c/src/lib/libbsp/powerpc/beatnik/Makefile.am
index 74e1c8fea1..cc7a004c8c 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/beatnik/Makefile.am
@@ -41,44 +41,51 @@ dist_project_lib_DATA += ../shared/startup/linkcmds.share
 project_lib_LIBRARIES = librtemsbsp.a
 librtemsbsp_a_SOURCES =
 
-librtemsbsp_a_SOURCES += startup/bspstart.c \
-    ../shared/motorola/vpd.c startup/bspreset.c startup/i2c_init.c \
-    ../../powerpc/shared/startup/bspgetworkarea.c \
-    ../../powerpc/shared/startup/probeMemEnd.c \
-    ../../powerpc/shared/startup/bsppredriverhook.c \
-    ../../powerpc/shared/startup/zerobss.c \
-    ../../powerpc/shared/startup/pgtbl_setup.c \
-    ../../powerpc/shared/startup/pgtbl_activate.c \
-    ../../powerpc/shared/startup/sbrk.c ../../shared/bootcard.c \
-    ../../shared/getentropy-cpucounter.c \
-    startup/bspclean.c \
-    ../../shared/gnatinstallhandler.c
+librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += ../shared/motorola/vpd.c
+librtemsbsp_a_SOURCES += startup/bspreset.c
+librtemsbsp_a_SOURCES += startup/i2c_init.c
+librtemsbsp_a_SOURCES += ../../powerpc/shared/startup/bspgetworkarea.c
+librtemsbsp_a_SOURCES += ../../powerpc/shared/startup/probeMemEnd.c
+librtemsbsp_a_SOURCES += ../../powerpc/shared/startup/bsppredriverhook.c
+librtemsbsp_a_SOURCES += ../../powerpc/shared/startup/zerobss.c
+librtemsbsp_a_SOURCES += ../../powerpc/shared/startup/pgtbl_setup.c
+librtemsbsp_a_SOURCES += ../../powerpc/shared/startup/pgtbl_activate.c
+librtemsbsp_a_SOURCES += ../../powerpc/shared/startup/sbrk.c
+librtemsbsp_a_SOURCES += ../../shared/bootcard.c
+librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c
+librtemsbsp_a_SOURCES += startup/bspclean.c
+librtemsbsp_a_SOURCES += ../../shared/gnatinstallhandler.c
 
 #pclock
 librtemsbsp_a_SOURCES += ../../powerpc/shared/clock/p_clock.c
 
 #console
-librtemsbsp_a_SOURCES +=  \
-    ../../powerpc/shared/console/uart.c \
-    ../../powerpc/shared/console/console.c \
-    ../../powerpc/shared/console/consoleIo.h \
-    ../../powerpc/shared/console/uart.h
+librtemsbsp_a_SOURCES += ../../powerpc/shared/console/uart.c
+librtemsbsp_a_SOURCES += ../../powerpc/shared/console/console.c
+librtemsbsp_a_SOURCES += ../../powerpc/shared/console/consoleIo.h
+librtemsbsp_a_SOURCES += ../../powerpc/shared/console/uart.h
 
 #irq
-librtemsbsp_a_SOURCES += irq/irq_init.c irq/discovery_pic.c 
+librtemsbsp_a_SOURCES += irq/irq_init.c
+librtemsbsp_a_SOURCES += irq/discovery_pic.c 
 
 #marvell
-librtemsbsp_a_SOURCES += marvell/discovery.c marvell/gti2c.c marvell/gt_timer.c
+librtemsbsp_a_SOURCES += marvell/discovery.c
+librtemsbsp_a_SOURCES += marvell/gti2c.c
+librtemsbsp_a_SOURCES += marvell/gt_timer.c
 
 #flash
-librtemsbsp_a_SOURCES += ../shared/flash/flash.c \
-    ../shared/flash/intelFlash.c \
-    flash/flashcfg.c
+librtemsbsp_a_SOURCES += ../shared/flash/flash.c
+librtemsbsp_a_SOURCES += ../shared/flash/intelFlash.c
+librtemsbsp_a_SOURCES += flash/flashcfg.c
 
 #pci
-librtemsbsp_a_SOURCES += ../../powerpc/shared/pci/pci.c \
-    pci/gt_pci_init.c pci/pci_io_remap.c pci/motload_fixup.c \
-    ../../powerpc/shared/pci/pcifinddevice.c
+librtemsbsp_a_SOURCES += ../../powerpc/shared/pci/pci.c
+librtemsbsp_a_SOURCES += pci/gt_pci_init.c
+librtemsbsp_a_SOURCES += pci/pci_io_remap.c
+librtemsbsp_a_SOURCES += pci/motload_fixup.c
+librtemsbsp_a_SOURCES += ../../powerpc/shared/pci/pcifinddevice.c
 
 #network
 if HAS_NETWORKING
@@ -93,7 +100,8 @@ librtemsbsp_a_SOURCES += network/support/early_link_status.c
 endif
 
 # tod
-librtemsbsp_a_SOURCES += ../../shared/tod.c tod/todcfg.c
+librtemsbsp_a_SOURCES += ../../shared/tod.c
+librtemsbsp_a_SOURCES += tod/todcfg.c
 
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/altivec/vec_sup.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/altivec/vec_sup_asm.S
diff --git a/c/src/lib/libbsp/powerpc/gen5200/Makefile.am b/c/src/lib/libbsp/powerpc/gen5200/Makefile.am
index 8c2630f9a9..1ca8e629c1 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/gen5200/Makefile.am
@@ -30,32 +30,54 @@ project_lib_LIBRARIES = librtemsbsp.a
 librtemsbsp_a_SOURCES =
 
 # bestcomm
-librtemsbsp_a_SOURCES += bestcomm/include/ppctypes.h \
-    bestcomm/include/mgt5200/mgt5200.h bestcomm/include/mgt5200/sdma.h \
-    bestcomm/bestcomm_api.c bestcomm/bestcomm_api.h bestcomm/bestcomm_glue.c \
-    bestcomm/bestcomm_glue.h bestcomm/dma_image.c bestcomm/dma_image.capi.h \
-    bestcomm/dma_image.h bestcomm/dma_image.reloc.c bestcomm/load_task.c \
-    bestcomm/tasksetup_ata.c bestcomm/tasksetup_bdtable.c \
-    bestcomm/tasksetup_crc16_dp_0.c bestcomm/tasksetup_crc16_dp_1.c \
-    bestcomm/tasksetup_fec_rx_bd.c bestcomm/tasksetup_fec_tx_bd.c \
-    bestcomm/tasksetup_gen_dp_0.c bestcomm/tasksetup_gen_dp_1.c \
-    bestcomm/tasksetup_gen_dp_2.c bestcomm/tasksetup_gen_dp_3.c \
-    bestcomm/tasksetup_gen_dp_bd_0.c bestcomm/tasksetup_gen_dp_bd_1.c \
-    bestcomm/tasksetup_gen_rx_bd.c bestcomm/tasksetup_gen_tx_bd.c \
-    bestcomm/tasksetup_lpc.c bestcomm/tasksetup_pci_rx.c \
-    bestcomm/tasksetup_pci_tx.c bestcomm/bestcomm_priv.h \
-    bestcomm/task_api/bestcomm_api_mem.h bestcomm/task_api/bestcomm_cntrl.h \
-    bestcomm/task_api/tasksetup_bdtable.h \
-    bestcomm/task_api/tasksetup_general.h
+librtemsbsp_a_SOURCES += bestcomm/include/ppctypes.h
+librtemsbsp_a_SOURCES += bestcomm/include/mgt5200/mgt5200.h
+librtemsbsp_a_SOURCES += bestcomm/include/mgt5200/sdma.h
+librtemsbsp_a_SOURCES += bestcomm/bestcomm_api.c
+librtemsbsp_a_SOURCES += bestcomm/bestcomm_api.h
+librtemsbsp_a_SOURCES += bestcomm/bestcomm_glue.c
+librtemsbsp_a_SOURCES += bestcomm/bestcomm_glue.h
+librtemsbsp_a_SOURCES += bestcomm/dma_image.c
+librtemsbsp_a_SOURCES += bestcomm/dma_image.capi.h
+librtemsbsp_a_SOURCES += bestcomm/dma_image.h
+librtemsbsp_a_SOURCES += bestcomm/dma_image.reloc.c
+librtemsbsp_a_SOURCES += bestcomm/load_task.c
+librtemsbsp_a_SOURCES += bestcomm/tasksetup_ata.c
+librtemsbsp_a_SOURCES += bestcomm/tasksetup_bdtable.c
+librtemsbsp_a_SOURCES += bestcomm/tasksetup_crc16_dp_0.c
+librtemsbsp_a_SOURCES += bestcomm/tasksetup_crc16_dp_1.c
+librtemsbsp_a_SOURCES += bestcomm/tasksetup_fec_rx_bd.c
+librtemsbsp_a_SOURCES += bestcomm/tasksetup_fec_tx_bd.c
+librtemsbsp_a_SOURCES += bestcomm/tasksetup_gen_dp_0.c
+librtemsbsp_a_SOURCES += bestcomm/tasksetup_gen_dp_1.c
+librtemsbsp_a_SOURCES += bestcomm/tasksetup_gen_dp_2.c
+librtemsbsp_a_SOURCES += bestcomm/tasksetup_gen_dp_3.c
+librtemsbsp_a_SOURCES += bestcomm/tasksetup_gen_dp_bd_0.c
+librtemsbsp_a_SOURCES += bestcomm/tasksetup_gen_dp_bd_1.c
+librtemsbsp_a_SOURCES += bestcomm/tasksetup_gen_rx_bd.c
+librtemsbsp_a_SOURCES += bestcomm/tasksetup_gen_tx_bd.c
+librtemsbsp_a_SOURCES += bestcomm/tasksetup_lpc.c
+librtemsbsp_a_SOURCES += bestcomm/tasksetup_pci_rx.c
+librtemsbsp_a_SOURCES += bestcomm/tasksetup_pci_tx.c
+librtemsbsp_a_SOURCES += bestcomm/bestcomm_priv.h
+librtemsbsp_a_SOURCES += bestcomm/task_api/bestcomm_api_mem.h
+librtemsbsp_a_SOURCES += bestcomm/task_api/bestcomm_cntrl.h
+librtemsbsp_a_SOURCES += bestcomm/task_api/tasksetup_bdtable.h
+librtemsbsp_a_SOURCES += bestcomm/task_api/tasksetup_general.h
 # clock
 # clock
 librtemsbsp_a_SOURCES += ../shared/clock/clock.c
 # console
 librtemsbsp_a_SOURCES += console/console.c
 # i2c
-librtemsbsp_a_SOURCES += i2c/i2c.c i2c/i2cdrv.c i2c/mpc5200mbus.c i2c/mpc5200mbus.h
+librtemsbsp_a_SOURCES += i2c/i2c.c
+librtemsbsp_a_SOURCES += i2c/i2cdrv.c
+librtemsbsp_a_SOURCES += i2c/mpc5200mbus.c
+librtemsbsp_a_SOURCES += i2c/mpc5200mbus.h
 # ide
-librtemsbsp_a_SOURCES += ide/idecfg.c ide/pcmcia_ide.c ide/pcmcia_ide.h
+librtemsbsp_a_SOURCES += ide/idecfg.c
+librtemsbsp_a_SOURCES += ide/pcmcia_ide.c
+librtemsbsp_a_SOURCES += ide/pcmcia_ide.h
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/gen5200/dev/mpc5200-ata.c
 librtemsbsp_a_SOURCES += ide/ata-instance.c
 librtemsbsp_a_SOURCES += ide/ata-dma-pio-single.c
@@ -64,17 +86,25 @@ librtemsbsp_a_SOURCES += ide/ata-dma-pio-single.c
 librtemsbsp_a_SOURCES += irq/irq.c
 
 # mscan
-librtemsbsp_a_SOURCES += mscan/mscan.c mscan/mscan-base.c mscan/mscan.h mscan/mscan_int.h
+librtemsbsp_a_SOURCES += mscan/mscan.c
+librtemsbsp_a_SOURCES += mscan/mscan-base.c
+librtemsbsp_a_SOURCES += mscan/mscan.h
+librtemsbsp_a_SOURCES += mscan/mscan_int.h
 
 # nvram
-librtemsbsp_a_SOURCES += nvram/nvram.c nvram/nvram.h nvram/m93cxx.h
+librtemsbsp_a_SOURCES += nvram/nvram.c
+librtemsbsp_a_SOURCES += nvram/nvram.h
+librtemsbsp_a_SOURCES += nvram/m93cxx.h
 
 # slicetimer
-librtemsbsp_a_SOURCES += slicetimer/slicetimer.c slicetimer/slicetimer.h
+librtemsbsp_a_SOURCES += slicetimer/slicetimer.c
+librtemsbsp_a_SOURCES += slicetimer/slicetimer.h
 
 # tod
-librtemsbsp_a_SOURCES += tod/todcfg.c tod/pcf8563.c tod/pcf8563.h \
-    ../../shared/tod.c
+librtemsbsp_a_SOURCES += tod/todcfg.c
+librtemsbsp_a_SOURCES += tod/pcf8563.c
+librtemsbsp_a_SOURCES += tod/pcf8563.h
+librtemsbsp_a_SOURCES += ../../shared/tod.c
 
 # startup
 librtemsbsp_a_SOURCES += ../../shared/bootcard.c
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am b/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am
index 1ade7ccc28..a3ece5d493 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am
@@ -30,22 +30,21 @@ project_lib_LIBRARIES = librtemsbsp.a
 librtemsbsp_a_SOURCES =
 
 # startup
-librtemsbsp_a_SOURCES += \
-	../../shared/bootcard.c \
-	../../shared/getentropy-cpucounter.c \
-	../../shared/bsppredriverhook.c \
-	../../shared/sbrk.c \
-	../../shared/gnatinstallhandler.c \
-	../shared/src/tictac.c \
-	startup/cpuinit.c \
-	../shared/startup/bspidle.c \
-	startup/bspstart.c \
-	../../shared/bspclean.c \
-	startup/bspreset.c \
-	startup/bsprestart.c \
-	../../shared/bspgetworkarea.c \
-        ../../shared/src/bsp-uboot-board-info.c \
-        ../shared/uboot_getenv.c
+librtemsbsp_a_SOURCES += ../../shared/bootcard.c
+librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c
+librtemsbsp_a_SOURCES += ../../shared/bsppredriverhook.c
+librtemsbsp_a_SOURCES += ../../shared/sbrk.c
+librtemsbsp_a_SOURCES += ../../shared/gnatinstallhandler.c
+librtemsbsp_a_SOURCES += ../shared/src/tictac.c
+librtemsbsp_a_SOURCES += startup/cpuinit.c
+librtemsbsp_a_SOURCES += ../shared/startup/bspidle.c
+librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../shared/bspclean.c
+librtemsbsp_a_SOURCES += startup/bspreset.c
+librtemsbsp_a_SOURCES += startup/bsprestart.c
+librtemsbsp_a_SOURCES += ../../shared/bspgetworkarea.c
+librtemsbsp_a_SOURCES += ../../shared/src/bsp-uboot-board-info.c
+librtemsbsp_a_SOURCES += ../shared/uboot_getenv.c
 
 # clock
 librtemsbsp_a_SOURCES += ../shared/clock/clock.c
diff --git a/c/src/lib/libbsp/powerpc/haleakala/Makefile.am b/c/src/lib/libbsp/powerpc/haleakala/Makefile.am
index 67ee7d3d09..b4af09af38 100644
--- a/c/src/lib/libbsp/powerpc/haleakala/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/haleakala/Makefile.am
@@ -17,23 +17,28 @@ project_lib_LIBRARIES = librtemsbsp.a
 librtemsbsp_a_SOURCES =
 
 # startup
-librtemsbsp_a_SOURCES += ../../shared/bspclean.c \
-    ../../shared/bspreset_loop.c \
-    startup/bspstart.c ../../shared/bootcard.c \
-    ../../shared/getentropy-cpucounter.c \
-    ../../shared/bsppredriverhook.c ../../shared/bspgetworkarea.c \
-    ../../shared/sbrk.c \
-    ../../shared/gnatinstallhandler.c mmu/mmu_405.c mmu/mmu_405asm.S 
+librtemsbsp_a_SOURCES += ../../shared/bspclean.c
+librtemsbsp_a_SOURCES += ../../shared/bspreset_loop.c
+librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../shared/bootcard.c
+librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c
+librtemsbsp_a_SOURCES += ../../shared/bsppredriverhook.c
+librtemsbsp_a_SOURCES += ../../shared/bspgetworkarea.c
+librtemsbsp_a_SOURCES += ../../shared/sbrk.c
+librtemsbsp_a_SOURCES += ../../shared/gnatinstallhandler.c
+librtemsbsp_a_SOURCES += mmu/mmu_405.c
+librtemsbsp_a_SOURCES += mmu/mmu_405asm.S 
 
 # dlentry
 librtemsbsp_a_SOURCES += dlentry/dlentry.S
 
 # console
-librtemsbsp_a_SOURCES += ../../powerpc/shared/console/uart.c \
-    ../../powerpc/shared/console/console.c
+librtemsbsp_a_SOURCES += ../../powerpc/shared/console/uart.c
+librtemsbsp_a_SOURCES += ../../powerpc/shared/console/console.c
 
 # irq
-librtemsbsp_a_SOURCES += irq/irq_init.c irq/irq.c
+librtemsbsp_a_SOURCES += irq/irq_init.c
+librtemsbsp_a_SOURCES += irq/irq.c
 
 if HAS_NETWORKING
 librtemsbsp_a_SOURCES += network/network.c 
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
index 4fd24a3978..f080f82525 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
@@ -34,23 +34,25 @@ project_lib_LIBRARIES = librtemsbsp.a
 librtemsbsp_a_SOURCES =
 
 # startup
-librtemsbsp_a_SOURCES += ../../powerpc/shared/startup/bspstart.c \
- 	../../powerpc/shared/startup/bspgetworkarea.c \
- 	../../powerpc/shared/showbats.c \
-    ../../powerpc/shared/startup/bsppredriverhook.c \
- 	../../powerpc/shared/startup/zerobss.c \
-    ../../powerpc/shared/startup/pgtbl_setup.c \
-    ../../powerpc/shared/startup/pgtbl_activate.c \
-	../../powerpc/shared/startup/ppc_idle.c \
-    ../../powerpc/shared/startup/sbrk.c ../../shared/bootcard.c \
-    ../../shared/getentropy-cpucounter.c \
-    ../../shared/bspclean.c \
-    ../../shared/gnatinstallhandler.c \
-    startup/bspreset.c
+librtemsbsp_a_SOURCES += ../../powerpc/shared/startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../powerpc/shared/startup/bspgetworkarea.c
+librtemsbsp_a_SOURCES += ../../powerpc/shared/showbats.c
+librtemsbsp_a_SOURCES += ../../powerpc/shared/startup/bsppredriverhook.c
+librtemsbsp_a_SOURCES += ../../powerpc/shared/startup/zerobss.c
+librtemsbsp_a_SOURCES += ../../powerpc/shared/startup/pgtbl_setup.c
+librtemsbsp_a_SOURCES += ../../powerpc/shared/startup/pgtbl_activate.c
+librtemsbsp_a_SOURCES += ../../powerpc/shared/startup/ppc_idle.c
+librtemsbsp_a_SOURCES += ../../powerpc/shared/startup/sbrk.c
+librtemsbsp_a_SOURCES += ../../shared/bootcard.c
+librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c
+librtemsbsp_a_SOURCES += ../../shared/bspclean.c
+librtemsbsp_a_SOURCES += ../../shared/gnatinstallhandler.c
+librtemsbsp_a_SOURCES += startup/bspreset.c
 
 
 # tod
-librtemsbsp_a_SOURCES += ../../shared/tod.c ../../powerpc/shared/tod/todcfg.c
+librtemsbsp_a_SOURCES += ../../shared/tod.c
+librtemsbsp_a_SOURCES += ../../powerpc/shared/tod/todcfg.c
 # pclock
 librtemsbsp_a_SOURCES += ../../powerpc/shared/clock/p_clock.c
 
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am b/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am
index e66b7bf64f..f3e80f286b 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am
@@ -32,12 +32,16 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
 librtemsbsp_a_SOURCES += irq/irq.c
 
 # startup
-librtemsbsp_a_SOURCES += ../../shared/bspclean.c \
-    ../../shared/bsppredriverhook.c \
-    ../shared/startup/bspidle.c startup/bspstart.c ../../shared/bootcard.c \
-    ../../shared/getentropy-cpucounter.c \
-    ../../shared/sbrk.c ../../shared/gnatinstallhandler.c startup/cpuinit.c \
-    ../../shared/bspgetworkarea.c
+librtemsbsp_a_SOURCES += ../../shared/bspclean.c
+librtemsbsp_a_SOURCES += ../../shared/bsppredriverhook.c
+librtemsbsp_a_SOURCES += ../shared/startup/bspidle.c
+librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../shared/bootcard.c
+librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c
+librtemsbsp_a_SOURCES += ../../shared/sbrk.c
+librtemsbsp_a_SOURCES += ../../shared/gnatinstallhandler.c
+librtemsbsp_a_SOURCES += startup/cpuinit.c
+librtemsbsp_a_SOURCES += ../../shared/bspgetworkarea.c
 librtemsbsp_a_SOURCES += ../../shared/bspreset.c
 
 if HAS_NETWORKING
diff --git a/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am b/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am
index 6f67d60a9f..c91dba24e0 100644
--- a/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am
@@ -37,48 +37,53 @@ project_lib_LIBRARIES = librtemsbsp.a
 librtemsbsp_a_SOURCES =
 
 # startup
-librtemsbsp_a_SOURCES += startup/bspstart.c \
-    startup/misc.c ../../powerpc/shared/startup/bspgetworkarea.c \
-    ../../powerpc/shared/startup/bsppredriverhook.c \
-    ../../powerpc/shared/startup/zerobss.c \
-    ../../powerpc/shared/startup/sbrk.c ../../shared/bootcard.c \
-    ../../shared/getentropy-cpucounter.c \
-    ../../shared/bspclean.c \
-    ../../shared/gnatinstallhandler.c
+librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += startup/misc.c
+librtemsbsp_a_SOURCES += ../../powerpc/shared/startup/bspgetworkarea.c
+librtemsbsp_a_SOURCES += ../../powerpc/shared/startup/bsppredriverhook.c
+librtemsbsp_a_SOURCES += ../../powerpc/shared/startup/zerobss.c
+librtemsbsp_a_SOURCES += ../../powerpc/shared/startup/sbrk.c
+librtemsbsp_a_SOURCES += ../../shared/bootcard.c
+librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c
+librtemsbsp_a_SOURCES += ../../shared/bspclean.c
+librtemsbsp_a_SOURCES += ../../shared/gnatinstallhandler.c
 librtemsbsp_a_SOURCES += ../../shared/bspreset.c
 # tod
-librtemsbsp_a_SOURCES += ../../shared/tod.c tod/todcfg.c
+librtemsbsp_a_SOURCES += ../../shared/tod.c
+librtemsbsp_a_SOURCES += tod/todcfg.c
 # pclock
 librtemsbsp_a_SOURCES += ../../powerpc/shared/clock/p_clock.c
 
 # console
-librtemsbsp_a_SOURCES += ../../powerpc/shared/console/uart.c \
-    ../../powerpc/shared/console/console.c \
-    ../../powerpc/shared/console/consoleIo.h \
-    ../../powerpc/shared/console/uart.h
+librtemsbsp_a_SOURCES += ../../powerpc/shared/console/uart.c
+librtemsbsp_a_SOURCES += ../../powerpc/shared/console/console.c
+librtemsbsp_a_SOURCES += ../../powerpc/shared/console/consoleIo.h
+librtemsbsp_a_SOURCES += ../../powerpc/shared/console/uart.h
 
 # irq
-librtemsbsp_a_SOURCES += irq/irq_init.c \
-    ../../powerpc/shared/irq/openpic_i8259_irq.c
+librtemsbsp_a_SOURCES += irq/irq_init.c
+librtemsbsp_a_SOURCES += ../../powerpc/shared/irq/openpic_i8259_irq.c
 
 # openpic
-librtemsbsp_a_SOURCES += ../../powerpc/shared/openpic/openpic.h \
-    ../../powerpc/shared/openpic/openpic.c \
-    ../../powerpc/shared/openpic/openpic.h
+librtemsbsp_a_SOURCES += ../../powerpc/shared/openpic/openpic.h
+librtemsbsp_a_SOURCES += ../../powerpc/shared/openpic/openpic.c
+librtemsbsp_a_SOURCES += ../../powerpc/shared/openpic/openpic.h
 
 # pci
-librtemsbsp_a_SOURCES += ../../powerpc/shared/pci/pci.c \
-    pci/detect_host_bridge.c \
-    ../../powerpc/shared/pci/generic_clear_hberrs.c \
-    ../../powerpc/shared/pci/pcifinddevice.c ../../powerpc/shared/pci/pci.h
+librtemsbsp_a_SOURCES += ../../powerpc/shared/pci/pci.c
+librtemsbsp_a_SOURCES += pci/detect_host_bridge.c
+librtemsbsp_a_SOURCES += ../../powerpc/shared/pci/generic_clear_hberrs.c
+librtemsbsp_a_SOURCES += ../../powerpc/shared/pci/pcifinddevice.c
+librtemsbsp_a_SOURCES += ../../powerpc/shared/pci/pci.h
 
 # flash
-librtemsbsp_a_SOURCES += ../shared/flash/flash.c \
-    ../shared/flash/spansionFlash.c \
-    flash/flashcfg.c
+librtemsbsp_a_SOURCES += ../shared/flash/flash.c
+librtemsbsp_a_SOURCES += ../shared/flash/spansionFlash.c
+librtemsbsp_a_SOURCES += flash/flashcfg.c
 
 # i2c
-librtemsbsp_a_SOURCES += i2c/mpc8540_i2c.c i2c/i2c_init.c
+librtemsbsp_a_SOURCES += i2c/mpc8540_i2c.c
+librtemsbsp_a_SOURCES += i2c/i2c_init.c
 
 # vpd
 librtemsbsp_a_SOURCES += ../shared/motorola/vpd.c
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am b/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am
index 8df589780e..4529e529a1 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am
@@ -14,23 +14,26 @@ librtemsbsp_a_SOURCES =
 # UNUSED
 
 # startup
-librtemsbsp_a_SOURCES += startup/bspstart.c \
-    ../../powerpc/shared/startup/pgtbl_setup.c startup/pgtbl_activate.c \
-    ../../powerpc/shared/startup/bsppredriverhook.c \
-    ../../powerpc/shared/startup/zerobss.c \
-    ../../powerpc/shared/startup/bspgetworkarea.c \
-    ../../powerpc/shared/startup/sbrk.c ../../shared/bootcard.c \
-    ../../shared/getentropy-cpucounter.c \
-    startup/bspclean.c \
-    ../../shared/gnatinstallhandler.c startup/bspreset.c \
-    ../../powerpc/shared/startup/probeMemEnd.c
+librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../powerpc/shared/startup/pgtbl_setup.c
+librtemsbsp_a_SOURCES += startup/pgtbl_activate.c
+librtemsbsp_a_SOURCES += ../../powerpc/shared/startup/bsppredriverhook.c
+librtemsbsp_a_SOURCES += ../../powerpc/shared/startup/zerobss.c
+librtemsbsp_a_SOURCES += ../../powerpc/shared/startup/bspgetworkarea.c
+librtemsbsp_a_SOURCES += ../../powerpc/shared/startup/sbrk.c
+librtemsbsp_a_SOURCES += ../../shared/bootcard.c
+librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c
+librtemsbsp_a_SOURCES += startup/bspclean.c
+librtemsbsp_a_SOURCES += ../../shared/gnatinstallhandler.c
+librtemsbsp_a_SOURCES += startup/bspreset.c
+librtemsbsp_a_SOURCES += ../../powerpc/shared/startup/probeMemEnd.c
 
 # pclock
 librtemsbsp_a_SOURCES += ../../powerpc/shared/clock/p_clock.c
 
 # console
-librtemsbsp_a_SOURCES += ../../powerpc/shared/console/uart.c \
-    ../../powerpc/shared/console/console.c
+librtemsbsp_a_SOURCES += ../../powerpc/shared/console/uart.c
+librtemsbsp_a_SOURCES += ../../powerpc/shared/console/console.c
 
 # pci
 librtemsbsp_a_SOURCES += pci/pci.c
@@ -39,17 +42,20 @@ librtemsbsp_a_SOURCES += pci/detect_host_bridge.c
 librtemsbsp_a_SOURCES += ../../shared/pci/pci_find_device.c
 
 # irq
-librtemsbsp_a_SOURCES += irq/irq_init.c irq/BSP_irq.c
+librtemsbsp_a_SOURCES += irq/irq_init.c
+librtemsbsp_a_SOURCES += irq/BSP_irq.c
 
 # tod
-librtemsbsp_a_SOURCES += ../../shared/tod.c tod/todcfg.c
+librtemsbsp_a_SOURCES += ../../shared/tod.c
+librtemsbsp_a_SOURCES += tod/todcfg.c
 
 # vectors
-librtemsbsp_a_SOURCES += vectors/exceptionhandler.c \
-    ../../powerpc/shared/start/vectors_entry.S
+librtemsbsp_a_SOURCES += vectors/exceptionhandler.c
+librtemsbsp_a_SOURCES += ../../powerpc/shared/start/vectors_entry.S
 
 # GT64260
-librtemsbsp_a_SOURCES += GT64260/GT64260TWSI.c GT64260/MVME5500I2C.c
+librtemsbsp_a_SOURCES += GT64260/GT64260TWSI.c
+librtemsbsp_a_SOURCES += GT64260/MVME5500I2C.c
 
 if HAS_NETWORKING
 librtemsbsp_a_SOURCES += network/if_100MHz/GT64260eth.c
diff --git a/c/src/lib/libbsp/powerpc/psim/Makefile.am b/c/src/lib/libbsp/powerpc/psim/Makefile.am
index f526bc296c..edb7db879b 100644
--- a/c/src/lib/libbsp/powerpc/psim/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/psim/Makefile.am
@@ -22,11 +22,14 @@ project_lib_LIBRARIES = librtemsbsp.a
 librtemsbsp_a_SOURCES =
 
 # startup
-librtemsbsp_a_SOURCES += ../../shared/bspclean.c \
-    ../../shared/bsppredriverhook.c startup/bspstart.c \
-    ../../shared/bspgetworkarea.c ../../shared/bootcard.c \
-    ../../shared/getentropy-cpucounter.c \
-    ../../powerpc/shared/startup/sbrk.c ../../shared/gnatinstallhandler.c
+librtemsbsp_a_SOURCES += ../../shared/bspclean.c
+librtemsbsp_a_SOURCES += ../../shared/bsppredriverhook.c
+librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../shared/bspgetworkarea.c
+librtemsbsp_a_SOURCES += ../../shared/bootcard.c
+librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c
+librtemsbsp_a_SOURCES += ../../powerpc/shared/startup/sbrk.c
+librtemsbsp_a_SOURCES += ../../shared/gnatinstallhandler.c
 librtemsbsp_a_SOURCES += ../../shared/bspreset.c
 
 # pclock
@@ -34,20 +37,24 @@ librtemsbsp_a_SOURCES += ../shared/clock/p_clock.c
 # console
 librtemsbsp_a_SOURCES += ../../shared/console-polled.c
 # debugio
-librtemsbsp_a_SOURCES += console/console-io.c console/consupp.S
+librtemsbsp_a_SOURCES += console/console-io.c
+librtemsbsp_a_SOURCES += console/consupp.S
 
 # irq
-librtemsbsp_a_SOURCES += irq/irq_init.c ../shared/irq/openpic_i8259_irq.c \
-    ../shared/openpic/openpic.c \
-    ../../../../../../bsps/shared/irq/irq-default-handler.c
+librtemsbsp_a_SOURCES += irq/irq_init.c
+librtemsbsp_a_SOURCES += ../shared/irq/openpic_i8259_irq.c
+librtemsbsp_a_SOURCES += ../shared/openpic/openpic.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
 
 # vectors
 librtemsbsp_a_SOURCES += vectors/align_h.S
 
 if HAS_MP
 # shmdr
-librtemsbsp_a_SOURCES += \
-    shmsupp/addrconv.c shmsupp/getcfg.c shmsupp/lock.c shmsupp/mpisr.c
+librtemsbsp_a_SOURCES += shmsupp/addrconv.c
+librtemsbsp_a_SOURCES += shmsupp/getcfg.c
+librtemsbsp_a_SOURCES += shmsupp/lock.c
+librtemsbsp_a_SOURCES += shmsupp/mpisr.c
 endif
 
 if HAS_NETWORKING
diff --git a/c/src/lib/libbsp/powerpc/qemuppc/Makefile.am b/c/src/lib/libbsp/powerpc/qemuppc/Makefile.am
index 56ffc9272b..798da5bc45 100644
--- a/c/src/lib/libbsp/powerpc/qemuppc/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/qemuppc/Makefile.am
@@ -39,8 +39,10 @@ irq_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
 irq_SOURCES += irq/irq_init.c
 
 project_lib_LIBRARIES = librtemsbsp.a
-librtemsbsp_a_SOURCES = $(startup_SOURCES) $(clock_SOURCES) $(console_SOURCES) \
-    $(irq_SOURCES)
+librtemsbsp_a_SOURCES = $(startup_SOURCES)
+librtemsbsp_a_SOURCES += $(clock_SOURCES)
+librtemsbsp_a_SOURCES += $(console_SOURCES)
+librtemsbsp_a_SOURCES += $(irq_SOURCES)
 
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/dev/timer-ppc-dec.c
diff --git a/c/src/lib/libbsp/powerpc/qoriq/Makefile.am b/c/src/lib/libbsp/powerpc/qoriq/Makefile.am
index d4a6109a7b..838c2b43b1 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/qoriq/Makefile.am
@@ -34,33 +34,32 @@ project_lib_LIBRARIES = librtemsbsp.a
 librtemsbsp_a_SOURCES =
 
 # Startup
-librtemsbsp_a_SOURCES += \
-	../../shared/bootcard.c \
-	../../shared/getentropy-cpucounter.c \
-	../../shared/sbrk.c \
-	../../shared/gnatinstallhandler.c \
-	../../shared/bspclean.c \
-	../../shared/src/bsp-fdt.c \
-	../shared/src/ppc-exc-handler-table.c \
-	../shared/src/tictac.c \
-	../shared/src/bsp-start-zero.S \
-	../shared/startup/bspidle.c \
-	startup/epapr_hcalls.S \
-	startup/l1cache.S \
-	startup/l2cache.S \
-	startup/mmu.c \
-	startup/mmu-tlb1.S \
-	startup/mmu-config.c \
-	startup/portal.c \
-	startup/restart.S \
-	startup/bsppredriverhook.c \
-	startup/bspstart.c \
-	startup/bspreset.c \
-	startup/bsprestart.c
+librtemsbsp_a_SOURCES += ../../shared/bootcard.c
+librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c
+librtemsbsp_a_SOURCES += ../../shared/sbrk.c
+librtemsbsp_a_SOURCES += ../../shared/gnatinstallhandler.c
+librtemsbsp_a_SOURCES += ../../shared/bspclean.c
+librtemsbsp_a_SOURCES += ../../shared/src/bsp-fdt.c
+librtemsbsp_a_SOURCES += ../shared/src/ppc-exc-handler-table.c
+librtemsbsp_a_SOURCES += ../shared/src/tictac.c
+librtemsbsp_a_SOURCES += ../shared/src/bsp-start-zero.S
+librtemsbsp_a_SOURCES += ../shared/startup/bspidle.c
+librtemsbsp_a_SOURCES += startup/epapr_hcalls.S
+librtemsbsp_a_SOURCES += startup/l1cache.S
+librtemsbsp_a_SOURCES += startup/l2cache.S
+librtemsbsp_a_SOURCES += startup/mmu.c
+librtemsbsp_a_SOURCES += startup/mmu-tlb1.S
+librtemsbsp_a_SOURCES += startup/mmu-config.c
+librtemsbsp_a_SOURCES += startup/portal.c
+librtemsbsp_a_SOURCES += startup/restart.S
+librtemsbsp_a_SOURCES += startup/bsppredriverhook.c
+librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += startup/bspreset.c
+librtemsbsp_a_SOURCES += startup/bsprestart.c
 
 # Clock
-librtemsbsp_a_SOURCES += clock/clock-config.c \
-	../../shared/clockdrv_shell.h
+librtemsbsp_a_SOURCES += clock/clock-config.c
+librtemsbsp_a_SOURCES += ../../shared/clockdrv_shell.h
 
 # Timer
 librtemsbsp_a_SOURCES += timer/timer.c
@@ -77,20 +76,20 @@ librtemsbsp_a_SOURCES += console/uart-bridge-slave.c
 librtemsbsp_a_SOURCES += console/console-config.c
 
 # RTC
-librtemsbsp_a_SOURCES += ../../shared/tod.c \
-	rtc/rtc-config.c
+librtemsbsp_a_SOURCES += ../../shared/tod.c
+librtemsbsp_a_SOURCES += rtc/rtc-config.c
 
 # MPCI
-librtemsbsp_a_SOURCES += shmsupp/lock.S \
-	shmsupp/intercom.c \
-	shmsupp/intercom-mpci.c
+librtemsbsp_a_SOURCES += shmsupp/lock.S
+librtemsbsp_a_SOURCES += shmsupp/intercom.c
+librtemsbsp_a_SOURCES += shmsupp/intercom-mpci.c
 
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/e500-mmu.c
 
 if HAS_NETWORKING
-librtemsbsp_a_SOURCES += network/network.c \
-	network/if_intercom.c
+librtemsbsp_a_SOURCES += network/network.c
+librtemsbsp_a_SOURCES += network/if_intercom.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/net/tsec.c
 endif
 
diff --git a/c/src/lib/libbsp/powerpc/ss555/Makefile.am b/c/src/lib/libbsp/powerpc/ss555/Makefile.am
index 7044951bcb..45b31c9033 100644
--- a/c/src/lib/libbsp/powerpc/ss555/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/ss555/Makefile.am
@@ -21,12 +21,16 @@ librtemsbsp_a_SOURCES += clock/p_clock.c
 # console
 librtemsbsp_a_SOURCES += console/console.c
 # startup
-librtemsbsp_a_SOURCES += ../../shared/bspclean.c \
-    ../../shared/bsppredriverhook.c \
-    startup/bspstart.c ../../shared/bootcard.c startup/iss555.c \
-    ../../shared/getentropy-cpucounter.c \
-    ../../shared/sbrk.c ../../shared/gnatinstallhandler.c start/start.S \
-    ../../shared/bspgetworkarea.c
+librtemsbsp_a_SOURCES += ../../shared/bspclean.c
+librtemsbsp_a_SOURCES += ../../shared/bsppredriverhook.c
+librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../shared/bootcard.c
+librtemsbsp_a_SOURCES += startup/iss555.c
+librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c
+librtemsbsp_a_SOURCES += ../../shared/sbrk.c
+librtemsbsp_a_SOURCES += ../../shared/gnatinstallhandler.c
+librtemsbsp_a_SOURCES += start/start.S
+librtemsbsp_a_SOURCES += ../../shared/bspgetworkarea.c
 librtemsbsp_a_SOURCES += ../../shared/bspreset.c
 # tm27supp
 librtemsbsp_a_SOURCES += startup/tm27supp.c
diff --git a/c/src/lib/libbsp/powerpc/t32mppc/Makefile.am b/c/src/lib/libbsp/powerpc/t32mppc/Makefile.am
index 4808622283..73bac5a675 100644
--- a/c/src/lib/libbsp/powerpc/t32mppc/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/t32mppc/Makefile.am
@@ -26,19 +26,18 @@ project_lib_LIBRARIES = librtemsbsp.a
 librtemsbsp_a_SOURCES =
 
 # Startup
-librtemsbsp_a_SOURCES += \
-	../../shared/bootcard.c \
-	../../shared/getentropy-cpucounter.c \
-	../../shared/bsppredriverhook.c \
-	../../shared/sbrk.c \
-	../../shared/gnatinstallhandler.c \
-	../../shared/bspclean.c \
-	../../shared/bspgetworkarea.c \
-	../shared/src/ppc-exc-handler-table.c \
-	../shared/src/tictac.c \
-	../shared/src/bsp-start-zero.S \
-	startup/bspstart.c \
-	startup/bspreset.c
+librtemsbsp_a_SOURCES += ../../shared/bootcard.c
+librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c
+librtemsbsp_a_SOURCES += ../../shared/bsppredriverhook.c
+librtemsbsp_a_SOURCES += ../../shared/sbrk.c
+librtemsbsp_a_SOURCES += ../../shared/gnatinstallhandler.c
+librtemsbsp_a_SOURCES += ../../shared/bspclean.c
+librtemsbsp_a_SOURCES += ../../shared/bspgetworkarea.c
+librtemsbsp_a_SOURCES += ../shared/src/ppc-exc-handler-table.c
+librtemsbsp_a_SOURCES += ../shared/src/tictac.c
+librtemsbsp_a_SOURCES += ../shared/src/bsp-start-zero.S
+librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += startup/bspreset.c
 
 # Clock
 librtemsbsp_a_SOURCES += clock/clock-config.c
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am b/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am
index 182e74d945..8794a352d8 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am
@@ -38,13 +38,17 @@ librtemsbsp_a_SOURCES += spi/spi.c
 # timer
 librtemsbsp_a_SOURCES += timer/timer.c
 # startup
-librtemsbsp_a_SOURCES += ../../shared/bspclean.c \
-    ../../shared/bsppredriverhook.c \
-    ../shared/startup/bspidle.c \
-    startup/bspstart.c startup/bspgetworkarea.c ../../shared/bootcard.c \
-    ../../shared/getentropy-cpucounter.c \
-    startup/mmutlbtab.c startup/cpuinit.c ../../shared/sbrk.c \
-    ../../shared/gnatinstallhandler.c
+librtemsbsp_a_SOURCES += ../../shared/bspclean.c
+librtemsbsp_a_SOURCES += ../../shared/bsppredriverhook.c
+librtemsbsp_a_SOURCES += ../shared/startup/bspidle.c
+librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += startup/bspgetworkarea.c
+librtemsbsp_a_SOURCES += ../../shared/bootcard.c
+librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c
+librtemsbsp_a_SOURCES += startup/mmutlbtab.c
+librtemsbsp_a_SOURCES += startup/cpuinit.c
+librtemsbsp_a_SOURCES += ../../shared/sbrk.c
+librtemsbsp_a_SOURCES += ../../shared/gnatinstallhandler.c
 librtemsbsp_a_SOURCES += ../../shared/bspreset.c
 
 if HAS_NETWORKING
diff --git a/c/src/lib/libbsp/powerpc/virtex/Makefile.am b/c/src/lib/libbsp/powerpc/virtex/Makefile.am
index 00ddcda792..40a952a017 100644
--- a/c/src/lib/libbsp/powerpc/virtex/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/virtex/Makefile.am
@@ -29,12 +29,15 @@ librtemsbsp_a_SOURCES =
 librtemsbsp_a_LIBADD =
 
 # startup
-librtemsbsp_a_SOURCES += ../../shared/bspclean.c ../../shared/bspgetworkarea.c \
-    ../../shared/bspreset_loop.c \
-    startup/bspstart.c ../../shared/bootcard.c \
-    ../../shared/getentropy-cpucounter.c \
-    ../../shared/bsppredriverhook.c \
-    ../../shared/sbrk.c ../../shared/gnatinstallhandler.c
+librtemsbsp_a_SOURCES += ../../shared/bspclean.c
+librtemsbsp_a_SOURCES += ../../shared/bspgetworkarea.c
+librtemsbsp_a_SOURCES += ../../shared/bspreset_loop.c
+librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../shared/bootcard.c
+librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c
+librtemsbsp_a_SOURCES += ../../shared/bsppredriverhook.c
+librtemsbsp_a_SOURCES += ../../shared/sbrk.c
+librtemsbsp_a_SOURCES += ../../shared/gnatinstallhandler.c
 librtemsbsp_a_SOURCES += ../shared/src/bsp-start-zero.S
 
 # bspconsole
@@ -51,7 +54,8 @@ librtemsbsp_a_SOURCES += irq/irq_init.c
 librtemsbsp_a_SOURCES += ../shared/clock/clock.c
 
 if HAS_NETWORKING
-librtemsbsp_a_SOURCES += = network/xiltemac.c
+librtemsbsp_a_SOURCES += =
+librtemsbsp_a_SOURCES += network/xiltemac.c
 endif
 
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
diff --git a/c/src/lib/libbsp/powerpc/virtex4/Makefile.am b/c/src/lib/libbsp/powerpc/virtex4/Makefile.am
index 2731b9ec4b..ba1e33c774 100644
--- a/c/src/lib/libbsp/powerpc/virtex4/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/virtex4/Makefile.am
@@ -18,23 +18,23 @@ project_lib_DATA += linkcmds
 project_lib_LIBRARIES = librtemsbsp.a
 
 # startup
-librtemsbsp_a_SOURCES = startup/bspclean.c \
-                   ../shared/startup/zerobss.c \
-                   ../../shared/bspgetworkarea.c \
-                   startup/bspstart.c \
-                   ../../shared/bootcard.c \
-                   ../../shared/getentropy-cpucounter.c \
-                   ../../shared/sbrk.c \
-                   ../../shared/gnatinstallhandler.c \
-                   ../shared/src/memcpy.c
+librtemsbsp_a_SOURCES = startup/bspclean.c
+librtemsbsp_a_SOURCES += ../shared/startup/zerobss.c
+librtemsbsp_a_SOURCES += ../../shared/bspgetworkarea.c
+librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../shared/bootcard.c
+librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c
+librtemsbsp_a_SOURCES += ../../shared/sbrk.c
+librtemsbsp_a_SOURCES += ../../shared/gnatinstallhandler.c
+librtemsbsp_a_SOURCES += ../shared/src/memcpy.c
 librtemsbsp_a_SOURCES += ../../shared/bspreset.c
 
 # start
 librtemsbsp_a_SOURCES += start/start.S
 
 # console
-librtemsbsp_a_SOURCES += startup/dummy_console.c \
-                    ../../shared/dummy_printk_support.c
+librtemsbsp_a_SOURCES += startup/dummy_console.c
+librtemsbsp_a_SOURCES += ../../shared/dummy_printk_support.c
 
 # irq
 librtemsbsp_a_SOURCES += irq/irq_init.c
diff --git a/c/src/lib/libbsp/powerpc/virtex5/Makefile.am b/c/src/lib/libbsp/powerpc/virtex5/Makefile.am
index 63718cdcaf..3661c0fb6f 100644
--- a/c/src/lib/libbsp/powerpc/virtex5/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/virtex5/Makefile.am
@@ -17,15 +17,15 @@ project_lib_DATA += linkcmds
 project_lib_LIBRARIES = librtemsbsp.a
 
 # startup
-librtemsbsp_a_SOURCES = startup/bspclean.c \
-                   ../shared/startup/zerobss.c \
-                   ../../shared/bspgetworkarea.c \
-                   startup/bspstart.c \
-                   ../../shared/bootcard.c \
-                   ../../shared/getentropy-cpucounter.c \
-                   ../../shared/sbrk.c \
-                   ../../shared/gnatinstallhandler.c \
-                   ../shared/src/memcpy.c
+librtemsbsp_a_SOURCES = startup/bspclean.c
+librtemsbsp_a_SOURCES += ../shared/startup/zerobss.c
+librtemsbsp_a_SOURCES += ../../shared/bspgetworkarea.c
+librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../shared/bootcard.c
+librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c
+librtemsbsp_a_SOURCES += ../../shared/sbrk.c
+librtemsbsp_a_SOURCES += ../../shared/gnatinstallhandler.c
+librtemsbsp_a_SOURCES += ../shared/src/memcpy.c
 librtemsbsp_a_SOURCES += ../../shared/bspreset.c
 
 # start
@@ -35,8 +35,8 @@ librtemsbsp_a_SOURCES += start/start.S
 librtemsbsp_a_SOURCES += ../../powerpc/shared/clock/p_clock.c
 
 # console
-librtemsbsp_a_SOURCES += startup/dummy_console.c \
-                    ../../shared/dummy_printk_support.c
+librtemsbsp_a_SOURCES += startup/dummy_console.c
+librtemsbsp_a_SOURCES += ../../shared/dummy_printk_support.c
 
 # irq
 librtemsbsp_a_SOURCES += irq/irq_init.c
diff --git a/c/src/lib/libbsp/riscv/riscv_generic/Makefile.am b/c/src/lib/libbsp/riscv/riscv_generic/Makefile.am
index 1d9854b4c7..1a98f5ca99 100644
--- a/c/src/lib/libbsp/riscv/riscv_generic/Makefile.am
+++ b/c/src/lib/libbsp/riscv/riscv_generic/Makefile.am
@@ -46,7 +46,8 @@ librtemsbsp_a_SOURCES += ../../shared/src/stackalloc.c
 librtemsbsp_a_SOURCES += ../../shared/bspgetworkarea.c
 
 # clock
-librtemsbsp_a_SOURCES += clock/clockdrv.c ../../../shared/clockdrv_shell.h
+librtemsbsp_a_SOURCES += clock/clockdrv.c
+librtemsbsp_a_SOURCES += ../../../shared/clockdrv_shell.h
 
 # Timer
 librtemsbsp_a_SOURCES += timer/timer.c
diff --git a/c/src/lib/libbsp/sh/gensh1/Makefile.am b/c/src/lib/libbsp/sh/gensh1/Makefile.am
index f25001d351..34f1c4d303 100644
--- a/c/src/lib/libbsp/sh/gensh1/Makefile.am
+++ b/c/src/lib/libbsp/sh/gensh1/Makefile.am
@@ -24,16 +24,20 @@ BUILT_SOURCES = scitab.c
 CLEANFILES = scitab.c
 
 # startup
-librtemsbsp_a_SOURCES += \
-    ../../shared/bsppredriverhook.c ../shared/startup/bspstart.c \
-    ../../shared/bspclean.c ../../shared/bspreset_loop.c \
-    ../../shared/bspgetworkarea.c \
-    ../../shared/sbrk.c ../../shared/bootcard.c ../shared/bsphwinit.c \
-    ../../shared/getentropy-cpucounter.c \
-    ../../shared/gnatinstallhandler.c
+librtemsbsp_a_SOURCES += ../../shared/bsppredriverhook.c
+librtemsbsp_a_SOURCES += ../shared/startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../shared/bspclean.c
+librtemsbsp_a_SOURCES += ../../shared/bspreset_loop.c
+librtemsbsp_a_SOURCES += ../../shared/bspgetworkarea.c
+librtemsbsp_a_SOURCES += ../../shared/sbrk.c
+librtemsbsp_a_SOURCES += ../../shared/bootcard.c
+librtemsbsp_a_SOURCES += ../shared/bsphwinit.c
+librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c
+librtemsbsp_a_SOURCES += ../../shared/gnatinstallhandler.c
 librtemsbsp_a_SOURCES += clock/ckinit.c
 librtemsbsp_a_SOURCES += clock/delay.c
-librtemsbsp_a_SOURCES += startup/cpu_asm.c startup/ispsh7032.c
+librtemsbsp_a_SOURCES += startup/cpu_asm.c
+librtemsbsp_a_SOURCES += startup/ispsh7032.c
 librtemsbsp_a_SOURCES += timer/timer.c
 # scitab
 librtemsbsp_a_SOURCES += scitab.c
diff --git a/c/src/lib/libbsp/sh/gensh2/Makefile.am b/c/src/lib/libbsp/sh/gensh2/Makefile.am
index fc8b7fb0fd..2255aac78d 100644
--- a/c/src/lib/libbsp/sh/gensh2/Makefile.am
+++ b/c/src/lib/libbsp/sh/gensh2/Makefile.am
@@ -26,21 +26,26 @@ BUILT_SOURCES = scitab.c
 CLEANFILES = scitab.c
 
 # startup
-librtemsbsp_a_SOURCES += startup/hw_init.c \
-    ../../shared/bsppredriverhook.c \
-    ../shared/startup/bspstart.c \
-    ../../shared/bspgetworkarea.c ../../shared/sbrk.c ../../shared/bootcard.c \
-    ../../shared/getentropy-cpucounter.c \
-    ../../shared/gnatinstallhandler.c ../../shared/bspclean.c \
-    ../shared/bsphwinit.c
+librtemsbsp_a_SOURCES += startup/hw_init.c
+librtemsbsp_a_SOURCES += ../../shared/bsppredriverhook.c
+librtemsbsp_a_SOURCES += ../shared/startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../shared/bspgetworkarea.c
+librtemsbsp_a_SOURCES += ../../shared/sbrk.c
+librtemsbsp_a_SOURCES += ../../shared/bootcard.c
+librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c
+librtemsbsp_a_SOURCES += ../../shared/gnatinstallhandler.c
+librtemsbsp_a_SOURCES += ../../shared/bspclean.c
+librtemsbsp_a_SOURCES += ../shared/bsphwinit.c
 librtemsbsp_a_SOURCES += ../../shared/bspreset.c
 librtemsbsp_a_SOURCES += clock/ckinit.c
-librtemsbsp_a_SOURCES += startup/cpu_asm.c startup/ispsh7045.c
+librtemsbsp_a_SOURCES += startup/cpu_asm.c
+librtemsbsp_a_SOURCES += startup/ispsh7045.c
 librtemsbsp_a_SOURCES += timer/timer.c
 # scitab
 librtemsbsp_a_SOURCES += scitab.c
 # console
-librtemsbsp_a_SOURCES += ../../sh/shared/console.c console/config.c
+librtemsbsp_a_SOURCES += ../../sh/shared/console.c
+librtemsbsp_a_SOURCES += console/config.c
 librtemsbsp_a_SOURCES += console/sci.c
 librtemsbsp_a_SOURCES += console/sci_termios.c
 # debugio
diff --git a/c/src/lib/libbsp/sh/gensh4/Makefile.am b/c/src/lib/libbsp/sh/gensh4/Makefile.am
index e825fbc318..a4326b72e8 100644
--- a/c/src/lib/libbsp/sh/gensh4/Makefile.am
+++ b/c/src/lib/libbsp/sh/gensh4/Makefile.am
@@ -18,18 +18,23 @@ project_lib_LIBRARIES = librtemsbsp.a
 librtemsbsp_a_SOURCES =
 
 # startup
-librtemsbsp_a_SOURCES += \
-    ../../shared/bsppredriverhook.c ../shared/startup/bspstart.c \
-    ../../shared/bspgetworkarea.c \
-    ../../shared/bspclean.c ../../shared/sbrk.c ../../shared/bootcard.c \
-    ../../shared/getentropy-cpucounter.c \
-    ../../shared/gnatinstallhandler.c ../shared/bsphwinit.c
+librtemsbsp_a_SOURCES += ../../shared/bsppredriverhook.c
+librtemsbsp_a_SOURCES += ../shared/startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../shared/bspgetworkarea.c
+librtemsbsp_a_SOURCES += ../../shared/bspclean.c
+librtemsbsp_a_SOURCES += ../../shared/sbrk.c
+librtemsbsp_a_SOURCES += ../../shared/bootcard.c
+librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c
+librtemsbsp_a_SOURCES += ../../shared/gnatinstallhandler.c
+librtemsbsp_a_SOURCES += ../shared/bsphwinit.c
 librtemsbsp_a_SOURCES += ../../shared/bspreset.c
-librtemsbsp_a_SOURCES += startup/cpu_asm.c startup/ispsh7750.c
+librtemsbsp_a_SOURCES += startup/cpu_asm.c
+librtemsbsp_a_SOURCES += startup/ispsh7750.c
 librtemsbsp_a_SOURCES += clock/ckinit.c
 librtemsbsp_a_SOURCES += timer/timer.c
 # console
-librtemsbsp_a_SOURCES += console/console.c ../../shared/dummy_printk_support.c
+librtemsbsp_a_SOURCES += console/console.c
+librtemsbsp_a_SOURCES += ../../shared/dummy_printk_support.c
 librtemsbsp_a_SOURCES += console/sh4uart.c
 # hw_init
 librtemsbsp_a_SOURCES += hw_init/hw_init.c
diff --git a/c/src/lib/libbsp/sparc/erc32/Makefile.am b/c/src/lib/libbsp/sparc/erc32/Makefile.am
index c3f63f03b2..33dbdd292a 100644
--- a/c/src/lib/libbsp/sparc/erc32/Makefile.am
+++ b/c/src/lib/libbsp/sparc/erc32/Makefile.am
@@ -40,7 +40,8 @@ librtemsbsp_a_SOURCES += ../../sparc/shared/startup/bsp_fatal_halt.c
 librtemsbsp_a_SOURCES += ../../sparc/shared/cpu.c
 librtemsbsp_a_SOURCES += ../../sparc/shared/irq_asm.S
 # gnatsupp
-librtemsbsp_a_SOURCES += gnatsupp/gnatsupp.c ../../sparc/shared/gnatcommon.c
+librtemsbsp_a_SOURCES += gnatsupp/gnatsupp.c
+librtemsbsp_a_SOURCES += ../../sparc/shared/gnatcommon.c
 # console
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console-control.c
@@ -55,10 +56,9 @@ librtemsbsp_a_SOURCES += ../../shared/clockdrv_shell.h
 librtemsbsp_a_SOURCES += timer/timer.c
 
 # IRQ
-librtemsbsp_a_SOURCES += \
-    ../../sparc/shared/irq/irq-shared.c \
-    ../../sparc/shared/irq/bsp_isr_handler.c \
-    ../../../../../../bsps/shared/irq/irq-default-handler.c
+librtemsbsp_a_SOURCES += ../../sparc/shared/irq/irq-shared.c
+librtemsbsp_a_SOURCES += ../../sparc/shared/irq/bsp_isr_handler.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
 
 if HAS_SMP
 librtemsbsp_a_SOURCES += ../../shared/bspsmp.c
diff --git a/c/src/lib/libbsp/sparc/leon2/Makefile.am b/c/src/lib/libbsp/sparc/leon2/Makefile.am
index 3de48dd932..8f053c9194 100644
--- a/c/src/lib/libbsp/sparc/leon2/Makefile.am
+++ b/c/src/lib/libbsp/sparc/leon2/Makefile.am
@@ -41,18 +41,19 @@ librtemsbsp_a_SOURCES += ../../sparc/shared/startup/bsp_fatal_halt.c
 librtemsbsp_a_SOURCES += ../../sparc/shared/cpu.c
 librtemsbsp_a_SOURCES += ../../sparc/shared/irq_asm.S
 # gnatsupp
-librtemsbsp_a_SOURCES += gnatsupp/gnatsupp.c ../../sparc/shared/gnatcommon.c
+librtemsbsp_a_SOURCES += gnatsupp/gnatsupp.c
+librtemsbsp_a_SOURCES += ../../sparc/shared/gnatcommon.c
 # console
-librtemsbsp_a_SOURCES += console/console.c console/debugputs.c
+librtemsbsp_a_SOURCES += console/console.c
+librtemsbsp_a_SOURCES += console/debugputs.c
 # clock
 librtemsbsp_a_SOURCES += clock/ckinit.c
 librtemsbsp_a_SOURCES += ../../shared/clockdrv_shell.h
 # IRQ
 librtemsbsp_a_SOURCES += ../../sparc/shared/irq/genirq.c
-librtemsbsp_a_SOURCES += \
-    ../../sparc/shared/irq/irq-shared.c \
-    ../../sparc/shared/irq/bsp_isr_handler.c \
-    ../../../../../../bsps/shared/irq/irq-default-handler.c
+librtemsbsp_a_SOURCES += ../../sparc/shared/irq/irq-shared.c
+librtemsbsp_a_SOURCES += ../../sparc/shared/irq/bsp_isr_handler.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
 
 # AMBA bus
 librtemsbsp_a_SOURCES += ../../sparc/shared/amba/ambapp.c
@@ -100,8 +101,8 @@ librtemsbsp_a_SOURCES += ../../sparc/shared/1553/gr1553bm.c
 librtemsbsp_a_SOURCES += ../../sparc/shared/1553/gr1553rt.c
 
 # CAN
-librtemsbsp_a_SOURCES += ../../sparc/shared/can/occan.c \
-    ../../sparc/shared/can/grcan.c
+librtemsbsp_a_SOURCES += ../../sparc/shared/can/occan.c
+librtemsbsp_a_SOURCES += ../../sparc/shared/can/grcan.c
 
 # SpaceWire
 if !HAS_SMP
diff --git a/c/src/lib/libbsp/sparc/leon3/Makefile.am b/c/src/lib/libbsp/sparc/leon3/Makefile.am
index e24f72df98..fc69915ad5 100644
--- a/c/src/lib/libbsp/sparc/leon3/Makefile.am
+++ b/c/src/lib/libbsp/sparc/leon3/Makefile.am
@@ -26,13 +26,16 @@ librtemsbsp_a_SOURCES =
 
 # startup
 librtemsbsp_a_SOURCES += startup/bspclean.c
-librtemsbsp_a_SOURCES += \
-    ../../shared/bootcard.c startup/bspstart.c \
-    ../../shared/getentropy-cpucounter.c \
-    startup/bsppredriver.c \
-    ../../sparc/shared/startup/bspgetworkarea.c ../../shared/sbrk.c \
-    startup/setvec.c \
-    startup/spurious.c startup/bspidle.S startup/bspdelay.c
+librtemsbsp_a_SOURCES += ../../shared/bootcard.c
+librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c
+librtemsbsp_a_SOURCES += startup/bsppredriver.c
+librtemsbsp_a_SOURCES += ../../sparc/shared/startup/bspgetworkarea.c
+librtemsbsp_a_SOURCES += ../../shared/sbrk.c
+librtemsbsp_a_SOURCES += startup/setvec.c
+librtemsbsp_a_SOURCES += startup/spurious.c
+librtemsbsp_a_SOURCES += startup/bspidle.S
+librtemsbsp_a_SOURCES += startup/bspdelay.c
 librtemsbsp_a_SOURCES += ../../shared/bspreset.c
 librtemsbsp_a_SOURCES += startup/cpucounter.c
 librtemsbsp_a_SOURCES += ../../sparc/shared/startup/bsp_fatal_exit.c
@@ -42,7 +45,8 @@ librtemsbsp_a_SOURCES += startup/bsp_fatal_halt.c
 librtemsbsp_a_SOURCES += ../../sparc/shared/cpu.c
 librtemsbsp_a_SOURCES += ../../sparc/shared/irq_asm.S
 # gnatsupp
-librtemsbsp_a_SOURCES += gnatsupp/gnatsupp.c ../../sparc/shared/gnatcommon.c
+librtemsbsp_a_SOURCES += gnatsupp/gnatsupp.c
+librtemsbsp_a_SOURCES += ../../sparc/shared/gnatcommon.c
 # AMBA bus
 librtemsbsp_a_SOURCES += amba/amba.c
 librtemsbsp_a_SOURCES += ../../sparc/shared/amba/ambapp.c
@@ -74,12 +78,11 @@ librtemsbsp_a_SOURCES += ../../sparc/shared/uart/apbuart_cons.c
 librtemsbsp_a_SOURCES += console/printk_support.c
 
 # IRQ
-librtemsbsp_a_SOURCES += \
-    startup/eirq.c \
-    ../../sparc/shared/irq/genirq.c  \
-    ../../sparc/shared/irq/irq-shared.c \
-    ../../sparc/shared/irq/bsp_isr_handler.c \
-    ../../../../../../bsps/shared/irq/irq-default-handler.c
+librtemsbsp_a_SOURCES += startup/eirq.c
+librtemsbsp_a_SOURCES += ../../sparc/shared/irq/genirq.c
+librtemsbsp_a_SOURCES += ../../sparc/shared/irq/irq-shared.c
+librtemsbsp_a_SOURCES += ../../sparc/shared/irq/bsp_isr_handler.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
 
 # PCI
 librtemsbsp_a_SOURCES += ../../sparc/shared/pci/grpci.c
@@ -110,8 +113,8 @@ librtemsbsp_a_SOURCES += ../../sparc/shared/1553/gr1553bm.c
 librtemsbsp_a_SOURCES += ../../sparc/shared/1553/gr1553rt.c
 
 # CAN
-librtemsbsp_a_SOURCES += ../../sparc/shared/can/occan.c \
-    ../../sparc/shared/can/grcan.c
+librtemsbsp_a_SOURCES += ../../sparc/shared/can/occan.c
+librtemsbsp_a_SOURCES += ../../sparc/shared/can/grcan.c
 
 # SpaceWire
 if !HAS_SMP
@@ -189,8 +192,10 @@ endif
 
 if HAS_MP
 # shmsupp
-librtemsbsp_a_SOURCES += shmsupp/addrconv.c shmsupp/getcfg.c shmsupp/lock.c \
-    shmsupp/mpisr.c
+librtemsbsp_a_SOURCES += shmsupp/addrconv.c
+librtemsbsp_a_SOURCES += shmsupp/getcfg.c
+librtemsbsp_a_SOURCES += shmsupp/lock.c
+librtemsbsp_a_SOURCES += shmsupp/mpisr.c
 endif
 
 
diff --git a/c/src/lib/libbsp/sparc64/niagara/Makefile.am b/c/src/lib/libbsp/sparc64/niagara/Makefile.am
index a73244877d..30aabcd777 100644
--- a/c/src/lib/libbsp/sparc64/niagara/Makefile.am
+++ b/c/src/lib/libbsp/sparc64/niagara/Makefile.am
@@ -45,8 +45,10 @@ console_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console-selec
 timer_SOURCES = ../../shared/timerstub.c
 
 project_lib_LIBRARIES = librtemsbsp.a
-librtemsbsp_a_SOURCES = $(startup_SOURCES) $(clock_SOURCES) $(console_SOURCES) \
-    $(timer_SOURCES)
+librtemsbsp_a_SOURCES = $(startup_SOURCES)
+librtemsbsp_a_SOURCES += $(clock_SOURCES)
+librtemsbsp_a_SOURCES += $(console_SOURCES)
+librtemsbsp_a_SOURCES += $(timer_SOURCES)
 
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/cache/nocache.c
 
diff --git a/c/src/lib/libbsp/sparc64/usiii/Makefile.am b/c/src/lib/libbsp/sparc64/usiii/Makefile.am
index 0cb6995997..72fb5eaac3 100644
--- a/c/src/lib/libbsp/sparc64/usiii/Makefile.am
+++ b/c/src/lib/libbsp/sparc64/usiii/Makefile.am
@@ -58,8 +58,11 @@ console_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console-selec
 timer_SOURCES = ../../shared/timerstub.c
 
 project_lib_LIBRARIES = librtemsbsp.a 
-librtemsbsp_a_SOURCES = $(startup_SOURCES) $(mmu_SOURCES) $(clock_SOURCES) $(console_SOURCES) \
-    $(timer_SOURCES)
+librtemsbsp_a_SOURCES = $(startup_SOURCES)
+librtemsbsp_a_SOURCES += $(mmu_SOURCES)
+librtemsbsp_a_SOURCES += $(clock_SOURCES)
+librtemsbsp_a_SOURCES += $(console_SOURCES)
+librtemsbsp_a_SOURCES += $(timer_SOURCES)
 
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/cache/nocache.c
 
-- 
2.12.3

More information about the devel mailing list