1 files changed, 8 insertions, 29 deletions
diff --git a/c/src/lib/libbsp/unix/posix/Makefile.am b/c/src/lib/libbsp/unix/posix/Makefile.am
index ad9ff71543..0e5c9c5b97 100644
--- a/c/src/lib/libbsp/unix/posix/Makefile.am
+++ b/c/src/lib/libbsp/unix/posix/Makefile.am
@@ -39,50 +39,29 @@ noinst_LIBRARIES =
 ## project_lib_DATA += rtems-ctor.$(OBJEXT)
 ## endif
 
-noinst_PROGRAMS += startup.rel
-startup_rel_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \
+startup_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \
     ../../shared/bsppredriverhook.c startup/bspstart.c \
     startup/setvec.c ../../shared/bootcard.c
 ## for now always using main.c style startup
 ##if !HAS_CXX
-startup_rel_SOURCES += startup/main.c
+startup_SOURCES += startup/main.c
 ##endif
 
-startup_rel_CPPFLAGS = $(AM_CPPFLAGS)
-startup_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/console-io.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)
+clock_SOURCES = clock/clock.c
+console_SOURCES = console/console.c console/console-io.c
+timer_SOURCES = timer/timer.c
 
 if HAS_MP
-noinst_PROGRAMS += shmsupp.rel
-shmsupp_rel_SOURCES = shmsupp/addrconv.c shmsupp/getcfg.c \
+shmsupp_SOURCES = shmsupp/addrconv.c shmsupp/getcfg.c \
     shmsupp/cause_intr.c shmsupp/lock.c shmsupp/mpisr.c
-shmsupp_rel_CPPFLAGS = $(AM_CPPFLAGS)
-shmsupp_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 endif
 
 noinst_LIBRARIES += libbsp.a
-libbsp_a_SOURCES =
+libbsp_a_SOURCES = $(startup_SOURCES) $(clock_SOURCES) \
+    $(console_SOURCES) $(timer_SOURCES) $(shmsupp_SOURCES)
 ## if HAS_CXX
 ## libbsp_a_SOURCES += startup/rtems-ctor.cc
 ## endif
-libbsp_a_LIBADD = startup.rel clock.rel console.rel timer.rel
-if HAS_MP
-libbsp_a_LIBADD += shmsupp.rel
-endif
 
 EXTRA_DIST = times