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/gp32 | |
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/gp32')
-rw-r--r-- | c/src/lib/libbsp/arm/gp32/ChangeLog | 4 | ||||
-rw-r--r-- | c/src/lib/libbsp/arm/gp32/Makefile.am | 30 |
2 files changed, 12 insertions, 22 deletions
diff --git a/c/src/lib/libbsp/arm/gp32/ChangeLog b/c/src/lib/libbsp/arm/gp32/ChangeLog index 88044977fe..9ede7f0537 100644 --- a/c/src/lib/libbsp/arm/gp32/ChangeLog +++ b/c/src/lib/libbsp/arm/gp32/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/gp32/Makefile.am b/c/src/lib/libbsp/arm/gp32/Makefile.am index 2d314ec439..f648fa8c98 100644 --- a/c/src/lib/libbsp/arm/gp32/Makefile.am +++ b/c/src/lib/libbsp/arm/gp32/Makefile.am @@ -26,34 +26,20 @@ project_lib_DATA = start.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds -noinst_PROGRAMS += startup.rel -startup_rel_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.c \ +startup_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.c \ ../../shared/bsppredriverhook.c \ startup/bspstart.c startup/exit.c startup/memmap.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 = console/uart.c ../../shared/console.c -console_rel_CPPFLAGS = $(AM_CPPFLAGS) -console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += abort.rel -abort_rel_SOURCES = ../shared/abort/abort.c -abort_rel_CPPFLAGS = $(AM_CPPFLAGS) -abort_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += smc.rel -smc_rel_SOURCES = smc/smc.c smc/smc.h -smc_rel_CPPFLAGS = $(AM_CPPFLAGS) -smc_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) +console_SOURCES = console/uart.c ../../shared/console.c +abort_SOURCES = ../shared/abort/abort.c +smc_SOURCES = smc/smc.c smc/smc.h noinst_LIBRARIES = libbsp.a -libbsp_a_SOURCES = -libbsp_a_LIBADD = startup.rel console.rel smc.rel abort.rel -libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/arm920.rel \ +libbsp_a_SOURCES = $(startup_SOURCES) $(console_SOURCES) $(abort_SOURCES) \ + $(smc_SOURCES) + +libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/arm920.rel \ ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/clock.rel \ ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/timer.rel \ ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/irq.rel |