1 files changed, 23 insertions, 57 deletions

diff --git a/c/src/lib/libbsp/powerpc/gen5200/Makefile.am b/c/src/lib/libbsp/powerpc/gen5200/Makefile.am
index 711b818498..e167bd2dc5 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/gen5200/Makefile.am
@@ -60,74 +60,35 @@ bestcomm_rel_SOURCES = bestcomm/include/ppctypes.h \
 bestcomm_rel_CPPFLAGS = $(AM_CPPFLAGS) -DMPC5200_BAPI_LIBC_HEADERS
 bestcomm_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
-noinst_PROGRAMS += clock.rel
-clock_rel_SOURCES = clock/clock.c
-clock_rel_CPPFLAGS = $(AM_CPPFLAGS)
-clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-noinst_PROGRAMS += console.rel
-console_rel_SOURCES = console/console.c
-console_rel_CPPFLAGS = $(AM_CPPFLAGS)
-console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-noinst_PROGRAMS += i2c.rel
-i2c_rel_SOURCES = i2c/i2c.c i2c/i2cdrv.c i2c/mpc5200mbus.c \
-    i2c/mpc5200mbus.h
-i2c_rel_CPPFLAGS = $(AM_CPPFLAGS)
-i2c_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-noinst_PROGRAMS += ide.rel
-ide_rel_SOURCES = ide/idecfg.c ide/pcmcia_ide.c ide/pcmcia_ide.h
-ide_rel_CPPFLAGS = $(AM_CPPFLAGS)
-ide_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+clock_SOURCES = clock/clock.c
+console_SOURCES = console/console.c
+i2c_SOURCES = i2c/i2c.c i2c/i2cdrv.c i2c/mpc5200mbus.c i2c/mpc5200mbus.h
+ide_SOURCES = ide/idecfg.c ide/pcmcia_ide.c ide/pcmcia_ide.h
 
 include_bsp_HEADERS = irq/irq.h include/i2cdrv.h include/mpc5200.h \
     include/i2c.h include/u-boot.h
+irq_SOURCES = irq/irq.c irq/irq_init.c irq/irq.h irq/irq_asm.S
+mscan_SOURCES = mscan/mscan.c mscan/mscan.h mscan/mscan_int.h
 
-noinst_PROGRAMS += irq.rel
-irq_rel_SOURCES = irq/irq.c irq/irq_init.c irq/irq.h irq/irq_asm.S
-irq_rel_CPPFLAGS = $(AM_CPPFLAGS)
-irq_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-noinst_PROGRAMS += mscan.rel
-mscan_rel_SOURCES = mscan/mscan.c mscan/mscan.h mscan/mscan_int.h
-mscan_rel_CPPFLAGS = $(AM_CPPFLAGS)
-mscan_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-noinst_PROGRAMS += nvram.rel
-nvram_rel_SOURCES = nvram/nvram.c nvram/nvram.h nvram/m93cxx.h
-nvram_rel_CPPFLAGS = $(AM_CPPFLAGS)
-nvram_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 include_bsp_HEADERS += nvram/nvram.h
+nvram_SOURCES = nvram/nvram.c nvram/nvram.h nvram/m93cxx.h
 
-noinst_PROGRAMS += slicetimer.rel
-slicetimer_rel_SOURCES = slicetimer/slicetimer.c slicetimer/slicetimer.h
-slicetimer_rel_CPPFLAGS = $(AM_CPPFLAGS)
-slicetimer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 include_bsp_HEADERS += slicetimer/slicetimer.h
+slicetimer_SOURCES = slicetimer/slicetimer.c slicetimer/slicetimer.h
 
-noinst_PROGRAMS += tod.rel
-tod_rel_SOURCES = tod/todcfg.c tod/pcf8563.c tod/pcf8563.h \
+tod_SOURCES = tod/todcfg.c tod/pcf8563.c tod/pcf8563.h \
     ../../shared/tod.c
-tod_rel_CPPFLAGS = $(AM_CPPFLAGS)
-tod_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
 include_bsp_HEADERS += vectors/vectors.h
 
-noinst_PROGRAMS += startup.rel
-startup_rel_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \
+startup_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \
     ../../shared/bsppost.c startup/bspstart.c ../../shared/bootcard.c \
     ../../shared/sbrk.c ../shared/uboot_dump_bdinfo.c \
     ../../shared/gnatinstallhandler.c startup/cpuinit.c  \
     ../shared/showbats.c
-startup_rel_CPPFLAGS = $(AM_CPPFLAGS)
-startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
-noinst_PROGRAMS += vectors.rel
-vectors_rel_SOURCES = vectors/vectors_init.c vectors/vectors.h \
+vectors_SOURCES = vectors/vectors_init.c vectors/vectors.h \
     vectors/vectors.S
-vectors_rel_CPPFLAGS = $(AM_CPPFLAGS)
-vectors_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
 if HAS_NETWORKING
 network_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__
@@ -139,13 +100,14 @@ network_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 endif
 
 noinst_LIBRARIES = libbsp.a
-libbsp_a_SOURCES =
-libbsp_a_LIBADD = bestcomm.rel clock.rel console.rel i2c.rel ide.rel irq.rel \
-    mscan.rel nvram.rel slicetimer.rel tod.rel startup.rel vectors.rel
-if HAS_NETWORKING
-libbsp_a_LIBADD += network.rel
-endif
-libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \
+libbsp_a_SOURCES = $(clock_SOURCES) $(console_SOURCES) $(i2c_SOURCES) \
+    $(ide_SOURCES) $(irq_SOURCES) $(mscan_SOURCES) $(nvram_SOURCES) \
+    $(slicetimer_SOURCES) $(tod_SOURCES) $(startup_SOURCES) \
+    $(vectors_SOURCES)
+
+libbsp_a_LIBADD = \
+    bestcomm.rel \
+    ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \
     ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \
     ../../../libcpu/@RTEMS_CPU@/shared/stack.rel \
     ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \
@@ -153,5 +115,9 @@ libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \
     ../../../libcpu/@RTEMS_CPU@/mpc6xx/timer.rel \
     ../../../libcpu/@RTEMS_CPU@/@exceptions@/raw_exception.rel
 
+if HAS_NETWORKING
+libbsp_a_LIBADD += network.rel
+endif
+
 include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am