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

	* Makefile.am: Eliminate *_SOURCES.

1 files changed, 23 insertions, 15 deletions

diff --git a/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am b/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am
index e8e85a0674..d5bc4d1504 100644
--- a/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am
@@ -55,38 +55,46 @@ project_lib_DATA += rtems_crti.$(OBJEXT)
 dist_project_lib_DATA += ../shared/startup/linkcmds
 
 noinst_LIBRARIES = libbsp.a
+libbsp_a_SOURCES =
 
 build_date.c::
 	echo 'const char *BSP_build_date="'`date`'";' > $@
 
-startup_SOURCES = startup/bspstart.c build_date.c \
+# startup
+libbsp_a_SOURCES += startup/bspstart.c build_date.c \
     startup/misc.c ../../powerpc/shared/startup/bspgetworkarea.c \
     ../../powerpc/shared/startup/pretaskinghook.c \
     ../../powerpc/shared/startup/zerobss.c \
     ../../powerpc/shared/startup/sbrk.c ../../shared/bootcard.c \
     ../../shared/bspclean.c ../../shared/bsplibc.c ../../shared/bsppost.c \
     ../../shared/gnatinstallhandler.c
-tod_SOURCES = ../../shared/tod.c tod/todcfg.c
-pclock_SOURCES = ../../powerpc/shared/clock/p_clock.c
+# tod
+libbsp_a_SOURCES += ../../shared/tod.c tod/todcfg.c
+# pclock
+libbsp_a_SOURCES += ../../powerpc/shared/clock/p_clock.c
 
 include_bsp_HEADERS = ../../powerpc/shared/console/uart.h
-console_SOURCES = ../../powerpc/shared/console/uart.c \
+# console
+libbsp_a_SOURCES += ../../powerpc/shared/console/uart.c \
     ../../powerpc/shared/console/console.c \
     ../../powerpc/shared/console/consoleIo.h \
     ../../powerpc/shared/console/uart.h
 
 include_bsp_HEADERS += irq/irq.h
-irq_SOURCES = irq/irq_init.c \
+# irq
+libbsp_a_SOURCES += irq/irq_init.c \
     ../../powerpc/shared/irq/openpic_i8259_irq.c \
     ../../powerpc/shared/irq/irq.h
 
 include_bsp_HEADERS += ../../powerpc/shared/openpic/openpic.h
-openpic_SOURCES = ../../powerpc/shared/openpic/openpic.h \
+# openpic
+libbsp_a_SOURCES += ../../powerpc/shared/openpic/openpic.h \
     ../../powerpc/shared/openpic/openpic.c \
     ../../powerpc/shared/openpic/openpic.h
 
 include_bsp_HEADERS += ../../powerpc/shared/pci/pci.h
-pci_SOURCES = ../../powerpc/shared/pci/pci.c \
+# pci
+libbsp_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
@@ -104,7 +112,8 @@ include_bsp_HEADERS += vme/VMEConfig.h \
     ../../shared/vmeUniverse/bspVmeDmaList.h\
     ../../shared/vmeUniverse/VMEDMA.h
 
-vme_SOURCES = ../../shared/vmeUniverse/vmeTsi148.c \
+# vme
+libbsp_a_SOURCES += ../../shared/vmeUniverse/vmeTsi148.c \
     ../../shared/vmeUniverse/bspVmeDmaList.c \
     ../../shared/vmeUniverse/vmeTsi148.h \
     ../../shared/vmeUniverse/vme_am_defs.h \
@@ -114,15 +123,18 @@ vme_SOURCES = ../../shared/vmeUniverse/vmeTsi148.c \
 
 include_bsp_HEADERS += ../shared/flash/flashPgm.h \
     ../shared/flash/flashPgmPvt.h
-flash_SOURCES = ../shared/flash/flash.c \
+# flash
+libbsp_a_SOURCES += ../shared/flash/flash.c \
     ../shared/flash/spansionFlash.c \
     flash/flashcfg.c
 
 include_bsp_HEADERS += i2c/mpc8540_i2c_busdrv.h
-i2c_SOURCES = i2c/mpc8540_i2c.c i2c/i2c_init.c
+# i2c
+libbsp_a_SOURCES += i2c/mpc8540_i2c.c i2c/i2c_init.c
 
 include_bsp_HEADERS += ../shared/motorola/vpd.h
-vpd_SOURCES = ../shared/motorola/vpd.c
+# vpd
+libbsp_a_SOURCES += ../shared/motorola/vpd.c
 
 if HAS_NETWORKING
 include_bsp_HEADERS += network/if_tsec_pub.h
@@ -132,10 +144,6 @@ network_rel_CPPFLAGS = $(AM_CPPFLAGS)
 network_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 endif
 
-libbsp_a_SOURCES = $(startup_SOURCES) $(pclock_SOURCES) $(console_SOURCES) \
-    $(openpic_SOURCES) $(pci_SOURCES) $(irq_SOURCES) $(i2c_SOURCES) \
-    $(tod_SOURCES) $(vpd_SOURCES) $(vme_SOURCES) $(flash_SOURCES)
-
 libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \
     ../../../libcpu/@RTEMS_CPU@/shared/stack.rel \
     ../../../libcpu/@RTEMS_CPU@/e500/clock.rel \