2010-08-15 Joel Sherrill <joel.sherrilL@OARcorp.com>

* Makefile.am: Do not use .rel files for libbsp pieces.
This commit is contained in:
Joel Sherrill
2010-08-15 23:27:57 +00:00
parent 01b58467f5
commit 6ab0094d98
4 changed files with 19 additions and 25 deletions

View File

@@ -1,3 +1,7 @@
2010-08-15 Joel Sherrill <joel.sherrilL@OARcorp.com>
* Makefile.am: Do not use .rel files for libbsp pieces.
2010-03-10 Marc Pignat <marc.pignat@hevs.ch>
PR 1488/bsps

View File

@@ -30,19 +30,13 @@ dist_project_lib_DATA += startup/linkcmds
noinst_LIBRARIES += libbsp.a
libbsp_a_SOURCES =
noinst_PROGRAMS += startup.rel
startup_rel_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.c \
libbsp_a_SOURCES += ../../shared/bsplibc.c ../../shared/bsppost.c \
../../shared/bsppredriverhook.c startup/bspstart.c \
../../shared/bspclean.c ../../shared/sbrk.c ../../shared/setvec.c \
../../shared/bootcard.c ../../shared/gnatinstallhandler.c \
../../shared/bspgetworkarea.c
startup_rel_CPPFLAGS = $(AM_CPPFLAGS)
startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
noinst_PROGRAMS += console.rel
console_rel_SOURCES = console/console.c
console_rel_CPPFLAGS = $(AM_CPPFLAGS)
console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
libbsp_a_SOURCES += console/console.c
if HAS_NETWORKING
networkconfig_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__
@@ -52,13 +46,7 @@ networkconfig_rel_CPPFLAGS = $(AM_CPPFLAGS) $(networkconfig_CPPFLAGS)
networkconfig_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
endif
libbsp_a_LIBADD = startup.rel console.rel
if HAS_NETWORKING
libbsp_a_LIBADD += networkconfig.rel
libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/network.rel
endif
libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/mmu.rel
libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/mmu.rel
libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/interrupt.rel
libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/cache.rel
libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/uart.rel
@@ -66,6 +54,11 @@ libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/clock.rel
libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/rtc.rel
libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/timer.rel
if HAS_NETWORKING
libbsp_a_LIBADD += networkconfig.rel
libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/network.rel
endif
EXTRA_DIST = times
include $(srcdir)/preinstall.am

View File

@@ -1,3 +1,7 @@
2010-08-15 Joel Sherrill <joel.sherrilL@OARcorp.com>
* Makefile.am: Do not use .rel files for libbsp pieces.
2009-12-11 Ralf Corsépius <ralf.corsepius@rtems.org>
* console/console-io.c: Let eZKit533_BSP_poll_char return int.

View File

@@ -31,22 +31,15 @@ dist_project_lib_DATA += startup/linkcmds
noinst_LIBRARIES += libbsp.a
libbsp_a_SOURCES =
noinst_PROGRAMS += startup.rel
startup_rel_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.c \
libbsp_a_SOURCES += ../../shared/bsplibc.c ../../shared/bsppost.c \
../../shared/bsppredriverhook.c startup/bspstart.c \
../../shared/bspclean.c ../../shared/sbrk.c ../../shared/setvec.c \
../../shared/bootcard.c ../../shared/gnatinstallhandler.c \
../../shared/bspgetworkarea.c
startup_rel_CPPFLAGS = $(AM_CPPFLAGS)
startup_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)
libbsp_a_SOURCES += console/console-io.c
libbsp_a_LIBADD = startup.rel console.rel
libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/mmu.rel
libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/mmu.rel
libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/interrupt.rel
libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/cache.rel
libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/uart.rel