2008-09-29 Ralf Corsépius <ralf.corsepius@rtems.org>

	* Makefile.am: Eliminate *_SOURCES.

18 files changed, 117 insertions, 64 deletions

diff --git a/c/src/lib/libbsp/arm/csb336/ChangeLog b/c/src/lib/libbsp/arm/csb336/ChangeLog
index be45a11951..3b7a4c01d6 100644
--- a/c/src/lib/libbsp/arm/csb336/ChangeLog
+++ b/c/src/lib/libbsp/arm/csb336/ChangeLog
@@ -1,5 +1,9 @@
 2008-09-29	Ralf Corsépius <ralf.corsepius@rtems.org>
 
+	* Makefile.am: Eliminate *_SOURCES.
+
+2008-09-29	Ralf Corsépius <ralf.corsepius@rtems.org>
+
 	* Makefile.am: Move noinst_LIBRARIES = libbsp.a before its
 	components.
 
diff --git a/c/src/lib/libbsp/arm/csb336/Makefile.am b/c/src/lib/libbsp/arm/csb336/Makefile.am
index 3f238dd2ed..189549e97e 100644
--- a/c/src/lib/libbsp/arm/csb336/Makefile.am
+++ b/c/src/lib/libbsp/arm/csb336/Makefile.am
@@ -29,14 +29,18 @@ project_lib_DATA = start.$(OBJEXT)
 dist_project_lib_DATA += startup/linkcmds
 
 noinst_LIBRARIES = libbsp.a
+libbsp_a_SOURCES =
 
-startup_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.c \
+# startup
+libbsp_a_SOURCES += ../../shared/bsplibc.c ../../shared/bsppost.c \
     ../../shared/bspgetworkarea.c ../../shared/bsppretaskinghook.c \
     ../../shared/bsppredriverhook.c startup/bspstart.c ../../shared/bspclean.c \
     startup/bspreset.c startup/memmap.c ../../shared/bootcard.c \
     ../../shared/sbrk.c ../../shared/gnatinstallhandler.c
-console_SOURCES = console/uart.c 
-abort_SOURCES = ../shared/abort/abort.c
+# console
+libbsp_a_SOURCES += console/uart.c 
+# abort
+libbsp_a_SOURCES += ../shared/abort/abort.c
 
 if HAS_NETWORKING
 network_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__
@@ -46,8 +50,6 @@ network_rel_CPPFLAGS = $(AM_CPPFLAGS) $(network_CPPFLAGS)
 network_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 endif
 
-libbsp_a_SOURCES = $(startup_SOURCES) $(console_SOURCES) $(abort_SOURCES)
-
 libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/arm920.rel \
     ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/clock.rel \
     ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/timer.rel \
diff --git a/c/src/lib/libbsp/arm/csb337/ChangeLog b/c/src/lib/libbsp/arm/csb337/ChangeLog
index b9155c3081..f115c9a174 100644
--- a/c/src/lib/libbsp/arm/csb337/ChangeLog
+++ b/c/src/lib/libbsp/arm/csb337/ChangeLog
@@ -1,5 +1,9 @@
 2008-09-29	Ralf Corsépius <ralf.corsepius@rtems.org>
 
+	* Makefile.am: Eliminate *_SOURCES.
+
+2008-09-29	Ralf Corsépius <ralf.corsepius@rtems.org>
+
 	* Makefile.am: Move noinst_LIBRARIES = libbsp.a before its
 	components.
 
diff --git a/c/src/lib/libbsp/arm/csb337/Makefile.am b/c/src/lib/libbsp/arm/csb337/Makefile.am
index f1af03aa62..f5d036efad 100644
--- a/c/src/lib/libbsp/arm/csb337/Makefile.am
+++ b/c/src/lib/libbsp/arm/csb337/Makefile.am
@@ -29,15 +29,19 @@ project_lib_DATA = start.$(OBJEXT)
 dist_project_lib_DATA += startup/linkcmds
 
 noinst_LIBRARIES = libbsp.a
+libbsp_a_SOURCES =
 
