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/m68k/gen68360 | |
| 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/m68k/gen68360')
| -rw-r--r-- | c/src/lib/libbsp/m68k/gen68360/ChangeLog | 4 | ||||
| -rw-r--r-- | c/src/lib/libbsp/m68k/gen68360/Makefile.am | 33 |
2 files changed, 14 insertions, 23 deletions
diff --git a/c/src/lib/libbsp/m68k/gen68360/ChangeLog b/c/src/lib/libbsp/m68k/gen68360/ChangeLog index ef61c068aa..4379aa486d 100644 --- a/c/src/lib/libbsp/m68k/gen68360/ChangeLog +++ b/c/src/lib/libbsp/m68k/gen68360/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/m68k/gen68360/Makefile.am b/c/src/lib/libbsp/m68k/gen68360/Makefile.am index 82ea71ce26..93f1ee2061 100644 --- a/c/src/lib/libbsp/m68k/gen68360/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68360/Makefile.am @@ -26,31 +26,16 @@ project_lib_DATA = start.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds startup/linkcmds.prom \ startup/linkcmds.bootp -noinst_PROGRAMS += startup.rel -startup_rel_SOURCES = startup/alloc360.c startup/bspclean.c \ +startup_SOURCES = startup/alloc360.c startup/bspclean.c \ ../../shared/bsppredriverhook.c \ ../../shared/bsplibc.c ../../shared/bsppost.c \ ../../m68k/shared/m68kpretaskinghook.c startup/bspstart.c \ startup/init68360.c ../../shared/bootcard.c \ ../../shared/sbrk.c ../../m68k/shared/setvec.c \ ../../shared/gnatinstallhandler.c -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 ../../shared/dummy_printk_support.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 ../../shared/dummy_printk_support.c +timer_SOURCES = timer/timer.c if HAS_NETWORKING network_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ @@ -61,13 +46,15 @@ network_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) endif noinst_LIBRARIES = libbsp.a -libbsp_a_SOURCES = -libbsp_a_LIBADD = startup.rel clock.rel console.rel timer.rel +libbsp_a_SOURCES = $(startup_SOURCES) $(clock_SOURCES) $(console_SOURCES) \ + $(timer_SOURCES) + +libbsp_a_LIBADD = \ + ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \ + ../../../libcpu/@RTEMS_CPU@/shared/misc.rel if HAS_NETWORKING libbsp_a_LIBADD += network.rel endif -libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \ - ../../../libcpu/@RTEMS_CPU@/shared/misc.rel if HAS_FPSP libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/fpsp.rel endif |