1 files changed, 17 insertions, 25 deletions
diff --git a/c/src/lib/libbsp/mips/genmongoosev/Makefile.am b/c/src/lib/libbsp/mips/genmongoosev/Makefile.am
index 3c9cd9557f..4c49941af4 100644
--- a/c/src/lib/libbsp/mips/genmongoosev/Makefile.am
+++ b/c/src/lib/libbsp/mips/genmongoosev/Makefile.am
@@ -26,36 +26,28 @@ project_lib_DATA = start.$(OBJEXT)
 
 dist_project_lib_DATA += startup/linkcmds
 
-startup_CPPFLAGS = -I$(srcdir)/../../mips/shared/gdbstub
-noinst_PROGRAMS += startup.rel
-startup_rel_SOURCES = ../../mips/shared/gdbstub/mips-stub.c \
-    ../../shared/gdbstub/rtems-stub-glue.c ../../shared/bspclean.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/gdb-support.c
-startup_rel_CPPFLAGS = $(AM_CPPFLAGS) $(startup_CPPFLAGS)
-startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-noinst_PROGRAMS += clock.rel
-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/conscfg.c ../../shared/console.c
-console_rel_CPPFLAGS = $(AM_CPPFLAGS)
-console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-noinst_PROGRAMS += timer.rel
-timer_rel_SOURCES = timer/timer.c
-timer_rel_CPPFLAGS = $(AM_CPPFLAGS)
-timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+    ../../shared/setvec.c
+clock_SOURCES = clock/clockdrv.c
+console_SOURCES = console/conscfg.c ../../shared/console.c
+timer_SOURCES = timer/timer.c
+
+gdbstub_CPPFLAGS = -I$(srcdir)/../../mips/shared/gdbstub
+noinst_PROGRAMS += gdbstub.rel
+gdbstub_rel_SOURCES = ../../mips/shared/gdbstub/mips-stub.c \
+    startup/gdb-support.c ../../shared/gdbstub/rtems-stub-glue.c
+gdbstub_rel_CPPFLAGS = $(AM_CPPFLAGS) $(gdbstub_CPPFLAGS)
+gdbstub_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
 noinst_LIBRARIES = libbsp.a
-libbsp_a_SOURCES =
-libbsp_a_LIBADD = startup.rel clock.rel console.rel timer.rel
-libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \
+libbsp_a_SOURCES = $(startup_SOURCES) $(clock_SOURCES) $(console_SOURCES) \
+    $(timer_SOURCES) $(gdbstub_SOURCES)
+
+libbsp_a_LIBADD = \
+    ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \
     ../../../libcpu/@RTEMS_CPU@/shared/interrupts.rel \
     ../../../libcpu/@RTEMS_CPU@/mongoosev/duart.rel \
     ../../../libcpu/@RTEMS_CPU@/mongoosev/vectorisrs.rel