-startup_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.c \
+# startup
+libbsp_a_SOURCES += ../../shared/bsplibc.c ../../shared/bsppost.c \
     ../../shared/bsppredriverhook.c ../../shared/bspgetworkarea.c \
     ../../shared/bsppretaskinghook.c startup/bspstart.c \
     ../../shared/bspclean.c startup/bspreset.c \
     startup/memmap.c ../../shared/bootcard.c ../../shared/sbrk.c \
     ../../shared/gnatinstallhandler.c
-console_SOURCES = console/uarts.c ../../shared/console.c
-abort_SOURCES = ../shared/abort/abort.c
+# console
+libbsp_a_SOURCES += console/uarts.c ../../shared/console.c
+# abort
+libbsp_a_SOURCES += ../shared/abort/abort.c
 
 if HAS_NETWORKING
 network_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__
@@ -47,8 +51,6 @@ network_rel_CPPFLAGS = $(AM_CPPFLAGS) $(network_CPPFLAGS)
 network_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 endif
 
-libbsp_a_SOURCES = $(startup_SOURCES) $(console_SOURCES) $(abort_SOURCES)
-
 libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/arm920.rel \
     ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/clock.rel \
     ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/dbgu.rel \
diff --git a/c/src/lib/libbsp/arm/edb7312/ChangeLog b/c/src/lib/libbsp/arm/edb7312/ChangeLog
index 1a98a09445..a07e6137d8 100644
--- a/c/src/lib/libbsp/arm/edb7312/ChangeLog
+++ b/c/src/lib/libbsp/arm/edb7312/ChangeLog
@@ -1,5 +1,9 @@
 2008-09-29	Ralf Corsépius <ralf.corsepius@rtems.org>
 
+	* Makefile.am: Eliminate *_SOURCES.
+
+2008-09-29	Ralf Corsépius <ralf.corsepius@rtems.org>
+
 	* Makefile.am: Move noinst_LIBRARIES = libbsp.a before its
 	components.
 
diff --git a/c/src/lib/libbsp/arm/edb7312/Makefile.am b/c/src/lib/libbsp/arm/edb7312/Makefile.am
index 33abce383b..e6786b8069 100644
--- a/c/src/lib/libbsp/arm/edb7312/Makefile.am
+++ b/c/src/lib/libbsp/arm/edb7312/Makefile.am
@@ -30,21 +30,28 @@ project_lib_DATA = start.$(OBJEXT)
 dist_project_lib_DATA += startup/linkcmds
 
 noinst_LIBRARIES = libbsp.a
+libbsp_a_SOURCES =
 
 include_HEADERS += ../../arm/shared/comm/uart.h
-startup_SOURCES = ../../shared/bsppost.c ../../shared/bsplibc.c \
+# startup
+libbsp_a_SOURCES += ../../shared/bsppost.c ../../shared/bsplibc.c \
     ../../shared/bspgetworkarea.c ../../shared/bsppretaskinghook.c \
     ../../shared/bsppredriverhook.c startup/bspstart.c \
     ../../shared/bspclean.c ../../shared/bootcard.c ../../shared/sbrk.c \
     startup/bspreset.c ../../shared/gnatinstallhandler.c
 
-clock_SOURCES = clock/clockdrv.c
-console_SOURCES = console/uart.c ../../shared/console.c
-timer_SOURCES = timer/timer.c
-abort_SOURCES = ../shared/abort/abort.c
+# clock
+libbsp_a_SOURCES += clock/clockdrv.c
+# console
+libbsp_a_SOURCES += console/uart.c ../../shared/console.c
+# timer
+libbsp_a_SOURCES += timer/timer.c
+# abort
+libbsp_a_SOURCES += ../shared/abort/abort.c
 
 include_HEADERS += irq/irq.h
-irq_SOURCES = irq/irq.c irq/bsp_irq_init.c \
+# irq
+libbsp_a_SOURCES += irq/irq.c irq/bsp_irq_init.c \
     ../../arm/shared/irq/irq_init.c irq/bsp_irq_asm.S \
     ../../arm/shared/irq/irq_asm.S irq/irq.h
 
@@ -56,9 +63,6 @@ network_rel_CPPFLAGS = $(AM_CPPFLAGS) $(network_CPPFLAGS)
 network_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 endif
 
