From 70fff65ff6e7e1506a24f72adb9e82eba8cdf87e Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 14 Dec 2011 19:23:49 +0000 Subject: 2011-12-14 Joel Sherrill * Makefile.am: Change to one file per line. Clean up. --- c/src/lib/libbsp/mips/csb350/ChangeLog | 4 +++ c/src/lib/libbsp/mips/csb350/Makefile.am | 27 ++++++++++------ c/src/lib/libbsp/mips/jmr3904/ChangeLog | 4 +++ c/src/lib/libbsp/mips/jmr3904/Makefile.am | 28 +++++++++++------ c/src/lib/libbsp/mips/rbtx4925/ChangeLog | 4 +++ c/src/lib/libbsp/mips/rbtx4925/Makefile.am | 49 +++++++++++++++--------------- c/src/lib/libbsp/mips/rbtx4938/ChangeLog | 4 +++ c/src/lib/libbsp/mips/rbtx4938/Makefile.am | 48 +++++++++++++++-------------- 8 files changed, 101 insertions(+), 67 deletions(-) diff --git a/c/src/lib/libbsp/mips/csb350/ChangeLog b/c/src/lib/libbsp/mips/csb350/ChangeLog index e2a16233cf..bf521f07ec 100644 --- a/c/src/lib/libbsp/mips/csb350/ChangeLog +++ b/c/src/lib/libbsp/mips/csb350/ChangeLog @@ -1,3 +1,7 @@ +2011-12-14 Joel Sherrill + + * Makefile.am: Change to one file per line. Clean up. + 2011-06-19 Ralf Corsépius * Makefile.am: Fix broken path to clockdrv_shell.h. diff --git a/c/src/lib/libbsp/mips/csb350/Makefile.am b/c/src/lib/libbsp/mips/csb350/Makefile.am index 0f7e08bf04..08dd89fa7a 100644 --- a/c/src/lib/libbsp/mips/csb350/Makefile.am +++ b/c/src/lib/libbsp/mips/csb350/Makefile.am @@ -31,16 +31,24 @@ noinst_LIBRARIES += libbsp.a libbsp_a_SOURCES = # startup -libbsp_a_SOURCES += ../../shared/bspclean.c ../../shared/bsplibc.c \ - ../../shared/bsppredriverhook.c ../../shared/bsppost.c startup/bspreset.c \ - ../../shared/bsppretaskinghook.c ../../shared/bspgetworkarea.c \ - startup/bspstart.c ../../shared/bootcard.c ../../shared/sbrk.c \ - ../../shared/gnatinstallhandler.c ../../shared/setvec.c +libbsp_a_SOURCES += ../../shared/bspclean.c +libbsp_a_SOURCES += ../../shared/bsplibc.c +libbsp_a_SOURCES += ../../shared/bsppredriverhook.c +libbsp_a_SOURCES += ../../shared/bsppost.c +libbsp_a_SOURCES += startup/bspreset.c +libbsp_a_SOURCES += ../../shared/bsppretaskinghook.c +libbsp_a_SOURCES += ../../shared/bspgetworkarea.c +libbsp_a_SOURCES += startup/bspstart.c +libbsp_a_SOURCES += ../../shared/bootcard.c +libbsp_a_SOURCES += ../../shared/sbrk.c +libbsp_a_SOURCES += ../../shared/gnatinstallhandler.c +libbsp_a_SOURCES += ../../shared/setvec.c # clock libbsp_a_SOURCES += clock/clockdrv.c libbsp_a_SOURCES += ../../shared/clockdrv_shell.h # console -libbsp_a_SOURCES += console/console-io.c ../../shared/console-polled.c +libbsp_a_SOURCES += console/console-io.c +libbsp_a_SOURCES += ../../shared/console-polled.c # timer libbsp_a_SOURCES += timer/timer.c @@ -52,10 +60,9 @@ network_rel_CPPFLAGS = $(AM_CPPFLAGS) $(network_CPPFLAGS) network_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) endif -libbsp_a_LIBADD = \ - ../../../libcpu/mips/shared/cache.rel \ - ../../../libcpu/mips/shared/interrupts.rel \ - ../../../libcpu/mips/au1x00/vectorisrs.rel +libbsp_a_LIBADD = ../../../libcpu/mips/shared/cache.rel +libbsp_a_LIBADD += ../../../libcpu/mips/shared/interrupts.rel +libbsp_a_LIBADD += ../../../libcpu/mips/au1x00/vectorisrs.rel if HAS_NETWORKING libbsp_a_LIBADD += network.rel endif diff --git a/c/src/lib/libbsp/mips/jmr3904/ChangeLog b/c/src/lib/libbsp/mips/jmr3904/ChangeLog index 715d186302..a47a0f5891 100644 --- a/c/src/lib/libbsp/mips/jmr3904/ChangeLog +++ b/c/src/lib/libbsp/mips/jmr3904/ChangeLog @@ -1,3 +1,7 @@ +2011-12-14 Joel Sherrill + + * Makefile.am: Change to one file per line. Clean up. + 2011-11-04 Joel Sherrill * ChangeLog, Makefile.am: Add bsp_reset() stub. diff --git a/c/src/lib/libbsp/mips/jmr3904/Makefile.am b/c/src/lib/libbsp/mips/jmr3904/Makefile.am index 2ede53f873..749654644f 100644 --- a/c/src/lib/libbsp/mips/jmr3904/Makefile.am +++ b/c/src/lib/libbsp/mips/jmr3904/Makefile.am @@ -30,23 +30,31 @@ noinst_LIBRARIES += libbsp.a libbsp_a_SOURCES = # startup -libbsp_a_SOURCES += ../../shared/bspclean.c ../../shared/bsplibc.c \ - ../../shared/bsppredriverhook.c ../../shared/bsppost.c \ - ../../shared/bsppretaskinghook.c ../../shared/bspgetworkarea.c \ - startup/bspstart.c ../../shared/bootcard.c ../../shared/sbrk.c \ - ../../shared/gnatinstallhandler.c ../../shared/setvec.c \ - ../../shared/bspreset.c +libbsp_a_SOURCES += ../../shared/bspclean.c +libbsp_a_SOURCES += ../../shared/bsplibc.c +libbsp_a_SOURCES += ../../shared/bsppredriverhook.c +libbsp_a_SOURCES += ../../shared/bsppost.c +libbsp_a_SOURCES += ../../shared/bsppretaskinghook.c +libbsp_a_SOURCES += ../../shared/bspgetworkarea.c +libbsp_a_SOURCES += startup/bspstart.c +libbsp_a_SOURCES += ../../shared/bootcard.c +libbsp_a_SOURCES += ../../shared/sbrk.c +libbsp_a_SOURCES += ../../shared/gnatinstallhandler.c +libbsp_a_SOURCES += ../../shared/setvec.c +libbsp_a_SOURCES += ../../shared/bspreset.c # clock libbsp_a_SOURCES += clock/clockdrv.c libbsp_a_SOURCES += ../../shared/clockdrv_shell.h # console -libbsp_a_SOURCES += ../../shared/console-polled.c console/console-io.c +libbsp_a_SOURCES += ../../shared/console-polled.c +libbsp_a_SOURCES += console/console-io.c # timer libbsp_a_SOURCES += timer/timer.c -libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \ - ../../../libcpu/@RTEMS_CPU@/shared/interrupts.rel \ - ../../../libcpu/@RTEMS_CPU@/tx39/vectorisrs.rel +libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/cache.rel +libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/interrupts.rel +libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/tx39/vectorisrs.rel +libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cache.rel 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 aa7f6fc750..369eebaa46 100644 --- a/c/src/lib/libbsp/mips/rbtx4925/ChangeLog +++ b/c/src/lib/libbsp/mips/rbtx4925/ChangeLog @@ -1,3 +1,7 @@ +2011-12-14 Joel Sherrill + + * Makefile.am: Change to one file per line. Clean up. + 2011-06-19 Ralf Corsépius * Makefile.am: Fix broken path to clockdrv_shell.h. diff --git a/c/src/lib/libbsp/mips/rbtx4925/Makefile.am b/c/src/lib/libbsp/mips/rbtx4925/Makefile.am index e5b1d880fe..e7da5d5833 100644 --- a/c/src/lib/libbsp/mips/rbtx4925/Makefile.am +++ b/c/src/lib/libbsp/mips/rbtx4925/Makefile.am @@ -32,34 +32,35 @@ noinst_LIBRARIES += libbsp.a libbsp_a_SOURCES = # startup -libbsp_a_SOURCES += ../../shared/bspclean.c ../../shared/bsppredriverhook.c \ - ../../shared/bsppretaskinghook.c ../../shared/bspgetworkarea.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 ../shared/startup/idttlb.S \ - ../shared/startup/idtmem.S ../shared/irq/exception.S - +libbsp_a_SOURCES += ../../shared/bspclean.c +libbsp_a_SOURCES += ../../shared/bsppredriverhook.c +libbsp_a_SOURCES += ../../shared/bsppretaskinghook.c +libbsp_a_SOURCES += ../../shared/bspgetworkarea.c +libbsp_a_SOURCES += ../../shared/bsplibc.c +libbsp_a_SOURCES += ../../shared/bsppost.c +libbsp_a_SOURCES += startup/bspstart.c +libbsp_a_SOURCES += ../../shared/bootcard.c +libbsp_a_SOURCES += ../../shared/sbrk.c +libbsp_a_SOURCES += ../../shared/gnatinstallhandler.c +libbsp_a_SOURCES += ../../shared/setvec.c +libbsp_a_SOURCES += startup/inittlb.c +libbsp_a_SOURCES += ../shared/startup/idttlb.S +libbsp_a_SOURCES += ../shared/startup/idtmem.S +libbsp_a_SOURCES += ../shared/irq/exception.S # clock -noinst_PROGRAMS += clock.rel -clock_rel_SOURCES = clock/clockdrv.c -clock_rel_SOURCES += ../../shared/clockdrv_shell.h -clock_rel_CPPFLAGS = $(AM_CPPFLAGS) -clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - +libbsp_a_SOURCES += clock/clockdrv.c +libbsp_a_SOURCES += ../../shared/clockdrv_shell.h # console libbsp_a_SOURCES += console/console-io.c - # liblnk -libbsp_a_SOURCES += ../shared/liblnk/lnklib.S ../shared/liblnk/pmon.S \ - ../shared/liblnk/regs.h - -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 +libbsp_a_SOURCES += ../shared/liblnk/lnklib.S +libbsp_a_SOURCES += ../shared/liblnk/pmon.S +libbsp_a_SOURCES += ../shared/liblnk/regs.h + +libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/cache.rel +libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/interrupts.rel +libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/tx49/timer.rel +libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/tx49/vectorisrs.rel include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/mips/rbtx4938/ChangeLog b/c/src/lib/libbsp/mips/rbtx4938/ChangeLog index 66d319c8e4..e4ccd2a7c9 100644 --- a/c/src/lib/libbsp/mips/rbtx4938/ChangeLog +++ b/c/src/lib/libbsp/mips/rbtx4938/ChangeLog @@ -1,3 +1,7 @@ +2011-12-14 Joel Sherrill + + * Makefile.am: Change to one file per line. Clean up. + 2011-06-19 Ralf Corsépius * Makefile.am: Fix broken path to clockdrv_shell.h. diff --git a/c/src/lib/libbsp/mips/rbtx4938/Makefile.am b/c/src/lib/libbsp/mips/rbtx4938/Makefile.am index bbf3c474d3..e7da5d5833 100644 --- a/c/src/lib/libbsp/mips/rbtx4938/Makefile.am +++ b/c/src/lib/libbsp/mips/rbtx4938/Makefile.am @@ -32,33 +32,35 @@ noinst_LIBRARIES += libbsp.a libbsp_a_SOURCES = # startup -libbsp_a_SOURCES += ../../shared/bspclean.c ../../shared/bsppredriverhook.c \ - ../../shared/bsppretaskinghook.c ../../shared/bspgetworkarea.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 ../shared/startup/idttlb.S \ - ../shared/startup/idtmem.S ../shared/irq/exception.S - +libbsp_a_SOURCES += ../../shared/bspclean.c +libbsp_a_SOURCES += ../../shared/bsppredriverhook.c +libbsp_a_SOURCES += ../../shared/bsppretaskinghook.c +libbsp_a_SOURCES += ../../shared/bspgetworkarea.c +libbsp_a_SOURCES += ../../shared/bsplibc.c +libbsp_a_SOURCES += ../../shared/bsppost.c +libbsp_a_SOURCES += startup/bspstart.c +libbsp_a_SOURCES += ../../shared/bootcard.c +libbsp_a_SOURCES += ../../shared/sbrk.c +libbsp_a_SOURCES += ../../shared/gnatinstallhandler.c +libbsp_a_SOURCES += ../../shared/setvec.c +libbsp_a_SOURCES += startup/inittlb.c +libbsp_a_SOURCES += ../shared/startup/idttlb.S +libbsp_a_SOURCES += ../shared/startup/idtmem.S +libbsp_a_SOURCES += ../shared/irq/exception.S # clock -noinst_PROGRAMS += clock.rel -clock_rel_SOURCES = clock/clockdrv.c -clock_rel_SOURCES += ../../shared/clockdrv_shell.h -clock_rel_CPPFLAGS = $(AM_CPPFLAGS) -clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - +libbsp_a_SOURCES += clock/clockdrv.c +libbsp_a_SOURCES += ../../shared/clockdrv_shell.h # console libbsp_a_SOURCES += console/console-io.c # liblnk -libbsp_a_SOURCES += ../shared/liblnk/lnklib.S ../shared/liblnk/pmon.S \ - ../shared/liblnk/regs.h - -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 +libbsp_a_SOURCES += ../shared/liblnk/lnklib.S +libbsp_a_SOURCES += ../shared/liblnk/pmon.S +libbsp_a_SOURCES += ../shared/liblnk/regs.h + +libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/cache.rel +libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/interrupts.rel +libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/tx49/timer.rel +libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/tx49/vectorisrs.rel include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am -- cgit v1.2.3