From 1d0ee80e4bf2ccba37ba219cfa3580da4483dbc3 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 14 May 2008 20:28:09 +0000 Subject: 2008-05-14 Joel Sherrill * Makefile.am: Rework to avoid .rel files. --- c/src/lib/libbsp/mips/jmr3904/Makefile.am | 48 ++++++------------------------- 1 file changed, 9 insertions(+), 39 deletions(-) (limited to 'c/src/lib/libbsp/mips/jmr3904/Makefile.am') diff --git a/c/src/lib/libbsp/mips/jmr3904/Makefile.am b/c/src/lib/libbsp/mips/jmr3904/Makefile.am index 35927b4794..f6373be42e 100644 --- a/c/src/lib/libbsp/mips/jmr3904/Makefile.am +++ b/c/src/lib/libbsp/mips/jmr3904/Makefile.am @@ -29,52 +29,22 @@ project_lib_DATA = start.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds -noinst_PROGRAMS += clock.rel -clock_rel_SOURCES = clock/clockdrv.c -clock_rel_CPPFLAGS = $(AM_CPPFLAGS) -clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -## Bulk of Console driver with dependencies that entails -noinst_PROGRAMS += console.rel -console_rel_SOURCES = ../../shared/console-polled.c -console_rel_CPPFLAGS = $(AM_CPPFLAGS) -console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -## used for debug IO and bottom of console polled -noinst_PROGRAMS += consoleio.rel -consoleio_rel_SOURCES = console/console-io.c -consoleio_rel_CPPFLAGS = $(AM_CPPFLAGS) -consoleio_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += startup.rel -startup_rel_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \ +startup_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \ ../../shared/bsppredriverhook.c ../../shared/bsppost.c \ + ../../shared/bsppretaskinghook.c \ startup/bspstart.c ../../shared/bootcard.c ../../shared/sbrk.c \ ../../shared/gnatinstallhandler.c ../../shared/setvec.c -startup_rel_CPPFLAGS = $(AM_CPPFLAGS) -startup_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/clockdrv.c +console_SOURCES = ../../shared/console-polled.c console/console-io.c +timer_SOURCES = timer/timer.c noinst_LIBRARIES = libbsp.a -libbsp_a_SOURCES = -libbsp_a_LIBADD = clock.rel console.rel consoleio.rel timer.rel -libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cache.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/interrupts.rel \ ../../../libcpu/@RTEMS_CPU@/tx39/vectorisrs.rel -libbsp_a_LIBADD += \ - startup_rel-bspclean.o \ - startup_rel-bsplibc.o \ - startup_rel-bsppost.o \ - startup_rel-bsppredriverhook.o \ - startup_rel-bspstart.o \ - startup_rel-bootcard.o \ - startup_rel-sbrk.o \ - startup_rel-gnatinstallhandler.o \ - startup_rel-setvec.o include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am -- cgit v1.2.3