-libbsp_a_SOURCES = $(startup_SOURCES) $(clock_SOURCES) $(console_SOURCES) \
-    $(timer_SOURCES) $(abort_SOURCES) $(irq_SOURCES)
-
 # libcpu libraries could go here
 libbsp_a_LIBADD = 
 if HAS_NETWORKING
diff --git a/c/src/lib/libbsp/arm/gba/ChangeLog b/c/src/lib/libbsp/arm/gba/ChangeLog
index 168cd1371f..6d8c0c13d6 100644
--- a/c/src/lib/libbsp/arm/gba/ChangeLog
+++ b/c/src/lib/libbsp/arm/gba/ChangeLog
@@ -1,5 +1,9 @@
 2008-09-29	Ralf Corsépius <ralf.corsepius@rtems.org>
 
+	* Makefile.am: Eliminate *_SOURCES.
+
+2008-09-29	Ralf Corsépius <ralf.corsepius@rtems.org>
+
 	* Makefile.am: Move noinst_LIBRARIES = libbsp.a before its
 	components.
 
diff --git a/c/src/lib/libbsp/arm/gba/Makefile.am b/c/src/lib/libbsp/arm/gba/Makefile.am
index f20635b4cc..07c19e6453 100644
--- a/c/src/lib/libbsp/arm/gba/Makefile.am
+++ b/c/src/lib/libbsp/arm/gba/Makefile.am
@@ -33,6 +33,7 @@ project_lib_DATA = start.$(OBJEXT)
 dist_project_lib_DATA += startup/linkcmds
 
 noinst_LIBRARIES = libbsp.a
+libbsp_a_SOURCES =
 
 # some objects have to be forced together to ensure they are ALWAYS
 # the ones linked into the application executable.  Every application
@@ -42,23 +43,25 @@ gbaoverrides_rel_SOURCES = startup/bspstart.c startup/cpu.c startup/cpu_asm.S
 gbaoverrides_rel_CPPFLAGS = $(AM_CPPFLAGS)
 gbaoverrides_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
-startup_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.c \
+# startup
+libbsp_a_SOURCES += ../../shared/bsplibc.c ../../shared/bsppost.c \
     startup/bspgetworkarea.c ../../shared/bsppretaskinghook.c \
     ../../shared/bsppredriverhook.c ../../shared/bspclean.c \
     startup/bspreset.c ../../shared/bootcard.c ../../shared/sbrk.c \
     ../../shared/gnatinstallhandler.c
-clock_SOURCES = clock/clockdrv.c
-console_SOURCES = console/conio.c console/console.c \
+# clock
+libbsp_a_SOURCES += clock/clockdrv.c
+# console
+libbsp_a_SOURCES += console/conio.c console/console.c \
     console/defaultfont.c
-timer_SOURCES = timer/timer.c
+# timer
+libbsp_a_SOURCES += timer/timer.c
 
 include_HEADERS += irq/irq.h
-irq_SOURCES = irq/irq.c irq/bsp_irq_init.c irq/irq_init.c \
+# irq
+libbsp_a_SOURCES += irq/irq.c irq/bsp_irq_init.c irq/irq_init.c \
     irq/bsp_irq_asm.S irq/irq_asm.S
 
-libbsp_a_SOURCES = $(startup_SOURCES) $(clock_SOURCES) $(console_SOURCES) \
-    $(timer_SOURCES) $(irq_SOURCES)
-
 libbsp_a_LIBADD = gbaoverrides.rel
 
 include $(srcdir)/preinstall.am
diff --git a/c/src/lib/libbsp/arm/gp32/ChangeLog b/c/src/lib/libbsp/arm/gp32/ChangeLog
index 9296c9c9e1..9ba5537a8a 100644
--- a/c/src/lib/libbsp/arm/gp32/ChangeLog
+++ b/c/src/lib/libbsp/arm/gp32/ChangeLog
@@ -1,5 +1,9 @@
 2008-09-29	Ralf Corsépius <ralf.corsepius@rtems.org>
 
