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/sh/gensh1/ChangeLog | 4 +++ c/src/lib/libbsp/sh/gensh1/Makefile.am | 37 ++++++++---------------- c/src/lib/libbsp/sh/gensh2/ChangeLog | 4 +++ c/src/lib/libbsp/sh/gensh2/Makefile.am | 36 ++++++++---------------- c/src/lib/libbsp/sh/gensh4/ChangeLog | 4 +++ c/src/lib/libbsp/sh/gensh4/Makefile.am | 24 +++++----------- c/src/lib/libbsp/sh/shsim/ChangeLog | 4 +++ c/src/lib/libbsp/sh/shsim/Makefile.am | 51 ++++++++++------------------------ c/src/lib/libbsp/sh/simsh4/ChangeLog | 4 +++ c/src/lib/libbsp/sh/simsh4/Makefile.am | 33 ++++++---------------- 10 files changed, 73 insertions(+), 128 deletions(-) (limited to 'c/src/lib/libbsp/sh') diff --git a/c/src/lib/libbsp/sh/gensh1/ChangeLog b/c/src/lib/libbsp/sh/gensh1/ChangeLog index 2e05e9b491..06d63780e9 100644 --- a/c/src/lib/libbsp/sh/gensh1/ChangeLog +++ b/c/src/lib/libbsp/sh/gensh1/ChangeLog @@ -1,3 +1,7 @@ +2008-05-14 Joel Sherrill + + * Makefile.am: Rework to avoid .rel files. + 2008-05-12 Joel Sherrill * startup/bspstart.c: Refactored and renamed initialization routines to diff --git a/c/src/lib/libbsp/sh/gensh1/Makefile.am b/c/src/lib/libbsp/sh/gensh1/Makefile.am index a7b0c0b04a..b9916f5cc4 100644 --- a/c/src/lib/libbsp/sh/gensh1/Makefile.am +++ b/c/src/lib/libbsp/sh/gensh1/Makefile.am @@ -27,14 +27,6 @@ project_lib_DATA = start.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds -noinst_PROGRAMS += startup.rel -startup_rel_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.c \ - ../../shared/bsppredriverhook.c startup/bspstart.c startup/bspclean.c \ - ../../shared/sbrk.c ../../shared/bootcard.c \ - ../../shared/gnatinstallhandler.c -startup_rel_CPPFLAGS = $(AM_CPPFLAGS) -startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - SHGEN = $(PROJECT_TOPdir)/tools/cpu/sh/shgen scitab.c: $(SHGEN) @@ -42,25 +34,20 @@ scitab.c: $(SHGEN) BUILT_SOURCES = scitab.c CLEANFILES = scitab.c -noinst_PROGRAMS += scitab.rel -scitab_rel_SOURCES = scitab.c -scitab_rel_CPPFLAGS = $(AM_CPPFLAGS) -scitab_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += debugio.rel -debugio_rel_SOURCES = ../../shared/dummy_printk_support.c -debugio_rel_CPPFLAGS = $(AM_CPPFLAGS) -debugio_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += console.rel -console_rel_SOURCES = ../../sh/shared/console.c -console_rel_CPPFLAGS = $(AM_CPPFLAGS) -console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) +startup_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.c \ + ../../shared/bsppredriverhook.c startup/bspstart.c startup/bspclean.c \ + ../../shared/sbrk.c ../../shared/bootcard.c \ + ../../shared/gnatinstallhandler.c +scitab_SOURCES = scitab.c +console_SOURCES = ../../sh/shared/console.c +debugio_SOURCES = ../../shared/dummy_printk_support.c noinst_LIBRARIES = libbsp.a -libbsp_a_SOURCES = -libbsp_a_LIBADD = startup.rel scitab.rel console.rel debugio.rel -libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/clock.rel \ +libbsp_a_SOURCES = $(startup_SOURCES) $(scitab_SOURCES) $(console_SOURCES) \ + $(debugio_SOURCES) + +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@/sci.rel \ ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/delay.rel \ diff --git a/c/src/lib/libbsp/sh/gensh2/ChangeLog b/c/src/lib/libbsp/sh/gensh2/ChangeLog index ef94a93309..277b802500 100644 --- a/c/src/lib/libbsp/sh/gensh2/ChangeLog +++ b/c/src/lib/libbsp/sh/gensh2/ChangeLog @@ -1,3 +1,7 @@ +2008-05-14 Joel Sherrill + + * Makefile.am: Rework to avoid .rel files. + 2008-05-12 Joel Sherrill * startup/bspstart.c: Refactored and renamed initialization routines to diff --git a/c/src/lib/libbsp/sh/gensh2/Makefile.am b/c/src/lib/libbsp/sh/gensh2/Makefile.am index 3aa94f01a0..f6afaff594 100644 --- a/c/src/lib/libbsp/sh/gensh2/Makefile.am +++ b/c/src/lib/libbsp/sh/gensh2/Makefile.am @@ -27,14 +27,6 @@ project_lib_DATA = start.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds startup/linkcmds.ram \ startup/linkcmds.rom -noinst_PROGRAMS += startup.rel -startup_rel_SOURCES = startup/hw_init.c ../../shared/bsplibc.c \ - ../../shared/bsppost.c ../../shared/bsppredriverhook.c \ - startup/bspstart.c startup/bspclean.c ../../shared/sbrk.c \ - ../../shared/bootcard.c ../../shared/gnatinstallhandler.c -startup_rel_CPPFLAGS = $(AM_CPPFLAGS) -startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - SHGEN = $(PROJECT_TOPdir)/tools/cpu/sh/shgen scitab.c: $(SHGEN) @@ -42,25 +34,19 @@ scitab.c: $(SHGEN) BUILT_SOURCES = scitab.c CLEANFILES = scitab.c -noinst_PROGRAMS += scitab.rel -scitab_rel_SOURCES = scitab.c -scitab_rel_CPPFLAGS = $(AM_CPPFLAGS) -scitab_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += debugio.rel -debugio_rel_SOURCES = ../../shared/dummy_printk_support.c -debugio_rel_CPPFLAGS = $(AM_CPPFLAGS) -debugio_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += console.rel -console_rel_SOURCES = ../../sh/shared/console.c console/config.c -console_rel_CPPFLAGS = $(AM_CPPFLAGS) -console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) +startup_SOURCES = startup/hw_init.c ../../shared/bsplibc.c \ + ../../shared/bsppost.c ../../shared/bsppredriverhook.c \ + startup/bspstart.c startup/bspclean.c ../../shared/sbrk.c \ + ../../shared/bootcard.c ../../shared/gnatinstallhandler.c +scitab_SOURCES = scitab.c +console_SOURCES = ../../sh/shared/console.c console/config.c +debugio_SOURCES = ../../shared/dummy_printk_support.c noinst_LIBRARIES = libbsp.a -libbsp_a_SOURCES = -libbsp_a_LIBADD = startup.rel scitab.rel console.rel debugio.rel -libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/clock.rel \ +libbsp_a_SOURCES = $(startup_SOURCES) $(scitab_SOURCES) $(console_SOURCES) \ + $(debugio_SOURCES) +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@/sci.rel \ ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/score.rel diff --git a/c/src/lib/libbsp/sh/gensh4/ChangeLog b/c/src/lib/libbsp/sh/gensh4/ChangeLog index cf165652b6..19fe31a0ef 100644 --- a/c/src/lib/libbsp/sh/gensh4/ChangeLog +++ b/c/src/lib/libbsp/sh/gensh4/ChangeLog @@ -1,3 +1,7 @@ +2008-05-14 Joel Sherrill + + * Makefile.am: Rework to avoid .rel files. + 2008-05-12 Joel Sherrill * startup/bspstart.c: Refactored and renamed initialization routines to diff --git a/c/src/lib/libbsp/sh/gensh4/Makefile.am b/c/src/lib/libbsp/sh/gensh4/Makefile.am index 978c7bb2a7..ebe7d882cc 100644 --- a/c/src/lib/libbsp/sh/gensh4/Makefile.am +++ b/c/src/lib/libbsp/sh/gensh4/Makefile.am @@ -28,28 +28,18 @@ project_lib_DATA = start.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds startup/linkcmds.rom \ startup/linkcmds.rom2ram -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 \ ../../shared/bspclean.c ../../shared/sbrk.c ../../shared/bootcard.c \ ../../shared/gnatinstallhandler.c -startup_rel_CPPFLAGS = $(AM_CPPFLAGS) -startup_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 += hw_init.rel -hw_init_rel_SOURCES = hw_init/hw_init.c -hw_init_rel_CPPFLAGS = $(AM_CPPFLAGS) -hw_init_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) +console_SOURCES = console/console.c ../../shared/dummy_printk_support.c +hw_init_SOURCES = hw_init/hw_init.c noinst_LIBRARIES = libbsp.a -libbsp_a_SOURCES = -libbsp_a_LIBADD = startup.rel hw_init.rel console.rel -libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/clock.rel \ +libbsp_a_SOURCES = $(startup_SOURCES) $(hw_init_SOURCES) $(console_SOURCES) + +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@/sci.rel \ ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/score.rel diff --git a/c/src/lib/libbsp/sh/shsim/ChangeLog b/c/src/lib/libbsp/sh/shsim/ChangeLog index b43f47f439..6b511691bd 100644 --- a/c/src/lib/libbsp/sh/shsim/ChangeLog +++ b/c/src/lib/libbsp/sh/shsim/ChangeLog @@ -1,3 +1,7 @@ +2008-05-14 Joel Sherrill + + * Makefile.am: Rework to avoid .rel files. + 2008-05-12 Joel Sherrill * startup/bspstart.c: Refactored and renamed initialization routines to diff --git a/c/src/lib/libbsp/sh/shsim/Makefile.am b/c/src/lib/libbsp/sh/shsim/Makefile.am index fde18c8ccc..d57ce314b9 100644 --- a/c/src/lib/libbsp/sh/shsim/Makefile.am +++ b/c/src/lib/libbsp/sh/shsim/Makefile.am @@ -27,19 +27,6 @@ project_lib_DATA = start.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds startup/linkcmds.sim -noinst_PROGRAMS += startup.rel -startup_rel_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.c \ - ../../shared/bsppredriverhook.c startup/bspstart.c \ - ../../shared/bspclean.c ../../shared/sbrk.c ../../shared/bootcard.c \ - ../../shared/gnatinstallhandler.c -startup_rel_CPPFLAGS = $(AM_CPPFLAGS) -startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += clock.rel -clock_rel_SOURCES = clock/clockdrv.c -clock_rel_CPPFLAGS = $(AM_CPPFLAGS) -clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - SHGEN = $(PROJECT_TOPdir)/tools/cpu/sh/shgen scitab.c: $(SHGEN) @@ -47,35 +34,25 @@ scitab.c: $(SHGEN) BUILT_SOURCES = scitab.c CLEANFILES = scitab.c -noinst_PROGRAMS += scitab.rel -scitab_rel_SOURCES = scitab.c -scitab_rel_CPPFLAGS = $(AM_CPPFLAGS) -scitab_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += gdbsci.rel -gdbsci_rel_SOURCES = gdbsci/gdbsci.c -gdbsci_rel_CPPFLAGS = $(AM_CPPFLAGS) -gdbsci_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) +startup_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.c \ + ../../shared/bsppredriverhook.c startup/bspstart.c \ + ../../shared/bspclean.c ../../shared/sbrk.c ../../shared/bootcard.c \ + ../../shared/gnatinstallhandler.c +clock_SOURCES = clock/clockdrv.c +scitab_SOURCES = scitab.c +gdbsci_SOURCES = gdbsci/gdbsci.c -# # FIXME: trap34 is unused -# -noinst_PROGRAMS += trap34.rel -trap34_rel_SOURCES = trap34/console-io.c trap34/console-support.S \ +trap34_SOURCES = trap34/console-io.c trap34/console-support.S \ ../../shared/dummy_printk_support.c -trap34_rel_CPPFLAGS = $(AM_CPPFLAGS) -trap34_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += console.rel -console_rel_SOURCES = ../../sh/shared/console.c -console_rel_CPPFLAGS = $(AM_CPPFLAGS) -console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) +console_SOURCES = ../../sh/shared/console.c noinst_LIBRARIES = libbsp.a -libbsp_a_SOURCES = -libbsp_a_LIBADD = startup.rel clock.rel console.rel gdbsci.rel scitab.rel \ - trap34.rel -libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/score.rel +libbsp_a_SOURCES = $(startup_SOURCES) $(clock_SOURCES) $(console_SOURCES) \ + $(gdbsci_SOURCES) $(scitab_SOURCES) $(trap34_SOURCES) + +libbsp_a_LIBADD = \ + ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/score.rel include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/sh/simsh4/ChangeLog b/c/src/lib/libbsp/sh/simsh4/ChangeLog index eb246985c3..5b56d5a677 100644 --- a/c/src/lib/libbsp/sh/simsh4/ChangeLog +++ b/c/src/lib/libbsp/sh/simsh4/ChangeLog @@ -1,3 +1,7 @@ +2008-05-14 Joel Sherrill + + * Makefile.am: Rework to avoid .rel files. + 2008-05-12 Joel Sherrill * startup/bspstart.c: Refactored and renamed initialization routines to diff --git a/c/src/lib/libbsp/sh/simsh4/Makefile.am b/c/src/lib/libbsp/sh/simsh4/Makefile.am index b4150d5a47..a31cb6b0e3 100644 --- a/c/src/lib/libbsp/sh/simsh4/Makefile.am +++ b/c/src/lib/libbsp/sh/simsh4/Makefile.am @@ -33,35 +33,20 @@ project_lib_DATA = start.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds startup/linkcmds-le \ startup/linkcmds-le.coff -noinst_PROGRAMS += startup.rel -startup_rel_SOURCES = startup/hw_init.c ../../shared/bsplibc.c \ +startup_SOURCES = startup/hw_init.c ../../shared/bsplibc.c \ ../../shared/bsppost.c ../../shared/bsppredriverhook.c \ startup/bspstart.c ../../shared/bspclean.c ../../shared/sbrk.c \ ../../shared/bootcard.c ../../shared/gnatinstallhandler.c -startup_rel_CPPFLAGS = $(AM_CPPFLAGS) -startup_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 += clock.rel -clock_rel_SOURCES = clock/ckinit.c -clock_rel_CPPFLAGS = $(AM_CPPFLAGS) -clock_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/ckinit.c +console_SOURCES = console/console.c ../../shared/dummy_printk_support.c +timer_SOURCES = timer/timer.c noinst_LIBRARIES = libbsp.a -libbsp_a_SOURCES = -libbsp_a_LIBADD = startup.rel console.rel clock.rel timer.rel -# FIXME: This is missing. -# libbsp_a_LIBADD += ramdisk.rel -libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/score.rel +libbsp_a_SOURCES = $(startup_SOURCES) $(clock_SOURCES) $(console_SOURCES) \ + $(timer_SOURCES) + +libbsp_a_LIBADD = \ + ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/score.rel include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am -- cgit v1.2.3