diff options
Diffstat (limited to 'c/src/lib/libbsp/mips/rbtx4925')
-rw-r--r-- | c/src/lib/libbsp/mips/rbtx4925/ChangeLog | 4 | ||||
-rw-r--r-- | c/src/lib/libbsp/mips/rbtx4925/Makefile.am | 22 |
2 files changed, 11 insertions, 15 deletions
diff --git a/c/src/lib/libbsp/mips/rbtx4925/ChangeLog b/c/src/lib/libbsp/mips/rbtx4925/ChangeLog index 83bf6ab1ab..24d4f3c485 100644 --- a/c/src/lib/libbsp/mips/rbtx4925/ChangeLog +++ b/c/src/lib/libbsp/mips/rbtx4925/ChangeLog @@ -1,3 +1,7 @@ +2008-05-14 Joel Sherrill <joel.sherrill@OARcorp.com> + + * Makefile.am: Rework to avoid .rel files. + 2008-05-12 Joel Sherrill <joel.sherrill@OARcorp.com> * startup/bspstart.c: Refactored and renamed initialization routines to diff --git a/c/src/lib/libbsp/mips/rbtx4925/Makefile.am b/c/src/lib/libbsp/mips/rbtx4925/Makefile.am index 203b637dbe..0d0c40f669 100644 --- a/c/src/lib/libbsp/mips/rbtx4925/Makefile.am +++ b/c/src/lib/libbsp/mips/rbtx4925/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,15 @@ 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) +console_SOURCES = console/console-io.c -noinst_PROGRAMS += liblnk.rel -liblnk_rel_SOURCES = liblnk/lnklib.S liblnk/pmon.S -liblnk_rel_CPPFLAGS = $(AM_CPPFLAGS) -liblnk_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) +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 |