+	* Makefile.am: Eliminate *_SOURCES.
+
+2008-09-29	Ralf Corsépius <ralf.corsepius@rtems.org>
+
 	* Makefile.am: Move noinst_LIBRARIES = libbsp.a before its
 	components.
 
diff --git a/c/src/lib/libbsp/arm/gp32/Makefile.am b/c/src/lib/libbsp/arm/gp32/Makefile.am
index 80a3e7aa19..b52ac5850e 100644
--- a/c/src/lib/libbsp/arm/gp32/Makefile.am
+++ b/c/src/lib/libbsp/arm/gp32/Makefile.am
@@ -29,19 +29,21 @@ project_lib_DATA = start.$(OBJEXT)
 dist_project_lib_DATA += startup/linkcmds
 
 noinst_LIBRARIES = libbsp.a
+libbsp_a_SOURCES =
 
-startup_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.c \
+# startup
+libbsp_a_SOURCES += ../../shared/bsplibc.c ../../shared/bsppost.c \
     ../../shared/bsppredriverhook.c ../../shared/bspgetworkarea.c \
     ../../shared/bsppretaskinghook.c startup/bspstart.c \
     ../../shared/bspclean.c startup/bspreset.c \
     startup/memmap.c ../../shared/bootcard.c ../../shared/sbrk.c \
     ../../shared/gnatinstallhandler.c
-console_SOURCES = console/uart.c ../../shared/console.c
-abort_SOURCES = ../shared/abort/abort.c
-smc_SOURCES = smc/smc.c smc/smc.h
-
-libbsp_a_SOURCES = $(startup_SOURCES) $(console_SOURCES) $(abort_SOURCES) \
-    $(smc_SOURCES)
+# console
+libbsp_a_SOURCES += console/uart.c ../../shared/console.c
+# abort
+libbsp_a_SOURCES += ../shared/abort/abort.c
+# smc
+libbsp_a_SOURCES += smc/smc.c smc/smc.h
 
 libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/arm920.rel \
     ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/clock.rel \
diff --git a/c/src/lib/libbsp/arm/lpc24xx/ChangeLog b/c/src/lib/libbsp/arm/lpc24xx/ChangeLog
index 1303f14fc4..eac88735c5 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/ChangeLog
+++ b/c/src/lib/libbsp/arm/lpc24xx/ChangeLog
@@ -1,5 +1,9 @@
 2008-09-29	Ralf Corsépius <ralf.corsepius@rtems.org>
 
+	* Makefile.am: Eliminate *_SOURCES.
+
+2008-09-29	Ralf Corsépius <ralf.corsepius@rtems.org>
+
 	* Makefile.am: Move noinst_LIBRARIES = libbsp.a before its
 	components.
 
diff --git a/c/src/lib/libbsp/arm/lpc24xx/Makefile.am b/c/src/lib/libbsp/arm/lpc24xx/Makefile.am
index 94274729ff..4122620796 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/Makefile.am
+++ b/c/src/lib/libbsp/arm/lpc24xx/Makefile.am
@@ -50,8 +50,10 @@ dist_project_lib_DATA += ../shared/startup/linkcmds.base startup/linkcmds
 #                  LibBSP                                                     #
 ###############################################################################
 noinst_LIBRARIES = libbsp.a
+libbsp_a_SOURCES =
 
-shared_SOURCES = ../../shared/bootcard.c \
+# shared
+libbsp_a_SOURCES += ../../shared/bootcard.c \
 	../../shared/bspclean.c \
 	../../shared/bspreset.c \
 	../../shared/bspgetworkarea.c \
@@ -63,30 +65,28 @@ shared_SOURCES = ../../shared/bootcard.c \
 	../../shared/sbrk.c \
 	../shared/abort/simple_abort.c
 
-startup_SOURCES = startup/bspstart.c
+# startup
+libbsp_a_SOURCES += startup/bspstart.c
 
-irq_SOURCES = ../../shared/src/irq-generic.c \
+# irq
+libbsp_a_SOURCES += ../../shared/src/irq-generic.c \
 	../../shared/src/irq-legacy.c \
 	../shared/irq/irq_asm.S \
 	irq/irq.c
 
-console_SOURCES = ../../shared/console.c \
+# console
+libbsp_a_SOURCES += ../../shared/console.c \
 	console/console-config.c
 
