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/arm/csb336/ChangeLog | 4 + c/src/lib/libbsp/arm/csb336/Makefile.am | 30 ++---- c/src/lib/libbsp/arm/csb337/ChangeLog | 4 + c/src/lib/libbsp/arm/csb337/Makefile.am | 29 ++---- c/src/lib/libbsp/arm/edb7312/ChangeLog | 4 + c/src/lib/libbsp/arm/edb7312/Makefile.am | 44 +++------ c/src/lib/libbsp/arm/gba/ChangeLog | 4 + c/src/lib/libbsp/arm/gba/Makefile.am | 47 ++++------ c/src/lib/libbsp/arm/gp32/ChangeLog | 4 + c/src/lib/libbsp/arm/gp32/Makefile.am | 30 ++---- c/src/lib/libbsp/arm/rtl22xx/ChangeLog | 4 + c/src/lib/libbsp/arm/rtl22xx/Makefile.am | 44 ++------- c/src/lib/libbsp/arm/smdk2410/ChangeLog | 4 + c/src/lib/libbsp/arm/smdk2410/Makefile.am | 30 ++---- c/src/lib/libbsp/bfin/eZKit533/ChangeLog | 4 + c/src/lib/libbsp/bfin/eZKit533/Makefile.am | 27 ++---- c/src/lib/libbsp/c4x/c4xsim/ChangeLog | 4 + c/src/lib/libbsp/c4x/c4xsim/Makefile.am | 27 ++---- c/src/lib/libbsp/h8300/h8sim/ChangeLog | 4 + c/src/lib/libbsp/h8300/h8sim/Makefile.am | 27 ++---- c/src/lib/libbsp/i386/i386ex/ChangeLog | 4 + c/src/lib/libbsp/i386/i386ex/Makefile.am | 39 +++----- c/src/lib/libbsp/i386/ts_386ex/ChangeLog | 4 + c/src/lib/libbsp/i386/ts_386ex/Makefile.am | 39 +++----- c/src/lib/libbsp/m68k/av5282/ChangeLog | 4 + c/src/lib/libbsp/m68k/av5282/Makefile.am | 36 +++----- c/src/lib/libbsp/m68k/csb360/ChangeLog | 4 + c/src/lib/libbsp/m68k/csb360/Makefile.am | 19 ++-- c/src/lib/libbsp/m68k/gen68302/ChangeLog | 4 + c/src/lib/libbsp/m68k/gen68302/Makefile.am | 33 ++----- c/src/lib/libbsp/m68k/gen68340/ChangeLog | 4 + c/src/lib/libbsp/m68k/gen68340/Makefile.am | 31 ++----- c/src/lib/libbsp/m68k/gen68360/ChangeLog | 4 + c/src/lib/libbsp/m68k/gen68360/Makefile.am | 33 ++----- c/src/lib/libbsp/m68k/idp/ChangeLog | 4 + c/src/lib/libbsp/m68k/idp/Makefile.am | 31 ++----- c/src/lib/libbsp/m68k/mcf5206elite/ChangeLog | 4 + c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am | 37 ++------ c/src/lib/libbsp/m68k/mcf5235/ChangeLog | 4 + c/src/lib/libbsp/m68k/mcf5235/Makefile.am | 33 ++----- c/src/lib/libbsp/m68k/mrm332/ChangeLog | 4 + c/src/lib/libbsp/m68k/mrm332/Makefile.am | 37 ++------ c/src/lib/libbsp/m68k/mvme136/ChangeLog | 4 + c/src/lib/libbsp/m68k/mvme136/Makefile.am | 62 +++---------- c/src/lib/libbsp/m68k/mvme147/ChangeLog | 4 + c/src/lib/libbsp/m68k/mvme147/Makefile.am | 31 ++----- c/src/lib/libbsp/m68k/mvme147s/ChangeLog | 4 + c/src/lib/libbsp/m68k/mvme147s/Makefile.am | 39 ++------ c/src/lib/libbsp/m68k/mvme162/ChangeLog | 4 + c/src/lib/libbsp/m68k/mvme162/Makefile.am | 42 +++------ c/src/lib/libbsp/m68k/mvme167/ChangeLog | 4 + c/src/lib/libbsp/m68k/mvme167/Makefile.am | 41 +++------ c/src/lib/libbsp/m68k/ods68302/ChangeLog | 4 + c/src/lib/libbsp/m68k/ods68302/Makefile.am | 31 ++----- c/src/lib/libbsp/m68k/sim68000/ChangeLog | 4 + c/src/lib/libbsp/m68k/sim68000/Makefile.am | 30 ++---- c/src/lib/libbsp/m68k/uC5282/ChangeLog | 4 + c/src/lib/libbsp/m68k/uC5282/Makefile.am | 32 ++----- c/src/lib/libbsp/mips/csb350/ChangeLog | 4 + c/src/lib/libbsp/mips/csb350/Makefile.am | 39 +++----- c/src/lib/libbsp/mips/genmongoosev/ChangeLog | 4 + c/src/lib/libbsp/mips/genmongoosev/Makefile.am | 42 ++++----- c/src/lib/libbsp/mips/hurricane/ChangeLog | 4 + c/src/lib/libbsp/mips/hurricane/Makefile.am | 31 ++----- c/src/lib/libbsp/mips/jmr3904/ChangeLog | 4 + c/src/lib/libbsp/mips/jmr3904/Makefile.am | 48 ++-------- c/src/lib/libbsp/mips/rbtx4925/ChangeLog | 4 + c/src/lib/libbsp/mips/rbtx4925/Makefile.am | 22 ++--- c/src/lib/libbsp/mips/rbtx4938/ChangeLog | 4 + c/src/lib/libbsp/mips/rbtx4938/Makefile.am | 23 ++--- c/src/lib/libbsp/nios2/nios2_iss/ChangeLog | 4 + c/src/lib/libbsp/nios2/nios2_iss/Makefile.am | 40 ++------ c/src/lib/libbsp/no_cpu/no_bsp/ChangeLog | 4 + c/src/lib/libbsp/no_cpu/no_bsp/Makefile.am | 40 ++------ c/src/lib/libbsp/powerpc/ep1a/ChangeLog | 4 + c/src/lib/libbsp/powerpc/ep1a/Makefile.am | 57 +++--------- c/src/lib/libbsp/powerpc/gen5200/ChangeLog | 4 + c/src/lib/libbsp/powerpc/gen5200/Makefile.am | 80 +++++----------- c/src/lib/libbsp/powerpc/gen83xx/ChangeLog | 4 + c/src/lib/libbsp/powerpc/gen83xx/Makefile.am | 66 ++++--------- c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog | 4 + c/src/lib/libbsp/powerpc/mbx8xx/Makefile.am | 51 +++-------- .../lib/libbsp/powerpc/motorola_powerpc/ChangeLog | 4 + .../libbsp/powerpc/motorola_powerpc/Makefile.am | 79 +++++----------- c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog | 4 + c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am | 41 +++------ c/src/lib/libbsp/powerpc/mvme3100/ChangeLog | 4 + c/src/lib/libbsp/powerpc/mvme3100/Makefile.am | 84 +++++------------ c/src/lib/libbsp/powerpc/mvme5500/ChangeLog | 4 + c/src/lib/libbsp/powerpc/mvme5500/Makefile.am | 102 ++++++--------------- c/src/lib/libbsp/powerpc/score603e/ChangeLog | 4 + c/src/lib/libbsp/powerpc/score603e/Makefile.am | 67 +++----------- c/src/lib/libbsp/powerpc/ss555/ChangeLog | 4 + c/src/lib/libbsp/powerpc/ss555/Makefile.am | 31 ++----- c/src/lib/libbsp/powerpc/virtex/ChangeLog | 4 + c/src/lib/libbsp/powerpc/virtex/Makefile.am | 50 +++------- 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 ++----- c/src/lib/libbsp/unix/posix/ChangeLog | 4 + c/src/lib/libbsp/unix/posix/Makefile.am | 37 ++------ 108 files changed, 830 insertions(+), 1608 deletions(-) (limited to 'c/src/lib') diff --git a/c/src/lib/libbsp/arm/csb336/ChangeLog b/c/src/lib/libbsp/arm/csb336/ChangeLog index d419cbab43..1218439cca 100644 --- a/c/src/lib/libbsp/arm/csb336/ChangeLog +++ b/c/src/lib/libbsp/arm/csb336/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/arm/csb336/Makefile.am b/c/src/lib/libbsp/arm/csb336/Makefile.am index cc1b6246b9..18491a6e45 100644 --- a/c/src/lib/libbsp/arm/csb336/Makefile.am +++ b/c/src/lib/libbsp/arm/csb336/Makefile.am @@ -25,24 +25,13 @@ 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 -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) +console_SOURCES = console/uart.c +abort_SOURCES = ../shared/abort/abort.c if HAS_NETWORKING network_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ @@ -53,15 +42,16 @@ network_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) endif noinst_LIBRARIES = libbsp.a -libbsp_a_SOURCES = -libbsp_a_LIBADD = startup.rel console.rel abort.rel -if HAS_NETWORKING -libbsp_a_LIBADD += network.rel -endif -libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/arm920.rel \ +libbsp_a_SOURCES = $(startup_SOURCES) $(console_SOURCES) $(abort_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 +if HAS_NETWORKING +libbsp_a_LIBADD += network.rel +endif + include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/arm/csb337/ChangeLog b/c/src/lib/libbsp/arm/csb337/ChangeLog index 77f68dd5c1..3b6374f190 100644 --- a/c/src/lib/libbsp/arm/csb337/ChangeLog +++ b/c/src/lib/libbsp/arm/csb337/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/arm/csb337/Makefile.am b/c/src/lib/libbsp/arm/csb337/Makefile.am index 88e0b98e93..01a7dca701 100644 --- a/c/src/lib/libbsp/arm/csb337/Makefile.am +++ b/c/src/lib/libbsp/arm/csb337/Makefile.am @@ -25,24 +25,13 @@ 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/uarts.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) +console_SOURCES = console/uarts.c ../../shared/console.c +abort_SOURCES = ../shared/abort/abort.c if HAS_NETWORKING network_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ @@ -53,17 +42,17 @@ network_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) endif noinst_LIBRARIES = libbsp.a -libbsp_a_SOURCES = -libbsp_a_LIBADD = startup.rel console.rel abort.rel -if HAS_NETWORKING -libbsp_a_LIBADD += network.rel -endif -libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/arm920.rel \ +libbsp_a_SOURCES = $(startup_SOURCES) $(console_SOURCES) $(abort_SOURCES) + +libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/arm920.rel \ ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/clock.rel \ ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/dbgu.rel \ ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/timer.rel \ ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/pmc.rel \ ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/irq.rel +if HAS_NETWORKING +libbsp_a_LIBADD += network.rel +endif include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/arm/edb7312/ChangeLog b/c/src/lib/libbsp/arm/edb7312/ChangeLog index e37dae7d0c..03f3e1db08 100644 --- a/c/src/lib/libbsp/arm/edb7312/ChangeLog +++ b/c/src/lib/libbsp/arm/edb7312/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/arm/edb7312/Makefile.am b/c/src/lib/libbsp/arm/edb7312/Makefile.am index 12a176a07a..e1b0e8aec9 100644 --- a/c/src/lib/libbsp/arm/edb7312/Makefile.am +++ b/c/src/lib/libbsp/arm/edb7312/Makefile.am @@ -26,43 +26,20 @@ 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/exit.c ../../shared/bootcard.c \ ../../shared/sbrk.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) - -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 += timer.rel -timer_rel_SOURCES = timer/timer.c -timer_rel_CPPFLAGS = $(AM_CPPFLAGS) -timer_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) +clock_SOURCES = clock/clockdrv.c +console_SOURCES = console/uart.c ../../shared/console.c +timer_SOURCES = timer/timer.c +abort_SOURCES = ../shared/abort/abort.c include_HEADERS += irq/irq.h - -noinst_PROGRAMS += irq.rel -irq_rel_SOURCES = irq/irq.c irq/bsp_irq_init.c \ +irq_SOURCES = irq/irq.c irq/bsp_irq_init.c \ ../../arm/shared/irq/irq_init.c irq/bsp_irq_asm.S \ ../../arm/shared/irq/irq_asm.S irq/irq.h -irq_rel_CPPFLAGS = $(AM_CPPFLAGS) -irq_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) if HAS_NETWORKING network_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ @@ -73,8 +50,13 @@ network_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) endif noinst_LIBRARIES = libbsp.a -libbsp_a_SOURCES = -libbsp_a_LIBADD = clock.rel console.rel startup.rel irq.rel timer.rel abort.rel +libbsp_a_SOURCES = $(startup_SOURCES) $(clock_SOURCES) $(console_SOURCES) \ + $(timer_SOURCES) $(abort_SOURCES) $(irq_SOURCES) + +include_HEADERS += irq/irq.h + +# libcpu libraries could go here +libbsp_a_LIBADD = if HAS_NETWORKING libbsp_a_LIBADD += network.rel endif diff --git a/c/src/lib/libbsp/arm/gba/ChangeLog b/c/src/lib/libbsp/arm/gba/ChangeLog index c204fe381b..8c8103be5f 100644 --- a/c/src/lib/libbsp/arm/gba/ChangeLog +++ b/c/src/lib/libbsp/arm/gba/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/arm/gba/Makefile.am b/c/src/lib/libbsp/arm/gba/Makefile.am index e4360a479e..b28dfbc316 100644 --- a/c/src/lib/libbsp/arm/gba/Makefile.am +++ b/c/src/lib/libbsp/arm/gba/Makefile.am @@ -29,43 +29,32 @@ 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/exit.c startup/cpu.c startup/cpu_asm.S \ +# some objects have to be forced together to ensure they are ALWAYS +# the ones linked into the application executable. Every application +# needs startup/bspstart.c, so we will force in the others +noinst_PROGRAMS += gbaoverrides.rel +gbaoverrides_rel_SOURCES = startup/bspstart.c startup/cpu.c startup/cpu_asm.S +gbaoverrides_rel_CPPFLAGS = $(AM_CPPFLAGS) +gbaoverrides_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) + +startup_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.c \ + ../../shared/bsppredriverhook.c startup/exit.c \ ../../shared/bootcard.c ../../shared/sbrk.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) - -noinst_PROGRAMS += console.rel -console_rel_SOURCES = console/conio.c console/console.c \ +clock_SOURCES = clock/clockdrv.c +console_SOURCES = console/conio.c console/console.c \ console/defaultfont.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) +timer_SOURCES = timer/timer.c include_HEADERS += irq/irq.h - -noinst_PROGRAMS += irq.rel -irq_rel_SOURCES = irq/irq.c irq/bsp_irq_init.c irq/irq_init.c \ +irq_SOURCES = irq/irq.c irq/bsp_irq_init.c irq/irq_init.c \ irq/bsp_irq_asm.S irq/irq_asm.S -irq_rel_CPPFLAGS = $(AM_CPPFLAGS) -irq_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) noinst_LIBRARIES = libbsp.a -libbsp_a_SOURCES = -libbsp_a_LIBADD = clock.rel console.rel \ - startup.rel irq.rel timer.rel +libbsp_a_SOURCES = $(startup_SOURCES) $(clock_SOURCES) $(console_SOURCES) \ + $(timer_SOURCES) $(irq_SOURCES) + +libbsp_a_LIBADD = gbaoverrides.rel if HAS_NETWORKING ## endif 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 + + * 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/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 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 + + * 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/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 diff --git a/c/src/lib/libbsp/arm/smdk2410/ChangeLog b/c/src/lib/libbsp/arm/smdk2410/ChangeLog index 3369959fed..92115564b1 100644 --- a/c/src/lib/libbsp/arm/smdk2410/ChangeLog +++ b/c/src/lib/libbsp/arm/smdk2410/ChangeLog @@ -1,3 +1,7 @@ +2008-05-14 Joel Sherrill + + * Makefile.am: Rework to avoid .rel files. + 2008-05-07 Joel Sherrill * .cvsignore: New file. diff --git a/c/src/lib/libbsp/arm/smdk2410/Makefile.am b/c/src/lib/libbsp/arm/smdk2410/Makefile.am index 86a9a57d5b..85a04a241b 100644 --- a/c/src/lib/libbsp/arm/smdk2410/Makefile.am +++ b/c/src/lib/libbsp/arm/smdk2410/Makefile.am @@ -24,33 +24,19 @@ 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 \ ../gp32/startup/bspstart.c ../gp32/startup/exit.c startup/memmap.c \ ../../shared/bootcard.c ../../shared/sbrk.c \ ../../shared/bsppredriverhook.c ../../shared/gnatinstallhandler.c -startup_rel_CPPFLAGS = $(AM_CPPFLAGS) -startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += console.rel -console_rel_SOURCES = ../gp32/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 = ../gp32/smc/smc.c ../gp32/smc/smc.h -smc_rel_CPPFLAGS = $(AM_CPPFLAGS) -smc_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) +console_SOURCES = ../gp32/console/uart.c ../../shared/console.c +abort_SOURCES = ../shared/abort/abort.c +smc_SOURCES = ../gp32/smc/smc.c ../gp32/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 diff --git a/c/src/lib/libbsp/bfin/eZKit533/ChangeLog b/c/src/lib/libbsp/bfin/eZKit533/ChangeLog index 7abdf11b86..521c823bbf 100644 --- a/c/src/lib/libbsp/bfin/eZKit533/ChangeLog +++ b/c/src/lib/libbsp/bfin/eZKit533/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/bfin/eZKit533/Makefile.am b/c/src/lib/libbsp/bfin/eZKit533/Makefile.am index c3a591fc0a..c3faace98f 100644 --- a/c/src/lib/libbsp/bfin/eZKit533/Makefile.am +++ b/c/src/lib/libbsp/bfin/eZKit533/Makefile.am @@ -26,32 +26,17 @@ 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 \ ../../shared/bspclean.c ../../shared/sbrk.c ../../shared/setvec.c \ ../../shared/bootcard.c ../../shared/gnatinstallhandler.c -startup_rel_CPPFLAGS = $(AM_CPPFLAGS) -startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += clock.rel -clock_rel_SOURCES = ../shared/clock/clockdrv.c ../shared/clock/rtc.c -clock_rel_CPPFLAGS = $(AM_CPPFLAGS) -clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += console.rel -console_rel_SOURCES = console/console-io.c ../shared/console/console.c -console_rel_CPPFLAGS = -console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += timer.rel -timer_rel_SOURCES = ../shared/timer/timer.c -timer_rel_CPPFLAGS = $(AM_CPPFLAGS) -timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) +clock_SOURCES = ../shared/clock/clockdrv.c ../shared/clock/rtc.c +console_SOURCES = console/console-io.c ../shared/console/console.c +timer_SOURCES = ../shared/timer/timer.c 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) EXTRA_DIST += times diff --git a/c/src/lib/libbsp/c4x/c4xsim/ChangeLog b/c/src/lib/libbsp/c4x/c4xsim/ChangeLog index 119de0c5bb..18196eff9e 100644 --- a/c/src/lib/libbsp/c4x/c4xsim/ChangeLog +++ b/c/src/lib/libbsp/c4x/c4xsim/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/c4x/c4xsim/Makefile.am b/c/src/lib/libbsp/c4x/c4xsim/Makefile.am index 1383fb6480..ef98387410 100644 --- a/c/src/lib/libbsp/c4x/c4xsim/Makefile.am +++ b/c/src/lib/libbsp/c4x/c4xsim/Makefile.am @@ -31,36 +31,21 @@ project_lib_DATA = start.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds -noinst_PROGRAMS += startup.rel -startup_rel_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \ +startup_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \ ../../shared/bsppredriverhook.c \ ../../shared/bsppost.c startup/bspstart.c \ ../../shared/bootcard.c ../../shared/sbrk.c ../../shared/setvec.c \ ../../c4x/shared/c3xspurious.c ../../c4x/shared/c4xspurious.c \ ../../c4x/shared/bspspuriousinit.c startup/spurious.c \ ../../shared/gnatinstallhandler.c -startup_rel_CPPFLAGS = $(AM_CPPFLAGS) -startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += console.rel -console_rel_SOURCES = console/consolereserveresources.c console/debugio.c \ +clock_SOURCES = clock/clock.c +console_SOURCES = console/consolereserveresources.c console/debugio.c \ console/simio.c ../../shared/console.c -console_rel_CPPFLAGS = $(AM_CPPFLAGS) -console_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 += timer.rel -timer_rel_SOURCES = timer/timer.c -timer_rel_CPPFLAGS = $(AM_CPPFLAGS) -timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) +timer_SOURCES = timer/timer.c noinst_LIBRARIES = libbsp.a -libbsp_a_SOURCES = -libbsp_a_LIBADD = startup.rel console.rel clock.rel timer.rel +libbsp_a_SOURCES = $(startup_SOURCES) $(clock_SOURCES) $(console_SOURCES) \ + $(timer_SOURCES) EXTRA_DIST += times diff --git a/c/src/lib/libbsp/h8300/h8sim/ChangeLog b/c/src/lib/libbsp/h8300/h8sim/ChangeLog index adce930594..f110312a87 100644 --- a/c/src/lib/libbsp/h8300/h8sim/ChangeLog +++ b/c/src/lib/libbsp/h8300/h8sim/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/h8300/h8sim/Makefile.am b/c/src/lib/libbsp/h8300/h8sim/Makefile.am index 961cf67a79..5ae51d37de 100644 --- a/c/src/lib/libbsp/h8300/h8sim/Makefile.am +++ b/c/src/lib/libbsp/h8300/h8sim/Makefile.am @@ -25,32 +25,17 @@ project_lib_DATA = start.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds -noinst_PROGRAMS += startup.rel -startup_rel_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \ +startup_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \ ../../shared/bsppredriverhook.c \ ../../shared/bsppost.c startup/bspstart.c ../../shared/bootcard.c \ ../../shared/sbrk.c ../../shared/gnatinstallhandler.c startup/__main.c -startup_rel_CPPFLAGS = $(AM_CPPFLAGS) -startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += clock.rel -clock_rel_SOURCES = ../../shared/clock_driver_stub.c -clock_rel_CPPFLAGS = $(AM_CPPFLAGS) -clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += console.rel -console_rel_SOURCES = ../../shared/console-polled.c console/console-io.c -console_rel_CPPFLAGS = $(AM_CPPFLAGS) -console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += timer.rel -timer_rel_SOURCES = ../../shared/timerstub.c -timer_rel_CPPFLAGS = $(AM_CPPFLAGS) -timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) +clock_SOURCES = ../../shared/clock_driver_stub.c +console_SOURCES = ../../shared/console-polled.c console/console-io.c +timer_SOURCES = ../../shared/timerstub.c 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) EXTRA_DIST += times diff --git a/c/src/lib/libbsp/i386/i386ex/ChangeLog b/c/src/lib/libbsp/i386/i386ex/ChangeLog index bf1dd8f5bd..ba471afc7e 100644 --- a/c/src/lib/libbsp/i386/i386ex/ChangeLog +++ b/c/src/lib/libbsp/i386/i386ex/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/i386/i386ex/Makefile.am b/c/src/lib/libbsp/i386/i386ex/Makefile.am index 659183a081..c4c6329328 100644 --- a/c/src/lib/libbsp/i386/i386ex/Makefile.am +++ b/c/src/lib/libbsp/i386/i386ex/Makefile.am @@ -31,9 +31,8 @@ start.$(OBJEXT): start/start.S project_lib_DATA = start.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds -noinst_PROGRAMS += startup.rel include_HEADERS += ../../i386/shared/comm/uart.h -startup_rel_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \ +startup_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \ ../../shared/bsppredriverhook.c \ ../../shared/bsppost.c startup/bspstart.c ../../shared/bootcard.c \ ../../shared/sbrk.c ../../i386/shared/irq/idt.c \ @@ -42,30 +41,12 @@ startup_rel_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \ ../../i386/shared/comm/i386-stub-glue.c ../../i386/shared/comm/uart.c \ ../../shared/gnatinstallhandler.c ../../i386/shared/comm/gdb_glue.c \ ../../i386/shared/comm/tty_drv.c ../../i386/shared/irq/irq_asm.S -startup_rel_CPPFLAGS = $(AM_CPPFLAGS) -startup_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 += console.rel -console_rel_SOURCES = console/console.c -console_rel_CPPFLAGS = $(AM_CPPFLAGS) -console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += pci.rel +clock_SOURCES = clock/ckinit.c +console_SOURCES = console/console.c include_HEADERS += ../../i386/shared/pci/pcibios.h -pci_rel_SOURCES = ../../i386/shared/pci/pcibios.c \ +pci_SOURCES = ../../i386/shared/pci/pcibios.c \ ../../i386/shared/pci/pcibios.h -pci_rel_CPPFLAGS = $(AM_CPPFLAGS) -pci_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += timer.rel -timer_rel_SOURCES = timer/timer.c timer/timerisr.S -timer_rel_CPPFLAGS = $(AM_CPPFLAGS) -timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) +timer_SOURCES = timer/timer.c timer/timerisr.S if HAS_NETWORKING network_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ -D_KERNEL @@ -77,13 +58,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 pci.rel +libbsp_a_SOURCES = $(startup_SOURCES) $(clock_SOURCES) $(console_SOURCES) \ + $(pci_SOURCES) $(timer_SOURCES) + +libbsp_a_LIBADD = \ + ../../../libcpu/@RTEMS_CPU@/cache.rel \ + ../../../libcpu/@RTEMS_CPU@/score.rel if HAS_NETWORKING libbsp_a_LIBADD += network.rel endif -libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/cache.rel \ - ../../../libcpu/@RTEMS_CPU@/score.rel include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/i386/ts_386ex/ChangeLog b/c/src/lib/libbsp/i386/ts_386ex/ChangeLog index c83ffd39d1..6bd474e6fa 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/ChangeLog +++ b/c/src/lib/libbsp/i386/ts_386ex/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/i386/ts_386ex/Makefile.am b/c/src/lib/libbsp/i386/ts_386ex/Makefile.am index 1a8a83db26..ebc0c31f0a 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/Makefile.am +++ b/c/src/lib/libbsp/i386/ts_386ex/Makefile.am @@ -37,9 +37,8 @@ project_lib_DATA = start.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds -noinst_PROGRAMS += startup.rel include_HEADERS += ../../i386/shared/comm/uart.h -startup_rel_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \ +startup_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \ ../../shared/bsppredriverhook.c \ ../../shared/bsppost.c startup/bspstart.c ../../shared/bootcard.c \ ../../shared/sbrk.c ../../i386/shared/irq/idt.c \ @@ -48,30 +47,12 @@ startup_rel_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \ ../../i386/shared/comm/i386-stub-glue.c ../../i386/shared/comm/uart.c \ ../../shared/gnatinstallhandler.c ../../i386/shared/comm/gdb_glue.c \ ../../i386/shared/comm/tty_drv.c ../../i386/shared/irq/irq_asm.S -startup_rel_CPPFLAGS = $(AM_CPPFLAGS) -startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += clock.rel -clock_rel_SOURCES = clock/ckinit.c clock/rtc.c -clock_rel_CPPFLAGS = $(AM_CPPFLAGS) -clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += console.rel -console_rel_SOURCES = console/console.c -console_rel_CPPFLAGS = $(AM_CPPFLAGS) -console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += pci.rel +clock_SOURCES = clock/ckinit.c clock/rtc.c +console_SOURCES = console/console.c include_HEADERS += ../../i386/shared/pci/pcibios.h -pci_rel_SOURCES = ../../i386/shared/pci/pcibios.c \ +pci_SOURCES = ../../i386/shared/pci/pcibios.c \ ../../i386/shared/pci/pcibios.h -pci_rel_CPPFLAGS = $(AM_CPPFLAGS) -pci_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += timer.rel -timer_rel_SOURCES = timer/timer.c timer/timerisr.S -timer_rel_CPPFLAGS = $(AM_CPPFLAGS) -timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) +timer_SOURCES = timer/timer.c timer/timerisr.S if HAS_NETWORKING include_HEADERS += include/wd80x3.h @@ -86,13 +67,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 pci.rel +libbsp_a_SOURCES = $(startup_SOURCES) $(clock_SOURCES) $(console_SOURCES) \ + $(pci_SOURCES) $(timer_SOURCES) + +libbsp_a_LIBADD = \ + ../../../libcpu/@RTEMS_CPU@/cache.rel \ + ../../../libcpu/@RTEMS_CPU@/score.rel if HAS_NETWORKING libbsp_a_LIBADD += network.rel endif -libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/cache.rel \ - ../../../libcpu/@RTEMS_CPU@/score.rel include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/m68k/av5282/ChangeLog b/c/src/lib/libbsp/m68k/av5282/ChangeLog index c9f14dedb6..00cba7496d 100644 --- a/c/src/lib/libbsp/m68k/av5282/ChangeLog +++ b/c/src/lib/libbsp/m68k/av5282/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/m68k/av5282/Makefile.am b/c/src/lib/libbsp/m68k/av5282/Makefile.am index 7755f1a6d9..966455b217 100644 --- a/c/src/lib/libbsp/m68k/av5282/Makefile.am +++ b/c/src/lib/libbsp/m68k/av5282/Makefile.am @@ -25,49 +25,35 @@ project_lib_DATA = start.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds -noinst_PROGRAMS += startup.rel -startup_rel_SOURCES = startup/bspclean.c ../../shared/bsppredriverhook.c \ +startup_SOURCES = startup/bspclean.c ../../shared/bsppredriverhook.c \ ../../shared/bsplibc.c ../../shared/bsppost.c \ ../../m68k/shared/m68kpretaskinghook.c \ startup/init5282.c startup/bspstart.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 -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 +timer_SOURCES = timer/timer.c if HAS_NETWORKING network_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ noinst_PROGRAMS += network.rel network_rel_SOURCES = network/network.c -network_rel_CPPFLAGS = $(AM_CPPFLAGS) \ - $(network_CPPFLAGS) +network_rel_CPPFLAGS = $(AM_CPPFLAGS) $(network_CPPFLAGS) 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 include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/m68k/csb360/ChangeLog b/c/src/lib/libbsp/m68k/csb360/ChangeLog index bcb095e0e8..a67d1afb49 100644 --- a/c/src/lib/libbsp/m68k/csb360/ChangeLog +++ b/c/src/lib/libbsp/m68k/csb360/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/m68k/csb360/Makefile.am b/c/src/lib/libbsp/m68k/csb360/Makefile.am index c54f5a5a98..8ea9d104ba 100644 --- a/c/src/lib/libbsp/m68k/csb360/Makefile.am +++ b/c/src/lib/libbsp/m68k/csb360/Makefile.am @@ -28,26 +28,19 @@ project_lib_DATA = start.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds -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 ../../m68k/shared/m68kpretaskinghook.c \ startup/bspstart.c startup/init5272.c ../../shared/bootcard.c \ ../../shared/sbrk.c ../../m68k/shared/setvec.c \ ../../shared/gnatinstallhandler.c -startup_rel_CPPFLAGS = $(AM_CPPFLAGS) -startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -# console -noinst_PROGRAMS += console.rel -console_rel_SOURCES = console/console-io.c ../../shared/console-polled.c -console_rel_CPPFLAGS = $(AM_CPPFLAGS) -console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) +console_SOURCES = console/console-io.c ../../shared/console-polled.c noinst_LIBRARIES = libbsp.a -libbsp_a_SOURCES = -libbsp_a_LIBADD = startup.rel console.rel -libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/misc.rel \ +libbsp_a_SOURCES = $(startup_SOURCES) $(console_SOURCES) + +libbsp_a_LIBADD = \ + ../../../libcpu/@RTEMS_CPU@/shared/misc.rel \ ../../../libcpu/@RTEMS_CPU@/mcf5272/clock.rel \ ../../../libcpu/@RTEMS_CPU@/mcf5272/timer.rel diff --git a/c/src/lib/libbsp/m68k/gen68302/ChangeLog b/c/src/lib/libbsp/m68k/gen68302/ChangeLog index 87a89b2da2..0c580bbfc0 100644 --- a/c/src/lib/libbsp/m68k/gen68302/ChangeLog +++ b/c/src/lib/libbsp/m68k/gen68302/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/m68k/gen68302/Makefile.am b/c/src/lib/libbsp/m68k/gen68302/Makefile.am index d999566834..dd18bb952a 100644 --- a/c/src/lib/libbsp/m68k/gen68302/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68302/Makefile.am @@ -28,30 +28,15 @@ project_lib_DATA = start.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds -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 startup/bspstart.c ../../shared/bootcard.c \ ../../m68k/shared/m68kpretaskinghook.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/ckinit.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/timerisr.S -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 timer/timerisr.S if HAS_NETWORKING network_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ @@ -62,13 +47,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 include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/m68k/gen68340/ChangeLog b/c/src/lib/libbsp/m68k/gen68340/ChangeLog index aaabdc054d..27cb2398dc 100644 --- a/c/src/lib/libbsp/m68k/gen68340/ChangeLog +++ b/c/src/lib/libbsp/m68k/gen68340/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/m68k/gen68340/Makefile.am b/c/src/lib/libbsp/m68k/gen68340/Makefile.am index e82e765a69..e0fa14e601 100644 --- a/c/src/lib/libbsp/m68k/gen68340/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68340/Makefile.am @@ -30,36 +30,23 @@ project_lib_DATA = start.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds -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 startup/bspstart.c startup/init68340.c \ ../../shared/bootcard.c ../../m68k/shared/m68kpretaskinghook.c \ ../../shared/sbrk.c ../../m68k/shared/setvec.c \ startup/dumpanic.c ../../shared/gnatinstallhandler.c -startup_rel_CPPFLAGS = $(AM_CPPFLAGS) -startup_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 += console.rel -console_rel_SOURCES = console/Modif_cpu_asm.S console/console.c \ +clock_SOURCES = clock/ckinit.c +console_SOURCES = console/Modif_cpu_asm.S console/console.c \ console/m340uart.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) +timer_SOURCES = timer/timer.c noinst_LIBRARIES = libbsp.a -libbsp_a_SOURCES = -libbsp_a_LIBADD = startup.rel clock.rel console.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/misc.rel include $(srcdir)/preinstall.am 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 + + * 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/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 diff --git a/c/src/lib/libbsp/m68k/idp/ChangeLog b/c/src/lib/libbsp/m68k/idp/ChangeLog index 48aa91e17b..8c82c1598b 100644 --- a/c/src/lib/libbsp/m68k/idp/ChangeLog +++ b/c/src/lib/libbsp/m68k/idp/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/m68k/idp/Makefile.am b/c/src/lib/libbsp/m68k/idp/Makefile.am index 2b2128f173..f1b9bf7969 100644 --- a/c/src/lib/libbsp/m68k/idp/Makefile.am +++ b/c/src/lib/libbsp/m68k/idp/Makefile.am @@ -26,39 +26,26 @@ project_lib_DATA = start.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds -noinst_PROGRAMS += startup.rel -startup_rel_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \ +startup_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \ ../../shared/bsppredriverhook.c \ ../../shared/bsppost.c startup/bspstart.c ../../shared/bootcard.c \ ../../m68k/shared/m68kpretaskinghook.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/ckinit.c -clock_rel_CPPFLAGS = $(AM_CPPFLAGS) -clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += console.rel -console_rel_SOURCES = console/console.c console/leds.c console/mc68ec.c \ +clock_SOURCES = clock/ckinit.c +console_SOURCES = console/console.c console/leds.c console/mc68ec.c \ console/duart.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/timerisr.S -timer_rel_CPPFLAGS = $(AM_CPPFLAGS) -timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) +timer_SOURCES = timer/timer.c timer/timerisr.S EXTRA_DIST += include/README EXTRA_DIST += times noinst_LIBRARIES = libbsp.a -libbsp_a_SOURCES = -libbsp_a_LIBADD = startup.rel clock.rel console.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/misc.rel include $(srcdir)/preinstall.am diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/ChangeLog b/c/src/lib/libbsp/m68k/mcf5206elite/ChangeLog index 6f9f09b825..c56d3c0bea 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/ChangeLog +++ b/c/src/lib/libbsp/m68k/mcf5206elite/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/m68k/mcf5206elite/Makefile.am b/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am index 07e2ca5f51..d53cd1e366 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am +++ b/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am @@ -36,40 +36,23 @@ project_lib_DATA = start.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds startup/gdbinit \ startup/linkcmds.flash -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 ../../m68k/shared/m68kpretaskinghook.c \ startup/bspstart.c startup/init5206e.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 += 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 += i2c.rel -i2c_rel_SOURCES = i2c/i2c.c i2c/i2cdrv.c -i2c_rel_CPPFLAGS = $(AM_CPPFLAGS) -i2c_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += tod.rel -tod_rel_SOURCES = tod/ds1307.c tod/todcfg.c ../../shared/tod.c -tod_rel_CPPFLAGS = $(AM_CPPFLAGS) -tod_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += nvram.rel -nvram_rel_SOURCES = nvram/nvram.c -nvram_rel_CPPFLAGS = $(AM_CPPFLAGS) -nvram_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) +console_SOURCES = console/console.c ../../shared/dummy_printk_support.c +i2c_SOURCES = i2c/i2c.c i2c/i2cdrv.c +tod_SOURCES = tod/ds1307.c tod/todcfg.c ../../shared/tod.c +nvram_SOURCES = nvram/nvram.c noinst_LIBRARIES = libbsp.a -libbsp_a_SOURCES = -libbsp_a_LIBADD = startup.rel console.rel i2c.rel tod.rel nvram.rel -libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \ +libbsp_a_SOURCES = $(startup_SOURCES) $(console_SOURCES) \ + $(i2c_SOURCES) $(tod_SOURCES) $(nvram_SOURCES) + +libbsp_a_LIBADD = \ + ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \ ../../../libcpu/@RTEMS_CPU@/shared/misc.rel \ ../../../libcpu/@RTEMS_CPU@/mcf5206/clock.rel \ ../../../libcpu/@RTEMS_CPU@/mcf5206/mcfuart.rel \ diff --git a/c/src/lib/libbsp/m68k/mcf5235/ChangeLog b/c/src/lib/libbsp/m68k/mcf5235/ChangeLog index 69325929b8..3a203a24ec 100644 --- a/c/src/lib/libbsp/m68k/mcf5235/ChangeLog +++ b/c/src/lib/libbsp/m68k/mcf5235/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/m68k/mcf5235/Makefile.am b/c/src/lib/libbsp/m68k/mcf5235/Makefile.am index 1a85a02c62..62530b0eb5 100644 --- a/c/src/lib/libbsp/m68k/mcf5235/Makefile.am +++ b/c/src/lib/libbsp/m68k/mcf5235/Makefile.am @@ -26,31 +26,16 @@ project_lib_DATA = start.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds startup/linkcmdsflash \ startup/linkcmdsram -noinst_PROGRAMS += startup.rel -startup_rel_SOURCES = startup/bspclean.c ../../shared/bsppredriverhook.c \ +startup_SOURCES = startup/bspclean.c ../../shared/bsppredriverhook.c \ ../../shared/bsplibc.c ../../shared/bsppost.c \ ../../m68k/shared/m68kpretaskinghook.c \ startup/init5235.c startup/bspstart.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 -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 +timer_SOURCES = timer/timer.c if HAS_NETWORKING network_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ @@ -62,13 +47,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 include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/m68k/mrm332/ChangeLog b/c/src/lib/libbsp/m68k/mrm332/ChangeLog index 6bab034d42..a758f8edf3 100644 --- a/c/src/lib/libbsp/m68k/mrm332/ChangeLog +++ b/c/src/lib/libbsp/m68k/mrm332/ChangeLog @@ -1,3 +1,7 @@ +2008-05-14 Joel Sherrill + + * Makefile.am: Rework to avoid .rel files. + 2008-05-12 Joel Sherrill * console/console.c, startup/bspstart.c: Refactored and renamed diff --git a/c/src/lib/libbsp/m68k/mrm332/Makefile.am b/c/src/lib/libbsp/m68k/mrm332/Makefile.am index 9f45092eca..dbff8a48d7 100644 --- a/c/src/lib/libbsp/m68k/mrm332/Makefile.am +++ b/c/src/lib/libbsp/m68k/mrm332/Makefile.am @@ -29,39 +29,22 @@ project_lib_DATA = start.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds startup/linkcmds_ROM -noinst_PROGRAMS += startup.rel -startup_rel_SOURCES = startup/start_c.c ../../shared/bsplibc.c \ +startup_SOURCES = startup/start_c.c ../../shared/bsplibc.c \ ../../shared/bsppost.c startup/bspstart.c startup/bspclean.c \ ../../shared/bootcard.c ../../m68k/shared/m68kpretaskinghook.c \ ../../shared/sbrk.c ../../m68k/shared/setvec.c \ ../../shared/gnatinstallhandler.c startup/except_vect_332_ROM.S -startup_rel_CPPFLAGS = $(AM_CPPFLAGS) -startup_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 += console.rel -console_rel_SOURCES = console/console.c console/sci.c console/sci.h -console_rel_CPPFLAGS = $(AM_CPPFLAGS) -console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += spurious.rel -spurious_rel_SOURCES = spurious/spinit.c -spurious_rel_CPPFLAGS = $(AM_CPPFLAGS) -spurious_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 console/sci.c console/sci.h +spurious_SOURCES = spurious/spinit.c +timer_SOURCES = timer/timer.c noinst_LIBRARIES = libbsp.a -libbsp_a_SOURCES = -libbsp_a_LIBADD = startup.rel clock.rel console.rel spurious.rel timer.rel -libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \ +libbsp_a_SOURCES = $(startup_SOURCES) $(clock_SOURCES) $(console_SOURCES) \ + $(spurious_SOURCES) $(timer_SOURCES) + +libbsp_a_LIBADD = \ + ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \ ../../../libcpu/@RTEMS_CPU@/shared/misc.rel include $(srcdir)/preinstall.am diff --git a/c/src/lib/libbsp/m68k/mvme136/ChangeLog b/c/src/lib/libbsp/m68k/mvme136/ChangeLog index bb148edf63..497ee3f544 100644 --- a/c/src/lib/libbsp/m68k/mvme136/ChangeLog +++ b/c/src/lib/libbsp/m68k/mvme136/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/m68k/mvme136/Makefile.am b/c/src/lib/libbsp/m68k/mvme136/Makefile.am index 444c56d83a..ef5965f24f 100644 --- a/c/src/lib/libbsp/m68k/mvme136/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme136/Makefile.am @@ -26,67 +26,29 @@ project_lib_DATA = start.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds -noinst_PROGRAMS += startup.rel -startup_rel_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \ +startup_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \ ../../shared/bsppost.c ../../shared/bsppredriverhook.c \ startup/bspstart.c ../../shared/bootcard.c \ ../../m68k/shared/m68kpretaskinghook.c \ ../../shared/sbrk.c ../../m68k/shared/setvec.c -startup_rel_CPPFLAGS = $(AM_CPPFLAGS) -startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += gnatsupp.rel -gnatsupp_rel_SOURCES = ../../shared/gnatinstallhandler.c -gnatsupp_rel_CPPFLAGS = $(AM_CPPFLAGS) -gnatsupp_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 += console.rel -console_rel_SOURCES = console/console.c -console_rel_CPPFLAGS = $(AM_CPPFLAGS) -console_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 += timer.rel -timer_rel_SOURCES = timer/timer.c timer/timerisr.S -timer_rel_CPPFLAGS = $(AM_CPPFLAGS) -timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) +gnatsupp_SOURCES = ../../shared/gnatinstallhandler.c +clock_SOURCES = clock/ckinit.c +console_SOURCES = console/console.c +debugio_SOURCES = ../../shared/dummy_printk_support.c +timer_SOURCES = timer/timer.c timer/timerisr.S if HAS_MP -noinst_PROGRAMS += shmsupp.rel -shmsupp_rel_SOURCES = shmsupp/addrconv.c shmsupp/getcfg.c shmsupp/lock.c \ +shmsupp_SOURCES = shmsupp/addrconv.c shmsupp/getcfg.c shmsupp/lock.c \ shmsupp/mpisr.c -shmsupp_rel_CPPFLAGS = $(AM_CPPFLAGS) -shmsupp_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) endif noinst_LIBRARIES = libbsp.a -libbsp_a_SOURCES = -libbsp_a_LIBADD = gnatsupp.rel clock.rel console.rel debugio.rel timer.rel -if HAS_MP -libbsp_a_LIBADD += shmsupp.rel -endif -libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \ - ../../../libcpu/@RTEMS_CPU@/shared/misc.rel +libbsp_a_SOURCES = $(startup_SOURCES) $(gnatsupp_SOURCES) $(clock_SOURCES) \ + $(console_SOURCES) $(debugio_SOURCES) $(timer_SOURCES) $(shmsupp_SOURCES) -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-m68kpretaskinghook.o \ -startup_rel-sbrk.o \ -startup_rel-setvec.o +libbsp_a_LIBADD = \ + ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \ + ../../../libcpu/@RTEMS_CPU@/shared/misc.rel EXTRA_DIST += times diff --git a/c/src/lib/libbsp/m68k/mvme147/ChangeLog b/c/src/lib/libbsp/m68k/mvme147/ChangeLog index 74b19afe98..f465cc0f94 100644 --- a/c/src/lib/libbsp/m68k/mvme147/ChangeLog +++ b/c/src/lib/libbsp/m68k/mvme147/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/m68k/mvme147/Makefile.am b/c/src/lib/libbsp/m68k/mvme147/Makefile.am index 1426b3bcbb..00a3621372 100644 --- a/c/src/lib/libbsp/m68k/mvme147/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme147/Makefile.am @@ -26,34 +26,21 @@ project_lib_DATA = start.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds -noinst_PROGRAMS += startup.rel -startup_rel_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \ +startup_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \ ../../shared/bsppost.c startup/bspstart.c ../../shared/bootcard.c \ ../../m68k/shared/m68kpretaskinghook.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/ckinit.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/timerisr.S -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 timer/timerisr.S noinst_LIBRARIES = libbsp.a -libbsp_a_SOURCES = -libbsp_a_LIBADD = startup.rel clock.rel console.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/misc.rel EXTRA_DIST += times diff --git a/c/src/lib/libbsp/m68k/mvme147s/ChangeLog b/c/src/lib/libbsp/m68k/mvme147s/ChangeLog index 0d54b7acad..9498515cd2 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/ChangeLog +++ b/c/src/lib/libbsp/m68k/mvme147s/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/m68k/mvme147s/Makefile.am b/c/src/lib/libbsp/m68k/mvme147s/Makefile.am index f7dc28bd52..ce38091f78 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme147s/Makefile.am @@ -26,47 +26,28 @@ project_lib_DATA = start.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds -noinst_PROGRAMS += startup.rel -startup_rel_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \ +startup_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \ ../../shared/bsppost.c ../../shared/bsppredriverhook.c \ startup/bspstart.c ../../shared/bootcard.c \ ../../m68k/shared/m68kpretaskinghook.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 = ../mvme147/clock/ckinit.c -clock_rel_CPPFLAGS = $(AM_CPPFLAGS) -clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += console.rel -console_rel_SOURCES = ../mvme147/console/console.c \ +clock_SOURCES = ../mvme147/clock/ckinit.c +console_SOURCES = ../mvme147/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 = ../mvme147/timer/timer.c ../mvme147/timer/timerisr.S -timer_rel_CPPFLAGS = $(AM_CPPFLAGS) -timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) +timer_SOURCES = ../mvme147/timer/timer.c ../mvme147/timer/timerisr.S if HAS_MP -noinst_PROGRAMS += shmsupp.rel -shmsupp_rel_SOURCES = shmsupp/addrconv.c shmsupp/getcfg.c shmsupp/lock.c \ +shmsupp_SOURCES = shmsupp/addrconv.c shmsupp/getcfg.c shmsupp/lock.c \ shmsupp/mpisr.c -shmsupp_rel_CPPFLAGS = $(AM_CPPFLAGS) -shmsupp_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) endif noinst_LIBRARIES = libbsp.a -libbsp_a_SOURCES = -libbsp_a_LIBADD = startup.rel clock.rel console.rel timer.rel -if HAS_MP -libbsp_a_LIBADD += shmsupp.rel -endif -libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \ +libbsp_a_SOURCES = $(startup_SOURCES) $(clock_SOURCES) $(console_SOURCES) \ + $(timer_SOURCES) $(shmsupp_SOURCES) + +libbsp_a_LIBADD = \ + ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \ ../../../libcpu/@RTEMS_CPU@/shared/misc.rel EXTRA_DIST += times diff --git a/c/src/lib/libbsp/m68k/mvme162/ChangeLog b/c/src/lib/libbsp/m68k/mvme162/ChangeLog index 74e5bc40bf..87a2acd172 100644 --- a/c/src/lib/libbsp/m68k/mvme162/ChangeLog +++ b/c/src/lib/libbsp/m68k/mvme162/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/m68k/mvme162/Makefile.am b/c/src/lib/libbsp/m68k/mvme162/Makefile.am index 68f79c01a5..b873bdec96 100644 --- a/c/src/lib/libbsp/m68k/mvme162/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme162/Makefile.am @@ -35,35 +35,16 @@ project_lib_DATA = start.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds -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 \ startup/bspstart.c ../../shared/bootcard.c \ ../../m68k/shared/m68kpretaskinghook.c \ startup/page_table.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/ckinit.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/timerisr.S -timer_rel_CPPFLAGS = $(AM_CPPFLAGS) -timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += tod.rel -tod_rel_SOURCES = tod/tod.c -tod_rel_CPPFLAGS = $(AM_CPPFLAGS) -tod_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) +clock_SOURCES = clock/ckinit.c +console_SOURCES = console/console.c ../../shared/dummy_printk_support.c +timer_SOURCES = timer/timer.c timer/timerisr.S +tod_SOURCES = tod/tod.c if HAS_NETWORKING network_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ @@ -72,15 +53,18 @@ network_rel_SOURCES = ../mvme167/network/network.c network_rel_CPPFLAGS = $(AM_CPPFLAGS) $(network_CPPFLAGS) network_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) endif -#-- + + noinst_LIBRARIES = libbsp.a -libbsp_a_SOURCES = -libbsp_a_LIBADD = startup.rel clock.rel console.rel timer.rel tod.rel +libbsp_a_SOURCES = $(startup_SOURCES) $(clock_SOURCES) $(console_SOURCES) \ + $(timer_SOURCES) $(tod_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 diff --git a/c/src/lib/libbsp/m68k/mvme167/ChangeLog b/c/src/lib/libbsp/m68k/mvme167/ChangeLog index 92711a7364..f3bcbbd18f 100644 --- a/c/src/lib/libbsp/m68k/mvme167/ChangeLog +++ b/c/src/lib/libbsp/m68k/mvme167/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/m68k/mvme167/Makefile.am b/c/src/lib/libbsp/m68k/mvme167/Makefile.am index 5739380ff2..9d28645c7a 100644 --- a/c/src/lib/libbsp/m68k/mvme167/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme167/Makefile.am @@ -30,35 +30,16 @@ project_lib_DATA = start.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds -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 startup/bspstart.c ../../shared/bootcard.c \ ../../m68k/shared/m68kpretaskinghook.c \ startup/page_table.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/ckinit.c -clock_rel_CPPFLAGS = $(AM_CPPFLAGS) -clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += console.rel -console_rel_SOURCES = console/console.c console/console-recording.h -console_rel_CPPFLAGS = $(AM_CPPFLAGS) -console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += fatal.rel -fatal_rel_SOURCES = fatal/bspfatal.c -fatal_rel_CPPFLAGS = $(AM_CPPFLAGS) -fatal_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += timer.rel -timer_rel_SOURCES = timer/timer.c timer/timerisr.S -timer_rel_CPPFLAGS = $(AM_CPPFLAGS) -timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) +clock_SOURCES = clock/ckinit.c +console_SOURCES = console/console.c console/console-recording.h +fatal_SOURCES = fatal/bspfatal.c +timer_SOURCES = timer/timer.c timer/timerisr.S if HAS_NETWORKING network_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ @@ -69,14 +50,16 @@ network_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) endif noinst_LIBRARIES = libbsp.a -libbsp_a_SOURCES = -libbsp_a_LIBADD = clock.rel console.rel fatal.rel startup.rel timer.rel +libbsp_a_SOURCES = $(startup_SOURCES) $(clock_SOURCES) $(console_SOURCES) \ + $(fatal_SOURCES) $(timer_SOURCES) + +libbsp_a_LIBADD = \ + ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \ + ../../../libcpu/@RTEMS_CPU@/shared/misc.rel \ + ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/fpsp.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 \ - ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/fpsp.rel EXTRA_DIST += times diff --git a/c/src/lib/libbsp/m68k/ods68302/ChangeLog b/c/src/lib/libbsp/m68k/ods68302/ChangeLog index 423bc550c4..523b42cb5f 100644 --- a/c/src/lib/libbsp/m68k/ods68302/ChangeLog +++ b/c/src/lib/libbsp/m68k/ods68302/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/m68k/ods68302/Makefile.am b/c/src/lib/libbsp/m68k/ods68302/Makefile.am index f6412ac7de..746d39ec4f 100644 --- a/c/src/lib/libbsp/m68k/ods68302/Makefile.am +++ b/c/src/lib/libbsp/m68k/ods68302/Makefile.am @@ -39,8 +39,7 @@ project_lib_DATA = start.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds startup/rom startup/debugger -noinst_PROGRAMS += startup.rel -startup_rel_SOURCES = startup/cpuboot.c startup/crc.c startup/debugport.c \ +startup_SOURCES = startup/cpuboot.c startup/crc.c startup/debugport.c \ startup/gdb-hooks.c ../../shared/bootcard.c \ startup/m68302scc.c startup/m68k-stub.c \ ../../m68k/shared/m68kpretaskinghook.c startup/memcheck.c \ @@ -48,28 +47,16 @@ startup_rel_SOURCES = startup/cpuboot.c startup/crc.c startup/debugport.c \ ../../shared/bsppredriverhook.c \ ../../shared/bsppost.c startup/bspstart.c startup/bspclean.c \ ../../shared/sbrk.c ../../m68k/shared/setvec.c -startup_rel_CPPFLAGS = $(AM_CPPFLAGS) -startup_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 += 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/timerisr.S -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 timer/timerisr.S noinst_LIBRARIES = libbsp.a -libbsp_a_SOURCES = -libbsp_a_LIBADD = startup.rel clock.rel console.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/misc.rel include $(srcdir)/preinstall.am diff --git a/c/src/lib/libbsp/m68k/sim68000/ChangeLog b/c/src/lib/libbsp/m68k/sim68000/ChangeLog index 31591db435..8424fb99ef 100644 --- a/c/src/lib/libbsp/m68k/sim68000/ChangeLog +++ b/c/src/lib/libbsp/m68k/sim68000/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/m68k/sim68000/Makefile.am b/c/src/lib/libbsp/m68k/sim68000/Makefile.am index f1c7ccf00e..b6b18cbdf2 100644 --- a/c/src/lib/libbsp/m68k/sim68000/Makefile.am +++ b/c/src/lib/libbsp/m68k/sim68000/Makefile.am @@ -26,35 +26,21 @@ project_lib_DATA = start.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds -noinst_PROGRAMS += startup.rel -startup_rel_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \ +startup_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \ ../../shared/bsppost.c startup/bspstart.c ../../shared/bootcard.c \ ../../m68k/shared/m68kpretaskinghook.c \ ../../shared/sbrk.c ../../m68k/shared/setvec.c \ ../../shared/gnatinstallhandler.c ../../m68k/shared/bspspuriousinit.c \ ../../m68k/shared/m68000spurious.c startup/spurious_assistant.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) - -noinst_PROGRAMS += console.rel -console_rel_SOURCES = console/conscfg.c ../../shared/console.c -console_rel_CPPFLAGS = $(AM_CPPFLAGS) -console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += timer.rel -timer_rel_SOURCES = ../../shared/timerstub.c -timer_rel_CPPFLAGS = $(AM_CPPFLAGS) -timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) +clock_SOURCES = clock/clockdrv.c +console_SOURCES = console/conscfg.c ../../shared/console.c +timer_SOURCES = ../../shared/timerstub.c noinst_LIBRARIES = libbsp.a -libbsp_a_SOURCES = -libbsp_a_LIBADD = startup.rel clock.rel console.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/misc.rel include $(srcdir)/preinstall.am diff --git a/c/src/lib/libbsp/m68k/uC5282/ChangeLog b/c/src/lib/libbsp/m68k/uC5282/ChangeLog index 597c233bd5..118645b8a2 100644 --- a/c/src/lib/libbsp/m68k/uC5282/ChangeLog +++ b/c/src/lib/libbsp/m68k/uC5282/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/m68k/uC5282/Makefile.am b/c/src/lib/libbsp/m68k/uC5282/Makefile.am index f869510568..1611e21834 100644 --- a/c/src/lib/libbsp/m68k/uC5282/Makefile.am +++ b/c/src/lib/libbsp/m68k/uC5282/Makefile.am @@ -25,29 +25,14 @@ project_lib_DATA = start.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds -noinst_PROGRAMS += startup.rel -startup_rel_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \ +startup_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \ ../../shared/bsppost.c ../../shared/bsppredriverhook.c \ ../../m68k/shared/m68kpretaskinghook.c startup/init5282.c \ startup/bspstart.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 -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 +timer_SOURCES = timer/timer.c if HAS_NETWORKING network_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ @@ -58,13 +43,14 @@ 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 include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/mips/csb350/ChangeLog b/c/src/lib/libbsp/mips/csb350/ChangeLog index 6f09039e5e..a8cac788bc 100644 --- a/c/src/lib/libbsp/mips/csb350/ChangeLog +++ b/c/src/lib/libbsp/mips/csb350/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/mips/csb350/Makefile.am b/c/src/lib/libbsp/mips/csb350/Makefile.am index fafef518bd..9dd0535a69 100644 --- a/c/src/lib/libbsp/mips/csb350/Makefile.am +++ b/c/src/lib/libbsp/mips/csb350/Makefile.am @@ -25,48 +25,33 @@ 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) - -noinst_PROGRAMS += console.rel -console_rel_SOURCES = console/console-io.c ../../shared/console-polled.c -console_rel_CPPFLAGS = $(AM_CPPFLAGS) -console_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 \ 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 = console/console-io.c ../../shared/console-polled.c +timer_SOURCES = timer/timer.c if HAS_NETWORKING network_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ noinst_PROGRAMS += network.rel network_rel_SOURCES = network/network.c -network_rel_CPPFLAGS = $(AM_CPPFLAGS) \ - $(network_CPPFLAGS) +network_rel_CPPFLAGS = $(AM_CPPFLAGS) $(network_CPPFLAGS) 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/mips/shared/cache.rel \ + ../../../libcpu/mips/shared/interrupts.rel \ + ../../../libcpu/mips/au1x00/vectorisrs.rel if HAS_NETWORKING libbsp_a_LIBADD += network.rel endif -libbsp_a_LIBADD += ../../../libcpu/mips/shared/cache.rel \ - ../../../libcpu/mips/shared/interrupts.rel \ - ../../../libcpu/mips/au1x00/vectorisrs.rel include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/mips/genmongoosev/ChangeLog b/c/src/lib/libbsp/mips/genmongoosev/ChangeLog index 3766ff40ae..fa791a6f9e 100644 --- a/c/src/lib/libbsp/mips/genmongoosev/ChangeLog +++ b/c/src/lib/libbsp/mips/genmongoosev/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/mips/genmongoosev/Makefile.am b/c/src/lib/libbsp/mips/genmongoosev/Makefile.am index 3c9cd9557f..4c49941af4 100644 --- a/c/src/lib/libbsp/mips/genmongoosev/Makefile.am +++ b/c/src/lib/libbsp/mips/genmongoosev/Makefile.am @@ -26,36 +26,28 @@ project_lib_DATA = start.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds -startup_CPPFLAGS = -I$(srcdir)/../../mips/shared/gdbstub -noinst_PROGRAMS += startup.rel -startup_rel_SOURCES = ../../mips/shared/gdbstub/mips-stub.c \ - ../../shared/gdbstub/rtems-stub-glue.c ../../shared/bspclean.c \ +startup_SOURCES = ../../shared/bspclean.c \ ../../shared/bsppredriverhook.c ../../shared/bsplibc.c \ ../../shared/bsppost.c startup/bspstart.c ../../shared/bootcard.c \ ../../shared/sbrk.c ../../shared/gnatinstallhandler.c \ - ../../shared/setvec.c startup/gdb-support.c -startup_rel_CPPFLAGS = $(AM_CPPFLAGS) $(startup_CPPFLAGS) -startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += clock.rel -clock_rel_SOURCES = clock/clockdrv.c -clock_rel_CPPFLAGS = $(AM_CPPFLAGS) $(clock_CPPFLAGS) -clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += console.rel -console_rel_SOURCES = console/conscfg.c ../../shared/console.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) + ../../shared/setvec.c +clock_SOURCES = clock/clockdrv.c +console_SOURCES = console/conscfg.c ../../shared/console.c +timer_SOURCES = timer/timer.c + +gdbstub_CPPFLAGS = -I$(srcdir)/../../mips/shared/gdbstub +noinst_PROGRAMS += gdbstub.rel +gdbstub_rel_SOURCES = ../../mips/shared/gdbstub/mips-stub.c \ + startup/gdb-support.c ../../shared/gdbstub/rtems-stub-glue.c +gdbstub_rel_CPPFLAGS = $(AM_CPPFLAGS) $(gdbstub_CPPFLAGS) +gdbstub_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) noinst_LIBRARIES = libbsp.a -libbsp_a_SOURCES = -libbsp_a_LIBADD = startup.rel clock.rel console.rel timer.rel -libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \ +libbsp_a_SOURCES = $(startup_SOURCES) $(clock_SOURCES) $(console_SOURCES) \ + $(timer_SOURCES) $(gdbstub_SOURCES) + +libbsp_a_LIBADD = \ + ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \ ../../../libcpu/@RTEMS_CPU@/shared/interrupts.rel \ ../../../libcpu/@RTEMS_CPU@/mongoosev/duart.rel \ ../../../libcpu/@RTEMS_CPU@/mongoosev/vectorisrs.rel diff --git a/c/src/lib/libbsp/mips/hurricane/ChangeLog b/c/src/lib/libbsp/mips/hurricane/ChangeLog index 45110948bb..025a9cde01 100644 --- a/c/src/lib/libbsp/mips/hurricane/ChangeLog +++ b/c/src/lib/libbsp/mips/hurricane/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/mips/hurricane/Makefile.am b/c/src/lib/libbsp/mips/hurricane/Makefile.am index 34ca79fd80..3c2d4c4fca 100644 --- a/c/src/lib/libbsp/mips/hurricane/Makefile.am +++ b/c/src/lib/libbsp/mips/hurricane/Makefile.am @@ -28,36 +28,23 @@ project_lib_DATA = start.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds -noinst_PROGRAMS += startup.rel -startup_rel_SOURCES = ../../shared/bspclean.c \ +startup_SOURCES = ../../shared/bspclean.c \ ../../shared/bsplibc.c ../../shared/bsppost.c \ ../../shared/bsppredriverhook.c startup/bspstart.c \ ../../shared/bootcard.c ../../shared/sbrk.c \ ../../shared/gnatinstallhandler.c ../../shared/setvec.c \ startup/inittlb.c \ startup/idtmem.S startup/idttlb.S startup/exception.S -startup_rel_CPPFLAGS = $(AM_CPPFLAGS) -startup_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 += console.rel -console_rel_SOURCES = console/console.c -console_rel_CPPFLAGS = $(AM_CPPFLAGS) -console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += liblnk.rel -liblnk_rel_SOURCES = liblnk/lnklib.S liblnk/pmon.S -liblnk_rel_CPPFLAGS = $(AM_CPPFLAGS) -liblnk_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) +clock_SOURCES = clock/ckinit.c +console_SOURCES = console/console.c +liblnk_SOURCES = liblnk/lnklib.S liblnk/pmon.S noinst_LIBRARIES = libbsp.a -libbsp_a_SOURCES = -libbsp_a_LIBADD = startup.rel clock.rel console.rel liblnk.rel -libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \ +libbsp_a_SOURCES = $(startup_SOURCES) $(clock_SOURCES) $(console_SOURCES) \ + $(liblnk_SOURCES) + +libbsp_a_LIBADD = \ + ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \ ../../../libcpu/@RTEMS_CPU@/shared/interrupts.rel \ ../../../libcpu/@RTEMS_CPU@/rm52xx/timer.rel \ ../../../libcpu/@RTEMS_CPU@/rm52xx/vectorisrs.rel diff --git a/c/src/lib/libbsp/mips/jmr3904/ChangeLog b/c/src/lib/libbsp/mips/jmr3904/ChangeLog index 7a390ed3bc..142cab595a 100644 --- a/c/src/lib/libbsp/mips/jmr3904/ChangeLog +++ b/c/src/lib/libbsp/mips/jmr3904/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/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 diff --git a/c/src/lib/libbsp/mips/rbtx4925/ChangeLog b/c/src/lib/libbsp/mips/rbtx4925/ChangeLog index 83bf6ab1ab..24d4f3c485 100644 --- a/c/src/lib/libbsp/mips/rbtx4925/ChangeLog +++ b/c/src/lib/libbsp/mips/rbtx4925/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/mips/rbtx4925/Makefile.am b/c/src/lib/libbsp/mips/rbtx4925/Makefile.am index 203b637dbe..0d0c40f669 100644 --- a/c/src/lib/libbsp/mips/rbtx4925/Makefile.am +++ b/c/src/lib/libbsp/mips/rbtx4925/Makefile.am @@ -27,15 +27,12 @@ project_lib_DATA = start.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds -noinst_PROGRAMS += startup.rel -startup_rel_SOURCES = ../../shared/bspclean.c ../../shared/bsppredriverhook.c \ +startup_SOURCES = ../../shared/bspclean.c ../../shared/bsppredriverhook.c \ ../../shared/bsplibc.c ../../shared/bsppost.c startup/bspstart.c \ ../../shared/bootcard.c ../../shared/sbrk.c \ ../../shared/gnatinstallhandler.c ../../shared/setvec.c \ startup/inittlb.c \ startup/idtmem.S startup/idttlb.S startup/exception.S -startup_rel_CPPFLAGS = $(AM_CPPFLAGS) -startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) # FIXME: clockdrv.c and clockdrv_shell.c are structurally flawed clock_CPPFLAGS = -I$(srcdir)/../../shared @@ -45,20 +42,15 @@ clock_rel_SOURCES = clock/clockdrv.c clock_rel_CPPFLAGS = $(AM_CPPFLAGS) $(clock_CPPFLAGS) clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -noinst_PROGRAMS += console.rel -console_rel_SOURCES = console/console-io.c -console_rel_CPPFLAGS = $(AM_CPPFLAGS) -console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) +console_SOURCES = console/console-io.c -noinst_PROGRAMS += liblnk.rel -liblnk_rel_SOURCES = liblnk/lnklib.S liblnk/pmon.S -liblnk_rel_CPPFLAGS = $(AM_CPPFLAGS) -liblnk_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) +liblnk_SOURCES = liblnk/lnklib.S liblnk/pmon.S noinst_LIBRARIES = libbsp.a -libbsp_a_SOURCES = -libbsp_a_LIBADD = startup.rel clock.rel console.rel liblnk.rel -libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \ +libbsp_a_SOURCES = $(startup_SOURCES) $(console_SOURCES) $(liblnk_SOURCES) +libbsp_a_LIBADD = \ + clock.rel \ + ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \ ../../../libcpu/@RTEMS_CPU@/shared/interrupts.rel \ ../../../libcpu/@RTEMS_CPU@/tx49/timer.rel \ ../../../libcpu/@RTEMS_CPU@/tx49/vectorisrs.rel diff --git a/c/src/lib/libbsp/mips/rbtx4938/ChangeLog b/c/src/lib/libbsp/mips/rbtx4938/ChangeLog index f1cb5b92a0..0a29736291 100644 --- a/c/src/lib/libbsp/mips/rbtx4938/ChangeLog +++ b/c/src/lib/libbsp/mips/rbtx4938/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/mips/rbtx4938/Makefile.am b/c/src/lib/libbsp/mips/rbtx4938/Makefile.am index 203b637dbe..e3c08650eb 100644 --- a/c/src/lib/libbsp/mips/rbtx4938/Makefile.am +++ b/c/src/lib/libbsp/mips/rbtx4938/Makefile.am @@ -27,15 +27,12 @@ project_lib_DATA = start.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds -noinst_PROGRAMS += startup.rel -startup_rel_SOURCES = ../../shared/bspclean.c ../../shared/bsppredriverhook.c \ +startup_SOURCES = ../../shared/bspclean.c ../../shared/bsppredriverhook.c \ ../../shared/bsplibc.c ../../shared/bsppost.c startup/bspstart.c \ ../../shared/bootcard.c ../../shared/sbrk.c \ ../../shared/gnatinstallhandler.c ../../shared/setvec.c \ startup/inittlb.c \ startup/idtmem.S startup/idttlb.S startup/exception.S -startup_rel_CPPFLAGS = $(AM_CPPFLAGS) -startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) # FIXME: clockdrv.c and clockdrv_shell.c are structurally flawed clock_CPPFLAGS = -I$(srcdir)/../../shared @@ -45,20 +42,14 @@ clock_rel_SOURCES = clock/clockdrv.c clock_rel_CPPFLAGS = $(AM_CPPFLAGS) $(clock_CPPFLAGS) clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -noinst_PROGRAMS += console.rel -console_rel_SOURCES = console/console-io.c -console_rel_CPPFLAGS = $(AM_CPPFLAGS) -console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += liblnk.rel -liblnk_rel_SOURCES = liblnk/lnklib.S liblnk/pmon.S -liblnk_rel_CPPFLAGS = $(AM_CPPFLAGS) -liblnk_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) +console_SOURCES = console/console-io.c +liblnk_SOURCES = liblnk/lnklib.S liblnk/pmon.S noinst_LIBRARIES = libbsp.a -libbsp_a_SOURCES = -libbsp_a_LIBADD = startup.rel clock.rel console.rel liblnk.rel -libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \ +libbsp_a_SOURCES = $(startup_SOURCES) $(console_SOURCES) $(liblnk_SOURCES) +libbsp_a_LIBADD = \ + clock.rel \ + ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \ ../../../libcpu/@RTEMS_CPU@/shared/interrupts.rel \ ../../../libcpu/@RTEMS_CPU@/tx49/timer.rel \ ../../../libcpu/@RTEMS_CPU@/tx49/vectorisrs.rel diff --git a/c/src/lib/libbsp/nios2/nios2_iss/ChangeLog b/c/src/lib/libbsp/nios2/nios2_iss/ChangeLog index 848b5dfd8d..5917029153 100644 --- a/c/src/lib/libbsp/nios2/nios2_iss/ChangeLog +++ b/c/src/lib/libbsp/nios2/nios2_iss/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/nios2/nios2_iss/Makefile.am b/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am index 3d3e182809..fe06e60dae 100644 --- a/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am +++ b/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am @@ -29,43 +29,19 @@ project_lib_DATA = start.$(OBJEXT) crtnn.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds -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 -console_rel_CPPFLAGS = $(AM_CPPFLAGS) -console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -if HAS_MP -noinst_PROGRAMS += shmsupp.rel -shmsupp_rel_SOURCES = shmsupp/addrconv.c shmsupp/getcfg.c shmsupp/lock.c \ - shmsupp/mpisr.c -shmsupp_rel_CPPFLAGS = $(AM_CPPFLAGS) -shmsupp_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -endif - -noinst_PROGRAMS += startup.rel -startup_rel_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \ +startup_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \ ../../shared/bsppost.c startup/bspstart.c \ ../../shared/bootcard.c ../../shared/sbrk.c startup/setvec.c \ ../../shared/gnatinstallhandler.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/clock.c +console_SOURCES = console/console.c +timer_SOURCES = timer/timer.c +shmsupp_SOURCES = shmsupp/addrconv.c shmsupp/getcfg.c shmsupp/lock.c \ + shmsupp/mpisr.c noinst_LIBRARIES = libbsp.a -libbsp_a_SOURCES = -libbsp_a_LIBADD = startup.rel clock.rel console.rel timer.rel -if HAS_MP -libbsp_a_LIBADD += shmsupp.rel -endif +libbsp_a_SOURCES = $(startup_SOURCES) $(clock_SOURCES) $(console_SOURCES) \ + $(timer_SOURCES) $(shmsupp_SOURCES) include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/ChangeLog b/c/src/lib/libbsp/no_cpu/no_bsp/ChangeLog index 6a74ca4336..a7d1d1a0a6 100644 --- a/c/src/lib/libbsp/no_cpu/no_bsp/ChangeLog +++ b/c/src/lib/libbsp/no_cpu/no_bsp/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/no_cpu/no_bsp/Makefile.am b/c/src/lib/libbsp/no_cpu/no_bsp/Makefile.am index 6b2893234a..f450c8cd85 100644 --- a/c/src/lib/libbsp/no_cpu/no_bsp/Makefile.am +++ b/c/src/lib/libbsp/no_cpu/no_bsp/Makefile.am @@ -20,43 +20,19 @@ include_HEADERS += include/coverhd.h dist_project_lib_DATA += startup/linkcmds -noinst_PROGRAMS += clock.rel -clock_rel_SOURCES = clock/ckinit.c -clock_rel_CPPFLAGS = $(AM_CPPFLAGS) -clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += console.rel -console_rel_SOURCES = console/console.c -console_rel_CPPFLAGS = $(AM_CPPFLAGS) -console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -if HAS_MP -noinst_PROGRAMS += shmsupp.rel -shmsupp_rel_SOURCES = shmsupp/addrconv.c shmsupp/getcfg.c shmsupp/lock.c \ - shmsupp/mpisr.c -shmsupp_rel_CPPFLAGS = $(AM_CPPFLAGS) -shmsupp_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -endif - -noinst_PROGRAMS += startup.rel -startup_rel_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \ +startup_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \ ../../shared/bsppost.c startup/bspstart.c startup/main.c \ ../../shared/bootcard.c ../../shared/sbrk.c startup/setvec.c \ ../../shared/gnatinstallhandler.c -startup_rel_CPPFLAGS = $(AM_CPPFLAGS) -startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += timer.rel -timer_rel_SOURCES = timer/timer.c timer/timerisr.c -timer_rel_CPPFLAGS = $(AM_CPPFLAGS) -timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) +clock_SOURCES = clock/ckinit.c +console_SOURCES = console/console.c +timer_SOURCES = timer/timer.c timer/timerisr.c +shmsupp_SOURCES = shmsupp/addrconv.c shmsupp/getcfg.c shmsupp/lock.c \ + shmsupp/mpisr.c noinst_LIBRARIES = libbsp.a -libbsp_a_SOURCES = -libbsp_a_LIBADD = startup clock console timer -if HAS_MP -libbsp_a_LIBADD += shmsupp -endif +libbsp_a_SOURCES = $(startup_SOURCES) $(clock_SOURCES) $(console_SOURCES) \ + $(timer_SOURCES) $(shmsupp_SOURCES) EXTRA_DIST = times diff --git a/c/src/lib/libbsp/powerpc/ep1a/ChangeLog b/c/src/lib/libbsp/powerpc/ep1a/ChangeLog index 00530897c6..b631c04f2a 100644 --- a/c/src/lib/libbsp/powerpc/ep1a/ChangeLog +++ b/c/src/lib/libbsp/powerpc/ep1a/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/powerpc/ep1a/Makefile.am b/c/src/lib/libbsp/powerpc/ep1a/Makefile.am index 2f26a6c642..4c1a6c57e0 100644 --- a/c/src/lib/libbsp/powerpc/ep1a/Makefile.am +++ b/c/src/lib/libbsp/powerpc/ep1a/Makefile.am @@ -23,67 +23,39 @@ include_bspdir = $(includedir)/bsp ### dist_project_lib_DATA += startup/linkcmds -noinst_PROGRAMS += startup.rel -startup_rel_SOURCES = startup/bspstart.c ../../shared/bootcard.c \ +startup_SOURCES = startup/bspstart.c ../../shared/bootcard.c \ ../../shared/bsppost.c ../../shared/bsppredriverhook.c \ ../../shared/bsplibc.c ../../powerpc/shared/startup/sbrk.c \ ../../shared/bspclean.c ../../shared/gnatinstallhandler.c \ ../../powerpc/shared/startup/pgtbl_setup.c \ ../../powerpc/shared/startup/pgtbl_activate.c \ ../../powerpc/shared/showbats.c -startup_rel_CPPFLAGS = $(AM_CPPFLAGS) -startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -### -noinst_PROGRAMS += pclock.rel -pclock_rel_SOURCES = ../../powerpc/shared/clock/p_clock.c -pclock_rel_CPPFLAGS = $(AM_CPPFLAGS) -pclock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) +pclock_SOURCES = ../../powerpc/shared/clock/p_clock.c -### include_bsp_HEADERS = ../../powerpc/shared/console/uart.h \ ../../powerpc/shared/motorola/motorola.h \ ../../powerpc/shared/residual/residual.h \ ../../powerpc/shared/residual/pnp.h \ ../../powerpc/shared/console/consoleIo.h console/rsPMCQ1.h - -noinst_PROGRAMS += console.rel -console_rel_SOURCES = console/console.c console/ns16550cfg.c \ +console_SOURCES = console/console.c console/ns16550cfg.c \ console/mc68360_scc.c console/rsPMCQ1.c console/alloc360.c \ console/init68360.c -console_rel_CPPFLAGS = $(AM_CPPFLAGS) -console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -### -include_bsp_HEADERS += ../../powerpc/shared/openpic/openpic.h -noinst_PROGRAMS += openpic.rel -openpic_rel_SOURCES = ../../powerpc/shared/openpic/openpic.h \ +include_bsp_HEADERS += ../../powerpc/shared/openpic/openpic.h +openpic_SOURCES = ../../powerpc/shared/openpic/openpic.h \ ../../powerpc/shared/openpic/openpic.c -openpic_rel_CPPFLAGS = $(AM_CPPFLAGS) -openpic_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -### include_bsp_HEADERS += ../../powerpc/shared/pci/pci.h - -noinst_PROGRAMS += pci.rel -pci_rel_SOURCES = pci/no_host_bridge.c ../../powerpc/shared/pci/pci.c \ +pci_SOURCES = pci/no_host_bridge.c ../../powerpc/shared/pci/pci.c \ ../../powerpc/shared/pci/pcifinddevice.c -pci_rel_CPPFLAGS = $(AM_CPPFLAGS) -pci_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -### include_bsp_HEADERS += ../../powerpc/shared/irq/irq.h \ ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/ppc_exc_bspsupp.h \ ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/vectors.h \ ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/irq_supp.h +irq_SOURCES = irq/irq_init.c ../shared/irq/openpic_i8259_irq.c ../../powerpc/shared/irq/i8259.c -noinst_PROGRAMS += irq.rel -irq_rel_SOURCES = irq/irq_init.c ../shared/irq/openpic_i8259_irq.c ../../powerpc/shared/irq/i8259.c -irq_rel_CPPFLAGS = $(AM_CPPFLAGS) -irq_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -## include_bsp_HEADERS += ../../shared/vmeUniverse/vmeUniverse.h \ vme/VMEConfig.h \ ../../shared/vmeUniverse/vme_am_defs.h \ @@ -92,16 +64,11 @@ include_bsp_HEADERS += ../../shared/vmeUniverse/vmeUniverse.h \ ../../shared/vmeUniverse/bspVmeDmaList.h\ ../../shared/vmeUniverse/VMEDMA.h -noinst_PROGRAMS += vme.rel -vme_rel_SOURCES = ../../shared/vmeUniverse/vmeUniverse.c \ +vme_SOURCES = ../../shared/vmeUniverse/vmeUniverse.c \ ../../shared/vmeUniverse/bspVmeDmaList.c \ ../shared/vme/vmeconfig.c \ ../shared/vme/vme_universe.c \ ../../shared/vmeUniverse/vme_am_defs.h -vme_rel_CPPFLAGS = $(AM_CPPFLAGS) -vme_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -## EXTRA_DIST = start/start.S start.$(OBJEXT): start/start.S @@ -114,11 +81,11 @@ rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S project_lib_DATA += rtems_crti.$(OBJEXT) noinst_LIBRARIES = libbsp.a -libbsp_a_SOURCES = -libbsp_a_LIBADD = pclock.rel console.rel irq.rel openpic.rel pci.rel \ - startup.rel vme.rel +libbsp_a_SOURCES = $(startup_SOURCES) $(pclock_SOURCES) $(console_SOURCES) \ + $(openpic_SOURCES) $(pci_SOURCES) $(irq_SOURCES) $(vme_SOURCES) -libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \ +libbsp_a_LIBADD = \ + ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \ ../../../libcpu/@RTEMS_CPU@/shared/stack.rel \ ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \ ../../../libcpu/@RTEMS_CPU@/mpc6xx/clock.rel \ diff --git a/c/src/lib/libbsp/powerpc/gen5200/ChangeLog b/c/src/lib/libbsp/powerpc/gen5200/ChangeLog index b7f69ff5b3..b26275b465 100644 --- a/c/src/lib/libbsp/powerpc/gen5200/ChangeLog +++ b/c/src/lib/libbsp/powerpc/gen5200/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/powerpc/gen5200/Makefile.am b/c/src/lib/libbsp/powerpc/gen5200/Makefile.am index 711b818498..e167bd2dc5 100644 --- a/c/src/lib/libbsp/powerpc/gen5200/Makefile.am +++ b/c/src/lib/libbsp/powerpc/gen5200/Makefile.am @@ -60,74 +60,35 @@ bestcomm_rel_SOURCES = bestcomm/include/ppctypes.h \ bestcomm_rel_CPPFLAGS = $(AM_CPPFLAGS) -DMPC5200_BAPI_LIBC_HEADERS bestcomm_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 -console_rel_CPPFLAGS = $(AM_CPPFLAGS) -console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += i2c.rel -i2c_rel_SOURCES = i2c/i2c.c i2c/i2cdrv.c i2c/mpc5200mbus.c \ - i2c/mpc5200mbus.h -i2c_rel_CPPFLAGS = $(AM_CPPFLAGS) -i2c_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += ide.rel -ide_rel_SOURCES = ide/idecfg.c ide/pcmcia_ide.c ide/pcmcia_ide.h -ide_rel_CPPFLAGS = $(AM_CPPFLAGS) -ide_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) +clock_SOURCES = clock/clock.c +console_SOURCES = console/console.c +i2c_SOURCES = i2c/i2c.c i2c/i2cdrv.c i2c/mpc5200mbus.c i2c/mpc5200mbus.h +ide_SOURCES = ide/idecfg.c ide/pcmcia_ide.c ide/pcmcia_ide.h include_bsp_HEADERS = irq/irq.h include/i2cdrv.h include/mpc5200.h \ include/i2c.h include/u-boot.h +irq_SOURCES = irq/irq.c irq/irq_init.c irq/irq.h irq/irq_asm.S +mscan_SOURCES = mscan/mscan.c mscan/mscan.h mscan/mscan_int.h -noinst_PROGRAMS += irq.rel -irq_rel_SOURCES = irq/irq.c irq/irq_init.c irq/irq.h irq/irq_asm.S -irq_rel_CPPFLAGS = $(AM_CPPFLAGS) -irq_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += mscan.rel -mscan_rel_SOURCES = mscan/mscan.c mscan/mscan.h mscan/mscan_int.h -mscan_rel_CPPFLAGS = $(AM_CPPFLAGS) -mscan_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += nvram.rel -nvram_rel_SOURCES = nvram/nvram.c nvram/nvram.h nvram/m93cxx.h -nvram_rel_CPPFLAGS = $(AM_CPPFLAGS) -nvram_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) include_bsp_HEADERS += nvram/nvram.h +nvram_SOURCES = nvram/nvram.c nvram/nvram.h nvram/m93cxx.h -noinst_PROGRAMS += slicetimer.rel -slicetimer_rel_SOURCES = slicetimer/slicetimer.c slicetimer/slicetimer.h -slicetimer_rel_CPPFLAGS = $(AM_CPPFLAGS) -slicetimer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) include_bsp_HEADERS += slicetimer/slicetimer.h +slicetimer_SOURCES = slicetimer/slicetimer.c slicetimer/slicetimer.h -noinst_PROGRAMS += tod.rel -tod_rel_SOURCES = tod/todcfg.c tod/pcf8563.c tod/pcf8563.h \ +tod_SOURCES = tod/todcfg.c tod/pcf8563.c tod/pcf8563.h \ ../../shared/tod.c -tod_rel_CPPFLAGS = $(AM_CPPFLAGS) -tod_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) include_bsp_HEADERS += vectors/vectors.h -noinst_PROGRAMS += startup.rel -startup_rel_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \ +startup_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \ ../../shared/bsppost.c startup/bspstart.c ../../shared/bootcard.c \ ../../shared/sbrk.c ../shared/uboot_dump_bdinfo.c \ ../../shared/gnatinstallhandler.c startup/cpuinit.c \ ../shared/showbats.c -startup_rel_CPPFLAGS = $(AM_CPPFLAGS) -startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -noinst_PROGRAMS += vectors.rel -vectors_rel_SOURCES = vectors/vectors_init.c vectors/vectors.h \ +vectors_SOURCES = vectors/vectors_init.c vectors/vectors.h \ vectors/vectors.S -vectors_rel_CPPFLAGS = $(AM_CPPFLAGS) -vectors_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) if HAS_NETWORKING network_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ @@ -139,13 +100,14 @@ network_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) endif noinst_LIBRARIES = libbsp.a -libbsp_a_SOURCES = -libbsp_a_LIBADD = bestcomm.rel clock.rel console.rel i2c.rel ide.rel irq.rel \ - mscan.rel nvram.rel slicetimer.rel tod.rel startup.rel vectors.rel -if HAS_NETWORKING -libbsp_a_LIBADD += network.rel -endif -libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \ +libbsp_a_SOURCES = $(clock_SOURCES) $(console_SOURCES) $(i2c_SOURCES) \ + $(ide_SOURCES) $(irq_SOURCES) $(mscan_SOURCES) $(nvram_SOURCES) \ + $(slicetimer_SOURCES) $(tod_SOURCES) $(startup_SOURCES) \ + $(vectors_SOURCES) + +libbsp_a_LIBADD = \ + bestcomm.rel \ + ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \ ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \ ../../../libcpu/@RTEMS_CPU@/shared/stack.rel \ ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \ @@ -153,5 +115,9 @@ libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \ ../../../libcpu/@RTEMS_CPU@/mpc6xx/timer.rel \ ../../../libcpu/@RTEMS_CPU@/@exceptions@/raw_exception.rel +if HAS_NETWORKING +libbsp_a_LIBADD += network.rel +endif + include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/gen83xx/ChangeLog b/c/src/lib/libbsp/powerpc/gen83xx/ChangeLog index 586415c09e..6b618fadac 100644 --- a/c/src/lib/libbsp/powerpc/gen83xx/ChangeLog +++ b/c/src/lib/libbsp/powerpc/gen83xx/ChangeLog @@ -1,3 +1,7 @@ +2008-05-14 Joel Sherrill + + * Makefile.am: Rework to avoid .rel files. + 2008-05-12 Joel Sherrill * Makefile.am, startup/bspstart.c: Refactored and renamed diff --git a/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am b/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am index 51917bc4b4..1c60142d68 100644 --- a/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am +++ b/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am @@ -37,48 +37,23 @@ dist_project_lib_DATA += startup/linkcmds \ startup/linkcmds.mpc8349eamds \ startup/linkcmds.hsc_cm01 -noinst_PROGRAMS += mpc83xx_regs.rel -mpc83xx_regs_rel_SOURCES = startup/mpc83xx_regs.c -mpc83xx_regs_rel_CPPFLAGS = $(AM_CPPFLAGS) -mpc83xx_regs_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += startup.rel -startup_rel_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \ +mpc83xx_regs_SOURCES = startup/mpc83xx_regs.c +startup_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \ ../../shared/bsppost.c startup/bspstart.c ../../shared/bootcard.c \ ../../shared/bsppredriverhook.c \ ../../shared/sbrk.c ../../shared/gnatinstallhandler.c startup/cpuinit.c +pclock_SOURCES = ../../powerpc/shared/clock/p_clock.c -startup_rel_CPPFLAGS = $(AM_CPPFLAGS) -startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += pclock.rel -pclock_rel_SOURCES = ../../powerpc/shared/clock/p_clock.c -pclock_rel_CPPFLAGS = $(AM_CPPFLAGS) -pclock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -include_bsp_HEADERS = ./irq/irq.h\ - ../../powerpc/shared/vectors/vectors.h - -noinst_PROGRAMS += vectors.rel -vectors_rel_SOURCES = ../../powerpc/shared/vectors/vectors.h \ +include_bsp_HEADERS = ./irq/irq.h \ + ../../powerpc/shared/vectors/vectors.h +vectors_SOURCES = ../../powerpc/shared/vectors/vectors.h \ ../../powerpc/shared/vectors/vectors_init.c \ ../../powerpc/shared/vectors/vectors.S -vectors_rel_CPPFLAGS = $(AM_CPPFLAGS) -vectors_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += irq.rel -irq_rel_SOURCES = ./irq/irq.h \ - ./irq/irq_init.c \ - ./irq/ipic.c \ +irq_SOURCES = ./irq/irq.h ./irq/irq_init.c ./irq/ipic.c \ ../shared/irq/irq_asm.S - -irq_rel_CPPFLAGS = $(AM_CPPFLAGS) -irq_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += console.rel -console_rel_SOURCES = console/console.c console/ns16550cfg.c -console_rel_CPPFLAGS = $(AM_CPPFLAGS) -console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) +console_SOURCES = console/console.c console/ns16550cfg.c +bsp_i2c_SOURCES = i2c/i2c_init.c +bsp_spi_SOURCES = spi/spi_init.c if HAS_NETWORKING noinst_PROGRAMS += network.rel @@ -88,22 +63,13 @@ network_rel_CPPFLAGS += -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ -D__BSD_VISIBLE network_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) endif -noinst_PROGRAMS += bsp_i2c.rel -bsp_i2c_rel_SOURCES = i2c/i2c_init.c -bsp_i2c_rel_CPPFLAGS = $(AM_CPPFLAGS) -bsp_i2c_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += bsp_spi.rel -bsp_spi_rel_SOURCES = spi/spi_init.c -bsp_spi_rel_CPPFLAGS = $(AM_CPPFLAGS) -bsp_spi_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - - noinst_LIBRARIES = libbsp.a -libbsp_a_SOURCES = -libbsp_a_LIBADD = startup.rel pclock.rel console.rel vectors.rel irq.rel \ - mpc83xx_regs.rel bsp_i2c.rel bsp_spi.rel -libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \ +libbsp_a_SOURCES = $(startup_SOURCES) $(pclock_SOURCES) $(console_SOURCES) \ + $(vectors_SOURCES) $(irq_SOURCES) $(mpc83xx_regs_SOURCES) \ + $(bsp_i2c_SOURCES) $(bsp_spi_SOURCES) + +libbsp_a_LIBADD = \ + ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \ ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \ ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \ ../../../libcpu/@RTEMS_CPU@/@exceptions@/raw_exception.rel \ diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog b/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog index a68415e8d1..043f6da661 100644 --- a/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog +++ b/c/src/lib/libbsp/powerpc/mbx8xx/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, startup/bspstart.c.nocache: Refactored and diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/Makefile.am b/c/src/lib/libbsp/powerpc/mbx8xx/Makefile.am index 200c2c1855..43d52f0a5b 100644 --- a/c/src/lib/libbsp/powerpc/mbx8xx/Makefile.am +++ b/c/src/lib/libbsp/powerpc/mbx8xx/Makefile.am @@ -27,40 +27,17 @@ EXTRA_DIST = times-mbx821 times-mbx860 dist_project_lib_DATA += startup/linkcmds -noinst_PROGRAMS += pclock.rel -pclock_rel_SOURCES = clock/p_clock.c -pclock_rel_CPPFLAGS = $(AM_CPPFLAGS) -pclock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += console.rel -console_rel_SOURCES = console/console.c -console_rel_CPPFLAGS = $(AM_CPPFLAGS) -console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += irq.rel -irq_rel_SOURCES = irq/irq.c irq/irq_asm.S irq/irq_init.c -irq_rel_CPPFLAGS = $(AM_CPPFLAGS) -irq_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += ide.rel -ide_rel_SOURCES = ide/idecfg.c ide/pcmcia_ide.c -ide_rel_CPPFLAGS = $(AM_CPPFLAGS) -ide_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += vectors.rel -vectors_rel_SOURCES = vectors/vectors.h vectors/vectors_init.c \ +pclock_SOURCES = clock/p_clock.c +console_SOURCES = console/console.c +irq_SOURCES = irq/irq.c irq/irq_asm.S irq/irq_init.c +ide_SOURCES = ide/idecfg.c ide/pcmcia_ide.c +vectors_SOURCES = vectors/vectors.h vectors/vectors_init.c \ vectors/vectors.S -vectors_rel_CPPFLAGS = $(AM_CPPFLAGS) -vectors_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += startup.rel -startup_rel_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \ +startup_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \ ../../shared/bsppost.c ../../shared/bsppredriverhook.c \ startup/bspstart.c ../../shared/bootcard.c \ startup/imbx8xx.c startup/mmutlbtab.c \ ../../shared/sbrk.c ../../shared/gnatinstallhandler.c startup/start.S -startup_rel_CPPFLAGS = $(AM_CPPFLAGS) -startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) if HAS_NETWORKING network_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ @@ -71,15 +48,11 @@ network_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) endif noinst_LIBRARIES = libbsp.a -libbsp_a_SOURCES = - -libbsp_a_LIBADD = pclock.rel irq.rel ide.rel startup.rel console.rel \ - vectors.rel -if HAS_NETWORKING -libbsp_a_LIBADD += network.rel -endif +libbsp_a_SOURCES = $(pclock_SOURCES) $(irq_SOURCES) $(ide_SOURCES) \ + $(startup_SOURCES) $(console_SOURCES) $(vectors_SOURCES) -libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \ +libbsp_a_LIBADD = \ + ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \ ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \ ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \ ../../../libcpu/@RTEMS_CPU@/@exceptions@/raw_exception.rel \ @@ -89,5 +62,9 @@ libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \ ../../../libcpu/@RTEMS_CPU@/mpc8xx/mmu.rel \ ../../../libcpu/@RTEMS_CPU@/mpc8xx/timer.rel +if HAS_NETWORKING +libbsp_a_LIBADD += network.rel +endif + include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog b/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog index 7760df34a7..145df11177 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog @@ -1,3 +1,7 @@ +2008-05-14 Joel Sherrill + + * Makefile.am: Rework to avoid .rel files. + 2007-12-11 Till Straumann * Makefile.am: use new irq_bspsupport.rel which was diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am index 43f14e0a30..86c3dab9ec 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am @@ -42,11 +42,9 @@ vectors_entry.$(OBJEXT): ../../powerpc/shared/start/vectors_entry.S $(CPPASCOMPILE) -o $@ -c $< project_lib_DATA += vectors_entry.$(OBJEXT) - dist_project_lib_DATA += ../shared/startup/linkcmds -noinst_PROGRAMS += startup.rel -startup_rel_SOURCES = ../../powerpc/shared/startup/bspstart.c \ +startup_SOURCES = ../../powerpc/shared/startup/bspstart.c \ ../../powerpc/shared/showbats.c \ ../../powerpc/shared/startup/pretaskinghook.c \ ../../shared/bsppredriverhook.c \ @@ -56,25 +54,20 @@ startup_rel_SOURCES = ../../powerpc/shared/startup/bspstart.c \ ../../powerpc/shared/startup/sbrk.c ../../shared/bootcard.c \ ../../shared/bspclean.c ../../shared/bsplibc.c ../../shared/bsppost.c \ ../../shared/gnatinstallhandler.c -startup_rel_CPPFLAGS = $(AM_CPPFLAGS) -startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += tod.rel -tod_rel_SOURCES = ../../shared/tod.c ../../powerpc/shared/tod/todcfg.c -tod_rel_CPPFLAGS = $(AM_CPPFLAGS) -tod_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += pclock.rel -pclock_rel_SOURCES = ../../powerpc/shared/clock/p_clock.c -pclock_rel_CPPFLAGS = $(AM_CPPFLAGS) -pclock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) +tod_SOURCES = ../../shared/tod.c ../../powerpc/shared/tod/todcfg.c +pclock_SOURCES = ../../powerpc/shared/clock/p_clock.c include_bsp_HEADERS = ../../powerpc/shared/console/consoleIo.h include_bsp_HEADERS += ../../powerpc/shared/console/uart.h -console_CPPFLAGS = -DSTATIC_LOG_ALLOC -noinst_PROGRAMS += console.rel -console_rel_SOURCES = ../../powerpc/shared/console/polled_io.c \ +# Needs conditional compilation +polledIO_CPPFLAGS = -DSTATIC_LOG_ALLOC +noinst_PROGRAMS += polledIO.rel +polledIO_rel_SOURCES = ../../powerpc/shared/console/polled_io.c +polledIO_rel_CPPFLAGS = $(AM_CPPFLAGS) $(polledIO_CPPFLAGS) +polledIO_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) + +console_SOURCES = \ ../../powerpc/shared/console/uart.c \ ../../powerpc/shared/console/console.c \ ../../powerpc/shared/console/inch.c \ @@ -82,57 +75,36 @@ console_rel_SOURCES = ../../powerpc/shared/console/polled_io.c \ ../../powerpc/shared/console/consoleIo.h \ ../../powerpc/shared/console/keyboard.h \ ../../powerpc/shared/console/uart.h -console_rel_CPPFLAGS = $(AM_CPPFLAGS) $(console_CPPFLAGS) -console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) include_bsp_HEADERS += ../../powerpc/shared/irq/irq.h \ ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/irq_supp.h \ ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/vectors.h \ ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/ppc_exc_bspsupp.h -noinst_PROGRAMS += irq.rel -irq_rel_SOURCES = ../../powerpc/shared/irq/irq_init.c ../../powerpc/shared/irq/openpic_i8259_irq.c \ +irq_SOURCES = ../../powerpc/shared/irq/irq_init.c \ + ../../powerpc/shared/irq/openpic_i8259_irq.c \ ../../powerpc/shared/irq/i8259.c ../../powerpc/shared/irq/irq.h -irq_rel_CPPFLAGS = $(AM_CPPFLAGS) -irq_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) include_bsp_HEADERS += ../../powerpc/shared/motorola/motorola.h - -noinst_PROGRAMS += motorola.rel -motorola_rel_SOURCES = ../../powerpc/shared/motorola/motorola.h \ +motorola_SOURCES = ../../powerpc/shared/motorola/motorola.h \ ../../powerpc/shared/motorola/motorola.c -motorola_rel_CPPFLAGS = $(AM_CPPFLAGS) -motorola_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) include_bsp_HEADERS += ../../powerpc/shared/openpic/openpic.h - -noinst_PROGRAMS += openpic.rel -openpic_rel_SOURCES = ../../powerpc/shared/openpic/openpic.h \ +openpic_SOURCES = ../../powerpc/shared/openpic/openpic.h \ ../../powerpc/shared/openpic/openpic.c \ ../../powerpc/shared/openpic/openpic.h -openpic_rel_CPPFLAGS = $(AM_CPPFLAGS) -openpic_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - include_bsp_HEADERS += ../../powerpc/shared/pci/pci.h - -noinst_PROGRAMS += pci.rel -pci_rel_SOURCES = ../../powerpc/shared/pci/pci.c \ +pci_SOURCES = ../../powerpc/shared/pci/pci.c \ ../../powerpc/shared/pci/detect_raven_bridge.c \ ../../powerpc/shared/pci/generic_clear_hberrs.c \ ../../powerpc/shared/pci/pcifinddevice.c ../../powerpc/shared/pci/pci.h -pci_rel_CPPFLAGS = $(AM_CPPFLAGS) -pci_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) include_bsp_HEADERS += ../../powerpc/shared/residual/residual.h \ ../../powerpc/shared/residual/pnp.h - -noinst_PROGRAMS += residual.rel -residual_rel_SOURCES = ../../powerpc/shared/residual/pnp.h \ +residual_SOURCES = ../../powerpc/shared/residual/pnp.h \ ../../powerpc/shared/residual/residual.h \ ../../powerpc/shared/residual/residual.c -residual_rel_CPPFLAGS = $(AM_CPPFLAGS) -residual_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) include_bsp_HEADERS += ../../shared/vmeUniverse/vmeUniverse.h \ ../../shared/vmeUniverse/vme_am_defs.h \ @@ -141,9 +113,7 @@ include_bsp_HEADERS += ../../shared/vmeUniverse/vmeUniverse.h \ ../../shared/vmeUniverse/vmeUniverseDMA.h\ ../../shared/vmeUniverse/bspVmeDmaList.h\ ../../shared/vmeUniverse/VMEDMA.h - -noinst_PROGRAMS += vme.rel -vme_rel_SOURCES = ../../shared/vmeUniverse/vmeUniverse.c \ +vme_SOURCES = ../../shared/vmeUniverse/vmeUniverse.c \ ../../shared/vmeUniverse/bspVmeDmaList.c \ ../../shared/vmeUniverse/vmeUniverse.h \ ../../shared/vmeUniverse/vme_am_defs.h \ @@ -151,14 +121,15 @@ vme_rel_SOURCES = ../../shared/vmeUniverse/vmeUniverse.c \ ../../powerpc/shared/vme/vmeconfig.c \ ../../powerpc/shared/vme/vme_universe.c \ ../../powerpc/shared/vme/VMEConfig.h -vme_rel_CPPFLAGS = $(AM_CPPFLAGS) -vme_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) noinst_LIBRARIES = libbsp.a -libbsp_a_SOURCES = -libbsp_a_LIBADD = startup.rel pclock.rel console.rel irq.rel openpic.rel \ - pci.rel residual.rel motorola.rel tod.rel vme.rel -libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \ +libbsp_a_SOURCES = $(startup_SOURCES) $(pclock_SOURCES) $(console_SOURCES) \ + $(irq_SOURCES) $(openpic_SOURCES) $(pci_SOURCES) $(residual_SOURCES) \ + $(motorola_SOURCES) $(tod_SOURCES) $(vme_SOURCES) + +libbsp_a_LIBADD = \ + polledIO.rel \ + ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \ ../../../libcpu/@RTEMS_CPU@/shared/stack.rel \ ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \ ../../../libcpu/@RTEMS_CPU@/mpc6xx/clock.rel \ diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog b/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog index 30b8739aee..0e70b7ffc3 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/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/powerpc/mpc8260ads/Makefile.am b/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am index d901569f5b..432700858d 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am @@ -28,38 +28,20 @@ project_lib_DATA = start.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds -noinst_PROGRAMS += pclock.rel -pclock_rel_SOURCES = clock/p_clock.c -pclock_rel_CPPFLAGS = $(AM_CPPFLAGS) -pclock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += console.rel -console_rel_SOURCES = console/console.c -console_rel_CPPFLAGS = $(AM_CPPFLAGS) -console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) +pclock_SOURCES = clock/p_clock.c +console_SOURCES = console/console.c include_bsp_HEADERS = irq/irq.h - -noinst_PROGRAMS += irq.rel -irq_rel_SOURCES = irq/irq.c irq/irq_init.c irq/irq.h irq/irq_asm.S -irq_rel_CPPFLAGS = $(AM_CPPFLAGS) -irq_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) +irq_SOURCES = irq/irq.c irq/irq_init.c irq/irq.h irq/irq_asm.S include_bsp_HEADERS += vectors/vectors.h - -noinst_PROGRAMS += startup.rel -startup_rel_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \ +startup_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \ ../../shared/bsppredriverhook.c ../../shared/bsppost.c \ startup/bspstart.c ../../shared/bootcard.c ../../shared/sbrk.c \ ../../shared/gnatinstallhandler.c startup/cpuinit.c -startup_rel_CPPFLAGS = $(AM_CPPFLAGS) -startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -noinst_PROGRAMS += vectors.rel -vectors_rel_SOURCES = vectors/vectors_init.c vectors/vectors.h \ +vectors_SOURCES = vectors/vectors_init.c vectors/vectors.h \ vectors/vectors.S -vectors_rel_CPPFLAGS = $(AM_CPPFLAGS) -vectors_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) if HAS_NETWORKING network_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ @@ -71,12 +53,10 @@ network_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) endif noinst_LIBRARIES = libbsp.a -libbsp_a_SOURCES = -libbsp_a_LIBADD = pclock.rel irq.rel startup.rel console.rel vectors.rel -if HAS_NETWORKING -libbsp_a_LIBADD += network.rel -endif -libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \ +libbsp_a_SOURCES = $(pclock_SOURCES) $(irq_SOURCES) $(startup_SOURCES) \ + $(console_SOURCES) $(vectors_SOURCES) + +libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \ ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \ ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \ ../../../libcpu/@RTEMS_CPU@/mpc8260/clock.rel \ @@ -85,6 +65,9 @@ libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \ ../../../libcpu/@RTEMS_CPU@/mpc8260/mmu.rel \ ../../../libcpu/@RTEMS_CPU@/mpc8260/timer.rel \ ../../../libcpu/@RTEMS_CPU@/@exceptions@/raw_exception.rel +if HAS_NETWORKING +libbsp_a_LIBADD += network.rel +endif EXTRA_DIST += times diff --git a/c/src/lib/libbsp/powerpc/mvme3100/ChangeLog b/c/src/lib/libbsp/powerpc/mvme3100/ChangeLog index 7b73108ba3..91c34e4d2c 100644 --- a/c/src/lib/libbsp/powerpc/mvme3100/ChangeLog +++ b/c/src/lib/libbsp/powerpc/mvme3100/ChangeLog @@ -1,3 +1,7 @@ +2008-05-14 Joel Sherrill + + * Makefile.am: Rework to avoid .rel files. + 2008-05-10 Till Straumann * network/tsec.c: removed memory input/output operands diff --git a/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am b/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am index e94b3e7a15..05e9b162ed 100644 --- a/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am +++ b/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am @@ -39,7 +39,8 @@ EXTRA_DIST += ../shared/start/vectors_entry.S vectors_entry.$(OBJEXT): ../shared/start/vectors_entry.S $(CPPASCOMPILE) -o $@ -c $< -motld_start.$(OBJEXT): preload.$(OBJEXT) vectors_entry.$(OBJEXT) start.$(OBJEXT) +motld_start.$(OBJEXT): preload.$(OBJEXT) vectors_entry.$(OBJEXT) \ + start.$(OBJEXT) $(LD) -o $@ -r $^ project_lib_DATA += motld_start.$(OBJEXT) @@ -55,63 +56,37 @@ build_date.c:: echo 'const char *BSP_build_date="'`date`'";' > $@ noinst_PROGRAMS += startup.rel -startup_rel_SOURCES = ./startup/bspstart.c build_date.c \ +startup_SOURCES = ./startup/bspstart.c build_date.c \ ./startup/misc.c \ ../../powerpc/shared/startup/pretaskinghook.c \ ../../powerpc/shared/startup/zerobss.c \ ../../powerpc/shared/startup/sbrk.c ../../shared/bootcard.c \ ../../shared/bspclean.c ../../shared/bsplibc.c ../../shared/bsppost.c \ ../../shared/gnatinstallhandler.c -startup_rel_CPPFLAGS = $(AM_CPPFLAGS) -startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += tod.rel -tod_rel_SOURCES = ../../shared/tod.c tod/todcfg.c -tod_rel_CPPFLAGS = $(AM_CPPFLAGS) -tod_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += pclock.rel -pclock_rel_SOURCES = ../../powerpc/shared/clock/p_clock.c -pclock_rel_CPPFLAGS = $(AM_CPPFLAGS) -pclock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) +tod_SOURCES = ../../shared/tod.c tod/todcfg.c +pclock_SOURCES = ../../powerpc/shared/clock/p_clock.c include_bsp_HEADERS = ../../powerpc/shared/console/uart.h -noinst_PROGRAMS += console.rel -console_rel_SOURCES = ../../powerpc/shared/console/uart.c \ +console_SOURCES = ../../powerpc/shared/console/uart.c \ ../../powerpc/shared/console/console.c \ ../../powerpc/shared/console/consoleIo.h \ ../../powerpc/shared/console/uart.h -console_rel_CPPFLAGS = $(AM_CPPFLAGS) $(console_CPPFLAGS) -console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) include_bsp_HEADERS += ./irq/irq.h - -noinst_PROGRAMS += irq.rel -irq_rel_SOURCES = ./irq/irq_init.c ../../powerpc/shared/irq/openpic_i8259_irq.c \ +irq_SOURCES = ./irq/irq_init.c \ + ../../powerpc/shared/irq/openpic_i8259_irq.c \ ../../powerpc/shared/irq/irq.h -irq_rel_CPPFLAGS = $(AM_CPPFLAGS) -irq_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - include_bsp_HEADERS += ../../powerpc/shared/openpic/openpic.h - -noinst_PROGRAMS += openpic.rel -openpic_rel_SOURCES = ../../powerpc/shared/openpic/openpic.h \ +openpic_SOURCES = ../../powerpc/shared/openpic/openpic.h \ ../../powerpc/shared/openpic/openpic.c \ ../../powerpc/shared/openpic/openpic.h -openpic_rel_CPPFLAGS = $(AM_CPPFLAGS) -openpic_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - include_bsp_HEADERS += ../../powerpc/shared/pci/pci.h - -noinst_PROGRAMS += pci.rel -pci_rel_SOURCES = ../../powerpc/shared/pci/pci.c \ +pci_SOURCES = ../../powerpc/shared/pci/pci.c \ ./pci/detect_host_bridge.c \ ../../powerpc/shared/pci/generic_clear_hberrs.c \ ../../powerpc/shared/pci/pcifinddevice.c ../../powerpc/shared/pci/pci.h -pci_rel_CPPFLAGS = $(AM_CPPFLAGS) -pci_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) include_bsp_HEADERS += ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/vectors.h include_bsp_HEADERS += ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/ppc_exc_bspsupp.h @@ -125,8 +100,7 @@ include_bsp_HEADERS += ./vme/VMEConfig.h \ ../../shared/vmeUniverse/bspVmeDmaList.h\ ../../shared/vmeUniverse/VMEDMA.h -noinst_PROGRAMS += vme.rel -vme_rel_SOURCES = ../../shared/vmeUniverse/vmeTsi148.c \ +vme_SOURCES = ../../shared/vmeUniverse/vmeTsi148.c \ ../../shared/vmeUniverse/bspVmeDmaList.c \ ../../shared/vmeUniverse/vmeTsi148.h \ ../../shared/vmeUniverse/vme_am_defs.h \ @@ -134,46 +108,32 @@ vme_rel_SOURCES = ../../shared/vmeUniverse/vmeTsi148.c \ ../../powerpc/shared/vme/vmeconfig.c \ ../../powerpc/shared/vme/vme_universe.c -vme_rel_CPPFLAGS = $(AM_CPPFLAGS) -vme_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - include_bsp_HEADERS += ../shared/flash/flashPgm.h \ ../shared/flash/flashPgmPvt.h - -noinst_PROGRAMS += flash.rel -flash_rel_SOURCES = ../shared/flash/flash.c \ +flash_SOURCES = ../shared/flash/flash.c \ ../shared/flash/spansionFlash.c \ ./flash/flashcfg.c -flash_rel_CPPFLAGS = $(AM_CPPFLAGS) -flash_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - - include_bsp_HEADERS += i2c/mpc8540_i2c_busdrv.h -noinst_PROGRAMS += i2c.rel -i2c_rel_SOURCES = i2c/mpc8540_i2c.c i2c/i2c_init.c -i2c_rel_CPPFLAGS = $(AM_CPPFLAGS) -i2c_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) +i2c_SOURCES = i2c/mpc8540_i2c.c i2c/i2c_init.c include_bsp_HEADERS += ../shared/motorola/vpd.h -noinst_PROGRAMS += vpd.rel -vpd_rel_SOURCES = ../shared/motorola/vpd.c -vpd_rel_CPPFLAGS = $(AM_CPPFLAGS) -vpd_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) +vpd_SOURCES = ../shared/motorola/vpd.c +if HAS_NETWORKING include_bsp_HEADERS += network/if_tsec_pub.h noinst_PROGRAMS += network.rel network_rel_SOURCES = network/tsec.c network_rel_CPPFLAGS = $(AM_CPPFLAGS) network_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - +endif noinst_LIBRARIES = libbsp.a -libbsp_a_SOURCES = -libbsp_a_LIBADD = startup.rel pclock.rel console.rel openpic.rel \ - pci.rel irq.rel i2c.rel tod.rel vpd.rel network.rel vme.rel flash.rel +libbsp_a_SOURCES = $(startup_SOURCES) $(pclock_SOURCES) $(console_SOURCES) \ + $(openpic_SOURCES) $(pci_SOURCES) $(irq_SOURCES) $(i2c_SOURCES) \ + $(tod_SOURCES) $(vpd_SOURCES) $(vme_SOURCES) $(flash_SOURCES) -libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \ +libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \ ../../../libcpu/@RTEMS_CPU@/shared/stack.rel \ ../../../libcpu/@RTEMS_CPU@/e500/clock.rel \ ../../../libcpu/@RTEMS_CPU@/e500/timer.rel \ @@ -183,6 +143,10 @@ libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \ ../../../libcpu/@RTEMS_CPU@/@exceptions@/exc_bspsupport.rel \ ../../../libcpu/@RTEMS_CPU@/@exceptions@/irq_bspsupport.rel +if HAS_NETWORKING +libbsp_a_LIBADD += network.rel +endif + EXTRA_DIST += LICENSE ChangeLog README KNOWN_PROBLEMS include $(srcdir)/preinstall.am diff --git a/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog b/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog index 539bb9b73d..7c274fd0dd 100644 --- a/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog +++ b/c/src/lib/libbsp/powerpc/mvme5500/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/powerpc/mvme5500/Makefile.am b/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am index 98827640c2..d9d29f1847 100644 --- a/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am +++ b/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am @@ -29,83 +29,53 @@ dist_project_lib_DATA += ../shared/startup/linkcmds # UNUSED EXTRA_DIST = startup/bootpstuff.c -noinst_PROGRAMS += startup.rel -startup_rel_SOURCES = startup/bspstart.c \ +startup_SOURCES = startup/bspstart.c \ ../../powerpc/shared/startup/pgtbl_setup.c startup/pgtbl_activate.c \ ../../powerpc/shared/startup/pretaskinghook.c \ ../../powerpc/shared/startup/sbrk.c ../../shared/bootcard.c \ ../../shared/bsppredriverhook.c startup/bspclean.c \ ../../shared/bsplibc.c ../../shared/bsppost.c \ ../../shared/gnatinstallhandler.c startup/reboot.c -startup_rel_CPPFLAGS = $(AM_CPPFLAGS) -startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) +pclock_SOURCES = ../../powerpc/shared/clock/p_clock.c -### -noinst_PROGRAMS += pclock.rel -pclock_rel_SOURCES = ../../powerpc/shared/clock/p_clock.c -pclock_rel_CPPFLAGS = $(AM_CPPFLAGS) -pclock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -### include_bsp_HEADERS = ../../powerpc/shared/console/uart.h include_bsp_HEADERS += ../../powerpc/shared/console/consoleIo.h - -noinst_PROGRAMS += console.rel -console_rel_SOURCES = ../../powerpc/shared/console/uart.c \ +console_SOURCES = ../../powerpc/shared/console/uart.c \ ../../powerpc/shared/console/console.c -console_rel_CPPFLAGS = $(AM_CPPFLAGS) -console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -### include_bsp_HEADERS += pci/gtpcireg.h pci/pci.h - -noinst_PROGRAMS += pci.rel -pci_rel_SOURCES = pci/pci.c pci/pci_interface.c pci/detect_host_bridge.c \ +pci_SOURCES = pci/pci.c pci/pci_interface.c pci/detect_host_bridge.c \ pci/pcifinddevice.c -pci_rel_CPPFLAGS = $(AM_CPPFLAGS) -pci_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -### include_bsp_HEADERS += irq/irq.h +irq_SOURCES = irq/irq_init.c irq/irq.c -noinst_PROGRAMS += irq.rel -irq_rel_SOURCES = irq/irq_init.c irq/irq.c -irq_rel_CPPFLAGS = $(AM_CPPFLAGS) -irq_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -### nodist_include_HEADERS += ../../shared/tod.h +tod_SOURCES = ../../shared/tod.c tod/todcfg.c -noinst_PROGRAMS += tod.rel -tod_rel_SOURCES = ../../shared/tod.c tod/todcfg.c -tod_rel_CPPFLAGS = $(AM_CPPFLAGS) -tod_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -## -include_bsp_HEADERS += \ - vectors/bspException.h - +include_bsp_HEADERS += vectors/bspException.h include_bsp_HEADERS += \ ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/vectors.h \ ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/irq_supp.h \ ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/ppc_exc_bspsupp.h -noinst_PROGRAMS += vectors.rel -vectors_rel_SOURCES = \ - vectors/exceptionhandler.c \ +vectors_SOURCES = vectors/exceptionhandler.c \ ../../powerpc/shared/start/vectors_entry.S -vectors_rel_CPPFLAGS = $(AM_CPPFLAGS) -vectors_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -## include_bsp_HEADERS += GT64260/bspMvme5500.h GT64260/gtreg.h \ GT64260/GT64260TWSI.h GT64260/VPD.h -noinst_PROGRAMS += GT64260.rel -GT64260_rel_SOURCES = GT64260/GT64260TWSI.c GT64260/MVME5500I2C.c -GT64260_rel_CPPFLAGS = $(AM_CPPFLAGS) -GT64260_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) +GT64260_SOURCES = GT64260/GT64260TWSI.c GT64260/MVME5500I2C.c + +include_bsp_HEADERS += ../../shared/vmeUniverse/VME.h vme/VMEConfig.h \ + ../../shared/vmeUniverse/vmeUniverse.h \ + ../../shared/vmeUniverse/vmeUniverseDMA.h\ + ../../shared/vmeUniverse/bspVmeDmaList.h\ + ../../shared/vmeUniverse/VMEDMA.h \ + ../../shared/vmeUniverse/vme_am_defs.h +vme_SOURCES = ../../shared/vmeUniverse/vmeUniverse.c\ + ../shared/vme/vmeconfig.c ../../shared/vmeUniverse/bspVmeDmaList.c\ + ../shared/vme/vme_universe.c -## if HAS_NETWORKING include_bsp_HEADERS += network/if_100MHz/GT64260eth.h \ network/if_100MHz/GT64260ethreg.h network/if_1GHz/if_wmreg.h \ @@ -118,23 +88,6 @@ network_rel_SOURCES = network/if_100MHz/GT64260eth.c \ network_rel_CPPFLAGS = $(AM_CPPFLAGS) $(network_CPPFLAGS) network_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) endif -##vme -include_bsp_HEADERS += ../../shared/vmeUniverse/VME.h vme/VMEConfig.h \ - ../../shared/vmeUniverse/vmeUniverse.h \ - ../../shared/vmeUniverse/vmeUniverseDMA.h\ - ../../shared/vmeUniverse/bspVmeDmaList.h\ - ../../shared/vmeUniverse/VMEDMA.h \ - ../../shared/vmeUniverse/vme_am_defs.h - -noinst_PROGRAMS += vme.rel -vme_rel_SOURCES = ../../shared/vmeUniverse/vmeUniverse.c\ - ../shared/vme/vmeconfig.c ../../shared/vmeUniverse/bspVmeDmaList.c\ - ../shared/vme/vme_universe.c - -vme_rel_CPPFLAGS = $(AM_CPPFLAGS) -vme_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -## EXTRA_DIST += ../../powerpc/shared/start/rtems_crti.S rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S @@ -149,14 +102,12 @@ mvme5500start___OBJEXT__LDFLAGS = $(RTEMS_RELLDFLAGS) project_lib_DATA += mvme5500start.$(OBJEXT) noinst_LIBRARIES = libbsp.a -libbsp_a_SOURCES = -libbsp_a_LIBADD = pclock.rel console.rel irq.rel pci.rel startup.rel tod.rel \ - vectors.rel GT64260.rel -if HAS_NETWORKING -libbsp_a_LIBADD += network.rel -endif -libbsp_a_LIBADD += vme.rel -libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \ +libbsp_a_SOURCES = $(pclock_SOURCES) $(console_SOURCES) $(irq_SOURCES) \ + $(pci_SOURCES) $(startup_SOURCES) $(tod_SOURCES) $(vectors_SOURCES) \ + $(GT64260_SOURCES) $(vme_SOURCES) + +libbsp_a_LIBADD = \ + ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \ ../../../libcpu/@RTEMS_CPU@/shared/stack.rel \ ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \ ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \ @@ -166,6 +117,9 @@ libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \ ../../../libcpu/@RTEMS_CPU@/@exceptions@/irq_bspsupport.rel \ ../../../libcpu/@RTEMS_CPU@/mpc6xx/mmu.rel \ ../../../libcpu/@RTEMS_CPU@/mpc6xx/timer.rel +if HAS_NETWORKING +libbsp_a_LIBADD += network.rel +endif include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/score603e/ChangeLog b/c/src/lib/libbsp/powerpc/score603e/ChangeLog index 74296c585e..d40af469bf 100644 --- a/c/src/lib/libbsp/powerpc/score603e/ChangeLog +++ b/c/src/lib/libbsp/powerpc/score603e/ChangeLog @@ -1,3 +1,7 @@ +2008-05-14 Joel Sherrill + + * Makefile.am: Rework to avoid .rel files. + 2008-04-23 Joel Sherrill * Makefile.am: Remove all references to console_reserve_resources and diff --git a/c/src/lib/libbsp/powerpc/score603e/Makefile.am b/c/src/lib/libbsp/powerpc/score603e/Makefile.am index f9766c9517..6ac8bc5c97 100644 --- a/c/src/lib/libbsp/powerpc/score603e/Makefile.am +++ b/c/src/lib/libbsp/powerpc/score603e/Makefile.am @@ -25,81 +25,43 @@ include_HEADERS += include/coverhd.h include/gen2.h ### dist_project_lib_DATA += startup/linkcmds -noinst_PROGRAMS += startup.rel -startup_rel_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \ +startup_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \ startup/bspstart.c ../../shared/bootcard.c \ ../../shared/sbrk.c startup/Hwr_init.c \ startup/genpvec.c ../../shared/gnatinstallhandler.c -startup_rel_CPPFLAGS = $(AM_CPPFLAGS) -startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -### -noinst_PROGRAMS += pclock.rel -pclock_rel_SOURCES = ../../powerpc/shared/clock/p_clock.c -pclock_rel_CPPFLAGS = $(AM_CPPFLAGS) -pclock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -### -### include_bsp_HEADERS = - -noinst_PROGRAMS += console.rel -console_rel_SOURCES = console/85c30.c console/85c30.h console/console.c \ +pclock_SOURCES = ../../powerpc/shared/clock/p_clock.c +console_SOURCES = console/85c30.c console/85c30.h console/console.c \ console/tbl85c30.c console/consolebsp.h -console_rel_CPPFLAGS = $(AM_CPPFLAGS) -console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -### include_bsp_HEADERS = ../../powerpc/shared/pci/pci.h \ ../../powerpc/shared/residual/residual.h \ ../../powerpc/shared/residual/pnp.h \ ../../powerpc/shared/openpic/openpic.h \ ../../powerpc/shared/console/consoleIo.h - -noinst_PROGRAMS += pci.rel -pci_rel_SOURCES = pci/no_host_bridge.c ../../powerpc/shared/pci/pci.c \ +pci_SOURCES = pci/no_host_bridge.c ../../powerpc/shared/pci/pci.c \ ../../powerpc/shared/pci/pcifinddevice.c -pci_rel_CPPFLAGS = $(AM_CPPFLAGS) -pci_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -### include_bsp_HEADERS += irq/irq.h +irq_SOURCES = irq/FPGA.c irq/irq.c ../../powerpc/shared/irq/irq_asm.S -noinst_PROGRAMS += irq.rel -irq_rel_SOURCES = irq/FPGA.c irq/irq.c ../../powerpc/shared/irq/irq_asm.S -irq_rel_CPPFLAGS = $(AM_CPPFLAGS) -irq_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -## include_bsp_HEADERS += ../../powerpc/shared/vectors/vectors.h - -noinst_PROGRAMS += vectors.rel -vectors_rel_SOURCES = ../../powerpc/shared/vectors/vectors_init.c \ +vectors_SOURCES = ../../powerpc/shared/vectors/vectors_init.c \ ../../powerpc/shared/vectors/vectors.S -vectors_rel_CPPFLAGS = $(AM_CPPFLAGS) -vectors_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -## include_bsp_HEADERS += ../../shared/vmeUniverse/vmeUniverse.h \ ../../shared/vmeUniverse/vme_am_defs.h \ ../../shared/vmeUniverse/VME.h \ vme/VMEConfig.h \ ../../powerpc/shared/motorola/motorola.h \ - ../../shared/vmeUniverse/vmeUniverseDMA.h\ - ../../shared/vmeUniverse/bspVmeDmaList.h\ - ../../shared/vmeUniverse/VMEDMA.h - -noinst_PROGRAMS += vme.rel -vme_rel_SOURCES = ../../shared/vmeUniverse/vmeUniverse.c \ + ../../shared/vmeUniverse/vmeUniverseDMA.h\ + ../../shared/vmeUniverse/bspVmeDmaList.h\ + ../../shared/vmeUniverse/VMEDMA.h +vme_SOURCES = ../../shared/vmeUniverse/vmeUniverse.c \ ../../shared/vmeUniverse/bspVmeDmaList.c \ ../../shared/vmeUniverse/vme_am_defs.h \ ../shared/vme/vmeconfig.c \ ../shared/vme/vme_universe.c -vme_rel_CPPFLAGS = $(AM_CPPFLAGS) -vme_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -## - EXTRA_DIST = start/start.S start.$(OBJEXT): start/start.S $(CPPASCOMPILE) -o $@ -c $< @@ -111,10 +73,11 @@ rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S project_lib_DATA += rtems_crti.$(OBJEXT) noinst_LIBRARIES = libbsp.a -libbsp_a_SOURCES = -libbsp_a_LIBADD = pclock.rel console.rel irq.rel pci.rel vectors.rel \ - startup.rel vme.rel -libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \ +libbsp_a_SOURCES = $(pclock_SOURCES) $(console_SOURCES) $(irq_SOURCES) \ + $(pci_SOURCES) $(vectors_SOURCES) $(startup_SOURCES) $(vme_SOURCES) + +libbsp_a_LIBADD = \ + ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \ ../../../libcpu/@RTEMS_CPU@/shared/stack.rel \ ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \ ../../../libcpu/@RTEMS_CPU@/mpc6xx/clock.rel \ diff --git a/c/src/lib/libbsp/powerpc/ss555/ChangeLog b/c/src/lib/libbsp/powerpc/ss555/ChangeLog index 2ecfd7287c..2be951494b 100644 --- a/c/src/lib/libbsp/powerpc/ss555/ChangeLog +++ b/c/src/lib/libbsp/powerpc/ss555/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/powerpc/ss555/Makefile.am b/c/src/lib/libbsp/powerpc/ss555/Makefile.am index 2238395f24..0620a1da6f 100644 --- a/c/src/lib/libbsp/powerpc/ss555/Makefile.am +++ b/c/src/lib/libbsp/powerpc/ss555/Makefile.am @@ -26,33 +26,20 @@ EXTRA_DIST = times dist_project_lib_DATA += startup/linkcmds -noinst_PROGRAMS += pclock.rel -pclock_rel_SOURCES = clock/p_clock.c -pclock_rel_CPPFLAGS = $(AM_CPPFLAGS) -pclock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += console.rel -console_rel_SOURCES = console/console.c -console_rel_CPPFLAGS = $(AM_CPPFLAGS) -console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += startup.rel -startup_rel_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \ +pclock_SOURCES = clock/p_clock.c +console_SOURCES = console/console.c +startup_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \ ../../shared/bsppost.c ../../shared/bsppredriverhook.c \ startup/bspstart.c ../../shared/bootcard.c startup/iss555.c \ ../../shared/sbrk.c ../../shared/gnatinstallhandler.c startup/start.S -startup_rel_CPPFLAGS = $(AM_CPPFLAGS) -startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += tm27supp.rel -tm27supp_rel_SOURCES = startup/tm27supp.c -tm27supp_rel_CPPFLAGS = $(AM_CPPFLAGS) -tm27supp_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) +tm27supp_SOURCES = startup/tm27supp.c noinst_LIBRARIES = libbsp.a -libbsp_a_SOURCES = -libbsp_a_LIBADD = pclock.rel console.rel startup.rel tm27supp.rel -libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \ +libbsp_a_SOURCES = $(pclock_SOURCES) $(console_SOURCES) $(startup_SOURCES) \ + $(tm27supp_SOURCES) + +libbsp_a_LIBADD = \ + ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \ ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \ ../../../libcpu/@RTEMS_CPU@/mpc5xx/clock.rel \ ../../../libcpu/@RTEMS_CPU@/mpc5xx/console-generic.rel \ diff --git a/c/src/lib/libbsp/powerpc/virtex/ChangeLog b/c/src/lib/libbsp/powerpc/virtex/ChangeLog index 9bd91d1437..69b6e8d318 100644 --- a/c/src/lib/libbsp/powerpc/virtex/ChangeLog +++ b/c/src/lib/libbsp/powerpc/virtex/ChangeLog @@ -1,3 +1,7 @@ +2008-05-14 Joel Sherrill + + * Makefile.am: Rework to avoid .rel files. + 2008-05-12 Joel Sherrill * Makefile.am, startup/bspstart.c: Refactored and renamed diff --git a/c/src/lib/libbsp/powerpc/virtex/Makefile.am b/c/src/lib/libbsp/powerpc/virtex/Makefile.am index 7265c7ea72..9c56184b42 100644 --- a/c/src/lib/libbsp/powerpc/virtex/Makefile.am +++ b/c/src/lib/libbsp/powerpc/virtex/Makefile.am @@ -32,45 +32,24 @@ project_lib_DATA = rtems_crti.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds - -noinst_PROGRAMS += startup.rel -startup_rel_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \ +startup_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \ ../../shared/bsppost.c startup/bspstart.c ../../shared/bootcard.c \ ../../shared/bsppredriverhook.c \ ../../shared/sbrk.c startup/setvec.c \ ../../shared/gnatinstallhandler.c -startup_rel_CPPFLAGS = $(AM_CPPFLAGS) -startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += dlentry.rel -dlentry_rel_SOURCES = dlentry/dlentry.S -dlentry_rel_CPPFLAGS = $(AM_CPPFLAGS) -dlentry_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += bspconsole.rel -bspconsole_rel_SOURCES = console/consolelite.c ../../shared/console.c -bspconsole_rel_CPPFLAGS = $(AM_CPPFLAGS) -bspconsole_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) +dlentry_SOURCES = dlentry/dlentry.S +bspconsole_SOURCES = console/consolelite.c ../../shared/console.c include_bsp_HEADERS = include/opbintctrl.h -noinst_PROGRAMS += opbintctrl.rel -opbintctrl_rel_SOURCES = opbintctrl/opbintctrl.c -opbintctrl_rel_CPPFLAGS = $(AM_CPPFLAGS) -opbintctrl_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) +opbintctrl_SOURCES = opbintctrl/opbintctrl.c include_bsp_HEADERS += irq/irq.h -noinst_PROGRAMS += irq.rel -irq_rel_SOURCES = irq/irq_init.c ../shared/irq/irq_asm.S -irq_rel_CPPFLAGS = $(AM_CPPFLAGS) -irq_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) +irq_SOURCES = irq/irq_init.c ../shared/irq/irq_asm.S include_bsp_HEADERS += ../../powerpc/shared/vectors/vectors.h -noinst_PROGRAMS += vectors.rel -vectors_rel_SOURCES = ../../powerpc/shared/vectors/vectors.h \ +vectors_SOURCES = ../../powerpc/shared/vectors/vectors.h \ ../../powerpc/shared/vectors/vectors_init.c \ ../../powerpc/shared/vectors/vectors.S -vectors_rel_CPPFLAGS = $(AM_CPPFLAGS) -vectors_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) if HAS_NETWORKING network_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ @@ -82,21 +61,22 @@ network_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) endif noinst_LIBRARIES = libbsp.a -libbsp_a_SOURCES = +libbsp_a_SOURCES = $(startup_SOURCES) $(dlentry_SOURCES) \ + $(bspconsole_SOURCES) $(opbintctrl_SOURCES) $(vectors_SOURCES) \ + $(irq_SOURCES) -libbsp_a_LIBADD = startup.rel dlentry.rel bspconsole.rel opbintctrl.rel \ - vectors.rel irq.rel -if HAS_NETWORKING -libbsp_a_LIBADD += network.rel -endif - -libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \ +libbsp_a_LIBADD = \ + ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \ ../../../libcpu/@RTEMS_CPU@/@exceptions@/raw_exception.rel \ ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \ ../../../libcpu/@RTEMS_CPU@/ppc403/clock.rel \ ../../../libcpu/@RTEMS_CPU@/ppc403/timer.rel \ ../../../libcpu/@RTEMS_CPU@/ppc403/tty_drv.rel +if HAS_NETWORKING +libbsp_a_LIBADD += network.rel +endif + EXTRA_DIST += times include $(srcdir)/preinstall.am 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 diff --git a/c/src/lib/libbsp/unix/posix/ChangeLog b/c/src/lib/libbsp/unix/posix/ChangeLog index b33f00392f..4c101e9592 100644 --- a/c/src/lib/libbsp/unix/posix/ChangeLog +++ b/c/src/lib/libbsp/unix/posix/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/unix/posix/Makefile.am b/c/src/lib/libbsp/unix/posix/Makefile.am index ad9ff71543..0e5c9c5b97 100644 --- a/c/src/lib/libbsp/unix/posix/Makefile.am +++ b/c/src/lib/libbsp/unix/posix/Makefile.am @@ -39,50 +39,29 @@ noinst_LIBRARIES = ## project_lib_DATA += rtems-ctor.$(OBJEXT) ## endif -noinst_PROGRAMS += startup.rel -startup_rel_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \ +startup_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \ ../../shared/bsppredriverhook.c startup/bspstart.c \ startup/setvec.c ../../shared/bootcard.c ## for now always using main.c style startup ##if !HAS_CXX -startup_rel_SOURCES += startup/main.c +startup_SOURCES += startup/main.c ##endif -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 console/console-io.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 console/console-io.c +timer_SOURCES = timer/timer.c if HAS_MP -noinst_PROGRAMS += shmsupp.rel -shmsupp_rel_SOURCES = shmsupp/addrconv.c shmsupp/getcfg.c \ +shmsupp_SOURCES = shmsupp/addrconv.c shmsupp/getcfg.c \ shmsupp/cause_intr.c shmsupp/lock.c shmsupp/mpisr.c -shmsupp_rel_CPPFLAGS = $(AM_CPPFLAGS) -shmsupp_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) endif noinst_LIBRARIES += libbsp.a -libbsp_a_SOURCES = +libbsp_a_SOURCES = $(startup_SOURCES) $(clock_SOURCES) \ + $(console_SOURCES) $(timer_SOURCES) $(shmsupp_SOURCES) ## if HAS_CXX ## libbsp_a_SOURCES += startup/rtems-ctor.cc ## endif -libbsp_a_LIBADD = startup.rel clock.rel console.rel timer.rel -if HAS_MP -libbsp_a_LIBADD += shmsupp.rel -endif EXTRA_DIST = times -- cgit v1.2.3