diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-05-14 20:28:09 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-05-14 20:28:09 +0000 |
| commit | 1d0ee80e4bf2ccba37ba219cfa3580da4483dbc3 (patch) | |
| tree | 77a983805641ccd034cd18ae80f5f6942ef9ed2a /c/src/lib/libbsp/arm/rtl22xx | |
| parent | 2008-05-14 Joel Sherrill <joel.sherrill@OARcorp.com> (diff) | |
| download | rtems-1d0ee80e4bf2ccba37ba219cfa3580da4483dbc3.tar.bz2 | |
2008-05-14 Joel Sherrill <joel.sherrill@OARcorp.com>
* Makefile.am: Rework to avoid .rel files.
Diffstat (limited to 'c/src/lib/libbsp/arm/rtl22xx')
| -rw-r--r-- | c/src/lib/libbsp/arm/rtl22xx/ChangeLog | 4 | ||||
| -rw-r--r-- | c/src/lib/libbsp/arm/rtl22xx/Makefile.am | 44 |
2 files changed, 14 insertions, 34 deletions
diff --git a/c/src/lib/libbsp/arm/rtl22xx/ChangeLog b/c/src/lib/libbsp/arm/rtl22xx/ChangeLog index f93c3bb358..d136975153 100644 --- a/c/src/lib/libbsp/arm/rtl22xx/ChangeLog +++ b/c/src/lib/libbsp/arm/rtl22xx/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/arm/rtl22xx/Makefile.am b/c/src/lib/libbsp/arm/rtl22xx/Makefile.am index 3ca09a41e7..68e1447b16 100644 --- a/c/src/lib/libbsp/arm/rtl22xx/Makefile.am +++ b/c/src/lib/libbsp/arm/rtl22xx/Makefile.am @@ -26,29 +26,14 @@ project_lib_DATA = start.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds -noinst_PROGRAMS += startup.rel include_HEADERS += ../../arm/shared/comm/uart.h -startup_rel_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.c \ +startup_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.c \ ../../shared/bsppredriverhook.c \ startup/bspstart.c startup/bspclean.c ../../shared/bootcard.c \ ../../shared/sbrk.c ../../shared/gnatinstallhandler.c -startup_rel_CPPFLAGS = $(AM_CPPFLAGS) -startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += console.rel -console_rel_SOURCES = ../../shared/console.c -console_rel_CPPFLAGS = $(AM_CPPFLAGS) -console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += simple_abort.rel -simple_abort_rel_SOURCES = ../shared/abort/simple_abort.c -simple_abort_rel_CPPFLAGS = $(AM_CPPFLAGS) -simple_abort_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += debugio.rel -debugio_rel_SOURCES = console/uart.c -debugio_rel_CPPFLAGS = $(AM_CPPFLAGS) -debugio_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) +console_SOURCES = ../../shared/console.c +simple_abort_SOURCES = ../shared/abort/simple_abort.c +debugio_SOURCES = console/uart.c if HAS_NETWORKING network_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ @@ -59,25 +44,16 @@ network_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) endif noinst_LIBRARIES = libbsp.a -libbsp_a_SOURCES = -libbsp_a_LIBADD = console.rel debugio.rel simple_abort.rel -if HAS_NETWORKING -libbsp_a_LIBADD += network.rel -endif +libbsp_a_SOURCES = $(startup_SOURCES) $(console_SOURCES) \ + $(simple_abort_SOURCES) $(debugio_SOURCES) -libbsp_a_LIBADD += \ +libbsp_a_LIBADD = \ ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/clock.rel \ ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/timer.rel \ ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/irq.rel - -libbsp_a_LIBADD += \ -startup_rel-bootcard.o \ -startup_rel-bspclean.o \ -startup_rel-bsplibc.o \ -startup_rel-bsppost.o \ -startup_rel-bsppredriverhook.o \ -startup_rel-bspstart.o \ -startup_rel-sbrk.o +if HAS_NETWORKING +libbsp_a_LIBADD += network.rel +endif include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am |