-clock_SOURCES = clock/clock-config.c
+# clock
+libbsp_a_SOURCES += clock/clock-config.c
 
-rtc_SOURCES = ../../shared/tod.c \
+# rtc
+libbsp_a_SOURCES += ../../shared/tod.c \
 	rtc/rtc-config.c
 
-misc_SOURCES = misc/system-clocks.c
-
-libbsp_a_SOURCES = $(clock_SOURCES) \
-	$(console_SOURCES) \
-	$(irq_SOURCES) \
-	$(misc_SOURCES) \
-	$(rtc_SOURCES) \
-	$(shared_SOURCES) \
-	$(startup_SOURCES)
+# misc
+libbsp_a_SOURCES += misc/system-clocks.c
 
 ###############################################################################
 #                  Special Rules                                              #
diff --git a/c/src/lib/libbsp/arm/nds/ChangeLog b/c/src/lib/libbsp/arm/nds/ChangeLog
index 1132727ce4..83ac12ecfe 100644
--- a/c/src/lib/libbsp/arm/nds/ChangeLog
+++ b/c/src/lib/libbsp/arm/nds/ChangeLog
@@ -1,5 +1,9 @@
 2008-09-29	Ralf Corsépius <ralf.corsepius@rtems.org>
 
+	* Makefile.am: Eliminate *_SOURCES.
+
+2008-09-29	Ralf Corsépius <ralf.corsepius@rtems.org>
+
 	* Makefile.am: Move noinst_LIBRARIES = libbsp.a before its
 	components.
 
diff --git a/c/src/lib/libbsp/arm/nds/Makefile.am b/c/src/lib/libbsp/arm/nds/Makefile.am
index d01c9138d0..7b3caeb04b 100644
--- a/c/src/lib/libbsp/arm/nds/Makefile.am
+++ b/c/src/lib/libbsp/arm/nds/Makefile.am
@@ -31,6 +31,7 @@ project_lib_DATA = start.$(OBJEXT)
 dist_project_lib_DATA += startup/linkcmds
 
 noinst_LIBRARIES = libbsp.a
+libbsp_a_SOURCES =
 
 include_rtemsdir = $(includedir)/rtems
 include_rtems_HEADERS = fb/fb.h touchscreen/touchscreen.h sound/sound.h
@@ -259,7 +260,6 @@ coproc.bin: coproc/coproc.S coproc/coproc.c libnds7.rel
 endif
 project_lib_DATA += coproc.bin
 
-libbsp_a_SOURCES =
 libbsp_a_LIBADD = clock.rel console.rel gnatsupp.rel startup.rel irq.rel \
     timer.rel libnds9.rel rtc.rel fb.rel touchscreen.rel sound.rel \
     block.rel libdldi.rel
diff --git a/c/src/lib/libbsp/arm/rtl22xx/ChangeLog b/c/src/lib/libbsp/arm/rtl22xx/ChangeLog
index 78b346b281..a5031d8cfe 100644
--- a/c/src/lib/libbsp/arm/rtl22xx/ChangeLog
+++ b/c/src/lib/libbsp/arm/rtl22xx/ChangeLog
@@ -1,5 +1,9 @@
 2008-09-29	Ralf Corsépius <ralf.corsepius@rtems.org>
 
+	* Makefile.am: Eliminate *_SOURCES.
+
+2008-09-29	Ralf Corsépius <ralf.corsepius@rtems.org>
+
 	* Makefile.am: Move noinst_LIBRARIES = libbsp.a before its
 	components.
 
diff --git a/c/src/lib/libbsp/arm/rtl22xx/Makefile.am b/c/src/lib/libbsp/arm/rtl22xx/Makefile.am
index b0e2967543..1658746124 100644
--- a/c/src/lib/libbsp/arm/rtl22xx/Makefile.am
+++ b/c/src/lib/libbsp/arm/rtl22xx/Makefile.am
@@ -30,17 +30,22 @@ project_lib_DATA = start.$(OBJEXT)
 dist_project_lib_DATA += startup/linkcmds
 
 noinst_LIBRARIES = libbsp.a
