1 files changed, 7 insertions, 16 deletions
diff --git a/c/src/lib/libbsp/mips/rbtx4938/Makefile.am b/c/src/lib/libbsp/mips/rbtx4938/Makefile.am
index 203b637dbe..e3c08650eb 100644
--- a/c/src/lib/libbsp/mips/rbtx4938/Makefile.am
+++ b/c/src/lib/libbsp/mips/rbtx4938/Makefile.am
@@ -27,15 +27,12 @@ project_lib_DATA = start.$(OBJEXT)
 
 dist_project_lib_DATA += startup/linkcmds
 
-noinst_PROGRAMS += startup.rel
-startup_rel_SOURCES = ../../shared/bspclean.c ../../shared/bsppredriverhook.c \
+startup_SOURCES = ../../shared/bspclean.c ../../shared/bsppredriverhook.c \
     ../../shared/bsplibc.c ../../shared/bsppost.c startup/bspstart.c \
     ../../shared/bootcard.c ../../shared/sbrk.c \
     ../../shared/gnatinstallhandler.c ../../shared/setvec.c \
     startup/inittlb.c \
     startup/idtmem.S startup/idttlb.S startup/exception.S
-startup_rel_CPPFLAGS = $(AM_CPPFLAGS)
-startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
 # FIXME: clockdrv.c and clockdrv_shell.c are structurally flawed
 clock_CPPFLAGS = -I$(srcdir)/../../shared
@@ -45,20 +42,14 @@ clock_rel_SOURCES = clock/clockdrv.c
 clock_rel_CPPFLAGS = $(AM_CPPFLAGS) $(clock_CPPFLAGS)
 clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
-noinst_PROGRAMS += console.rel
-console_rel_SOURCES = console/console-io.c
-console_rel_CPPFLAGS = $(AM_CPPFLAGS)
-console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-noinst_PROGRAMS += liblnk.rel
-liblnk_rel_SOURCES = liblnk/lnklib.S liblnk/pmon.S
-liblnk_rel_CPPFLAGS = $(AM_CPPFLAGS)
-liblnk_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+console_SOURCES = console/console-io.c
+liblnk_SOURCES = liblnk/lnklib.S liblnk/pmon.S
 
 noinst_LIBRARIES = libbsp.a
-libbsp_a_SOURCES =
-libbsp_a_LIBADD = startup.rel clock.rel console.rel liblnk.rel
-libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \
+libbsp_a_SOURCES = $(startup_SOURCES) $(console_SOURCES) $(liblnk_SOURCES)
+libbsp_a_LIBADD = \
+    clock.rel \
+    ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \
     ../../../libcpu/@RTEMS_CPU@/shared/interrupts.rel \
     ../../../libcpu/@RTEMS_CPU@/tx49/timer.rel \
     ../../../libcpu/@RTEMS_CPU@/tx49/vectorisrs.rel