+libbsp_a_SOURCES =
 
 include_HEADERS += ../../arm/shared/comm/uart.h
-startup_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.c \
+# startup
+libbsp_a_SOURCES += ../../shared/bsplibc.c ../../shared/bsppost.c \
     ../../shared/bsppredriverhook.c ../../shared/bsppretaskinghook.c \
     ../../shared/bspgetworkarea.c startup/bspstart.c \
     ../../shared/bspclean.c startup/bspreset.c \
     ../../shared/bootcard.c ../../shared/sbrk.c \
     ../../shared/gnatinstallhandler.c
-console_SOURCES = ../../shared/console.c
-simple_abort_SOURCES = ../shared/abort/simple_abort.c
-debugio_SOURCES = console/uart.c 
+# console
+libbsp_a_SOURCES += ../../shared/console.c
+# simple_abort
+libbsp_a_SOURCES += ../shared/abort/simple_abort.c
+# debugio
+libbsp_a_SOURCES += console/uart.c 
 
 if HAS_NETWORKING
 network_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__
@@ -50,9 +55,6 @@ network_rel_CPPFLAGS = $(AM_CPPFLAGS) $(network_CPPFLAGS)
 network_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 endif
 
-libbsp_a_SOURCES = $(startup_SOURCES) $(console_SOURCES) \
-  $(simple_abort_SOURCES) $(debugio_SOURCES)
-
 libbsp_a_LIBADD =  \
     ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/clock.rel \
     ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/timer.rel \
diff --git a/c/src/lib/libbsp/arm/smdk2410/ChangeLog b/c/src/lib/libbsp/arm/smdk2410/ChangeLog
index f85effa800..62a38f30f0 100644
--- a/c/src/lib/libbsp/arm/smdk2410/ChangeLog
+++ b/c/src/lib/libbsp/arm/smdk2410/ChangeLog
@@ -1,5 +1,9 @@
 2008-09-29	Ralf Corsépius <ralf.corsepius@rtems.org>
 
+	* Makefile.am: Eliminate *_SOURCES.
+
+2008-09-29	Ralf Corsépius <ralf.corsepius@rtems.org>
+
 	* Makefile.am: Move noinst_LIBRARIES = libbsp.a before its
 	components.
 
diff --git a/c/src/lib/libbsp/arm/smdk2410/Makefile.am b/c/src/lib/libbsp/arm/smdk2410/Makefile.am
index 3a17b7e7a4..5a9b07f0e7 100644
--- a/c/src/lib/libbsp/arm/smdk2410/Makefile.am
+++ b/c/src/lib/libbsp/arm/smdk2410/Makefile.am
@@ -28,20 +28,22 @@ project_lib_DATA = start.$(OBJEXT)
 dist_project_lib_DATA += startup/linkcmds
 
 noinst_LIBRARIES = libbsp.a
+libbsp_a_SOURCES =
 
-startup_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.c \
+# startup
+libbsp_a_SOURCES += ../../shared/bsplibc.c ../../shared/bsppost.c \
     ../gp32/startup/bspstart.c ../../shared/bspclean.c \
     ../gp32/startup/bspreset.c startup/memmap.c \
     ../../shared/bootcard.c ../../shared/sbrk.c \
     ../../shared/bsppretaskinghook.c  \
     ../../shared/bsppredriverhook.c ../../shared/bspgetworkarea.c \
     ../../shared/gnatinstallhandler.c
-console_SOURCES = ../gp32/console/uart.c ../../shared/console.c
-abort_SOURCES = ../shared/abort/abort.c
-smc_SOURCES = ../gp32/smc/smc.c ../gp32/smc/smc.h
-
-libbsp_a_SOURCES = $(startup_SOURCES) $(console_SOURCES) $(abort_SOURCES) \
-    $(smc_SOURCES)
+# console
+libbsp_a_SOURCES += ../gp32/console/uart.c ../../shared/console.c
+# abort
+libbsp_a_SOURCES += ../shared/abort/abort.c
+# smc
+libbsp_a_SOURCES += ../gp32/smc/smc.c ../gp32/smc/smc.h
 
 libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/arm920.rel \
     ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/clock.rel \