From 5133bd66b7719450ad360d0e2a55a6d863a51818 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Sat, 12 Feb 2005 03:31:07 +0000 Subject: 2005-02-11 Ralf Corsepius * Makefile.am: Merge-in wrapup/Makefile.am. * wrapup/Makefile.am: Remove. * configure.ac: Reflect changes above. --- c/src/lib/libbsp/powerpc/dmv177/ChangeLog | 6 +++++ c/src/lib/libbsp/powerpc/dmv177/Makefile.am | 18 +++++++++++---- c/src/lib/libbsp/powerpc/dmv177/configure.ac | 4 +--- c/src/lib/libbsp/powerpc/dmv177/wrapup/Makefile.am | 19 --------------- c/src/lib/libbsp/powerpc/gen405/ChangeLog | 6 +++++ c/src/lib/libbsp/powerpc/gen405/Makefile.am | 17 ++++++++++---- c/src/lib/libbsp/powerpc/gen405/configure.ac | 3 +-- c/src/lib/libbsp/powerpc/gen405/wrapup/Makefile.am | 21 ----------------- c/src/lib/libbsp/powerpc/helas403/ChangeLog | 6 +++++ c/src/lib/libbsp/powerpc/helas403/Makefile.am | 16 +++++++++---- c/src/lib/libbsp/powerpc/helas403/configure.ac | 3 +-- .../lib/libbsp/powerpc/helas403/wrapup/Makefile.am | 20 ---------------- c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog | 6 +++++ c/src/lib/libbsp/powerpc/mbx8xx/Makefile.am | 23 ++++++++++++++---- c/src/lib/libbsp/powerpc/mbx8xx/configure.ac | 3 +-- c/src/lib/libbsp/powerpc/mbx8xx/wrapup/Makefile.am | 27 ---------------------- .../lib/libbsp/powerpc/motorola_powerpc/ChangeLog | 6 +++++ .../libbsp/powerpc/motorola_powerpc/Makefile.am | 14 ++++++++++- .../libbsp/powerpc/motorola_powerpc/configure.ac | 3 +-- .../powerpc/motorola_powerpc/wrapup/Makefile.am | 21 ----------------- c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog | 6 +++++ c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am | 20 ++++++++++++---- c/src/lib/libbsp/powerpc/mpc8260ads/configure.ac | 3 +-- .../libbsp/powerpc/mpc8260ads/wrapup/Makefile.am | 25 -------------------- c/src/lib/libbsp/powerpc/mvme5500/ChangeLog | 6 +++++ c/src/lib/libbsp/powerpc/mvme5500/Makefile.am | 21 +++++++++++++---- c/src/lib/libbsp/powerpc/mvme5500/configure.ac | 3 +-- .../lib/libbsp/powerpc/mvme5500/wrapup/Makefile.am | 25 -------------------- c/src/lib/libbsp/powerpc/ppcn_60x/ChangeLog | 6 +++++ c/src/lib/libbsp/powerpc/ppcn_60x/Makefile.am | 13 +++++++---- c/src/lib/libbsp/powerpc/ppcn_60x/configure.ac | 3 +-- .../lib/libbsp/powerpc/ppcn_60x/wrapup/Makefile.am | 17 -------------- c/src/lib/libbsp/powerpc/psim/ChangeLog | 6 +++++ c/src/lib/libbsp/powerpc/psim/Makefile.am | 17 +++++++++++++- c/src/lib/libbsp/powerpc/psim/configure.ac | 3 +-- c/src/lib/libbsp/powerpc/psim/wrapup/Makefile.am | 25 -------------------- c/src/lib/libbsp/powerpc/score603e/ChangeLog | 6 +++++ c/src/lib/libbsp/powerpc/score603e/Makefile.am | 10 ++++---- c/src/lib/libbsp/powerpc/score603e/configure.ac | 3 +-- .../libbsp/powerpc/score603e/wrapup/Makefile.am | 14 ----------- c/src/lib/libbsp/powerpc/ss555/ChangeLog | 6 +++++ c/src/lib/libbsp/powerpc/ss555/Makefile.am | 16 +++++++++---- c/src/lib/libbsp/powerpc/ss555/configure.ac | 3 +-- c/src/lib/libbsp/powerpc/ss555/wrapup/Makefile.am | 23 ------------------ 44 files changed, 223 insertions(+), 299 deletions(-) delete mode 100644 c/src/lib/libbsp/powerpc/dmv177/wrapup/Makefile.am delete mode 100644 c/src/lib/libbsp/powerpc/gen405/wrapup/Makefile.am delete mode 100644 c/src/lib/libbsp/powerpc/helas403/wrapup/Makefile.am delete mode 100644 c/src/lib/libbsp/powerpc/mbx8xx/wrapup/Makefile.am delete mode 100644 c/src/lib/libbsp/powerpc/motorola_powerpc/wrapup/Makefile.am delete mode 100644 c/src/lib/libbsp/powerpc/mpc8260ads/wrapup/Makefile.am delete mode 100644 c/src/lib/libbsp/powerpc/mvme5500/wrapup/Makefile.am delete mode 100644 c/src/lib/libbsp/powerpc/ppcn_60x/wrapup/Makefile.am delete mode 100644 c/src/lib/libbsp/powerpc/psim/wrapup/Makefile.am delete mode 100644 c/src/lib/libbsp/powerpc/score603e/wrapup/Makefile.am delete mode 100644 c/src/lib/libbsp/powerpc/ss555/wrapup/Makefile.am (limited to 'c') diff --git a/c/src/lib/libbsp/powerpc/dmv177/ChangeLog b/c/src/lib/libbsp/powerpc/dmv177/ChangeLog index 455a105490..6a38be27ac 100644 --- a/c/src/lib/libbsp/powerpc/dmv177/ChangeLog +++ b/c/src/lib/libbsp/powerpc/dmv177/ChangeLog @@ -1,3 +1,9 @@ +2005-02-11 Ralf Corsepius + + * Makefile.am: Merge-in wrapup/Makefile.am. + * wrapup/Makefile.am: Remove. + * configure.ac: Reflect changes above. + 2005-01-22 Ralf Corsepius * tod/todcfg.c: size_t RTC_Count. diff --git a/c/src/lib/libbsp/powerpc/dmv177/Makefile.am b/c/src/lib/libbsp/powerpc/dmv177/Makefile.am index 0acbd0e812..e179e0f1c4 100644 --- a/c/src/lib/libbsp/powerpc/dmv177/Makefile.am +++ b/c/src/lib/libbsp/powerpc/dmv177/Makefile.am @@ -4,10 +4,6 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal -# wrapup is the one that actually builds and installs the library -# from the individual .rel files built in other directories -SUBDIRS = . @exceptions@ wrapup - include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am @@ -74,6 +70,18 @@ sonic_rel_CPPFLAGS = $(AM_CPPFLAGS) $(sonic_CPPFLAGS) sonic_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) endif +noinst_LIBRARIES = libbsp.a +CLEANFILES = libbsp.a +libbsp_a_SOURCES = + +libbsp_a_LIBADD = startup.rel clock.rel console.rel scv64.rel timer.rel \ + tod.rel +if HAS_NETWORKING +libbsp_a_LIBADD += sonic.rel +endif +libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \ + ../../../libcpu/@RTEMS_CPU@/shared/cache.rel + all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) EXTRA_DIST += QUIRKS README.net STATUS cable.doc times @@ -128,7 +136,7 @@ $(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds -CLEANFILES = $(PREINSTALL_FILES) +CLEANFILES += $(PREINSTALL_FILES) DISTCLEANFILES += $(PREINSTALL_DIRS) CLEANFILES += $(TMPINSTALL_FILES) diff --git a/c/src/lib/libbsp/powerpc/dmv177/configure.ac b/c/src/lib/libbsp/powerpc/dmv177/configure.ac index 61d3192355..d26782decb 100644 --- a/c/src/lib/libbsp/powerpc/dmv177/configure.ac +++ b/c/src/lib/libbsp/powerpc/dmv177/configure.ac @@ -47,9 +47,7 @@ RTEMS_BSPOPTS_HELP([DMV177_USE_INSTRUCTION_CACHE], The BSP actually contains the call that enables this.]) # Explicitly list all Makefiles here -AC_CONFIG_FILES([Makefile -wrapup/Makefile -]) +AC_CONFIG_FILES([Makefile]) RTEMS_PPC_EXCEPTIONS([old]) diff --git a/c/src/lib/libbsp/powerpc/dmv177/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/dmv177/wrapup/Makefile.am deleted file mode 100644 index d4f31edf38..0000000000 --- a/c/src/lib/libbsp/powerpc/dmv177/wrapup/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -## -## $Id$ -## - -include $(top_srcdir)/../../../../automake/compile.am - -noinst_LIBRARIES = ../libbsp.a -CLEANFILES = ../libbsp.a -___libbsp_a_SOURCES = - -___libbsp_a_LIBADD = ../startup.rel ../clock.rel ../console.rel ../scv64.rel \ - ../timer.rel ../tod.rel -if HAS_NETWORKING -___libbsp_a_LIBADD += ../sonic.rel -endif -___libbsp_a_LIBADD += ../@exceptions@/rtems-cpu.rel \ - ../../../../libcpu/@RTEMS_CPU@/shared/cache.rel - -include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/gen405/ChangeLog b/c/src/lib/libbsp/powerpc/gen405/ChangeLog index 6c4fa7a20a..d58c980a1f 100644 --- a/c/src/lib/libbsp/powerpc/gen405/ChangeLog +++ b/c/src/lib/libbsp/powerpc/gen405/ChangeLog @@ -1,3 +1,9 @@ +2005-02-11 Ralf Corsepius + + * Makefile.am: Merge-in wrapup/Makefile.am. + * wrapup/Makefile.am: Remove. + * configure.ac: Reflect changes above. + 2005-02-10 Ralf Corsepius * dlentry/dlentry.S: Remove PPC_ABI_POWEROPEN. diff --git a/c/src/lib/libbsp/powerpc/gen405/Makefile.am b/c/src/lib/libbsp/powerpc/gen405/Makefile.am index 6b13d1cf31..aacd99312f 100644 --- a/c/src/lib/libbsp/powerpc/gen405/Makefile.am +++ b/c/src/lib/libbsp/powerpc/gen405/Makefile.am @@ -4,10 +4,6 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal -# wrapup is the one that actually builds and installs the library -# from the individual .rel files built in other directories -SUBDIRS = . @exceptions@ wrapup - include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am @@ -38,6 +34,19 @@ dlentry_rel_SOURCES = dlentry/dlentry.S dlentry_rel_CPPFLAGS = $(AM_CPPFLAGS) dlentry_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) +noinst_LIBRARIES = libbsp.a +libbsp_a_SOURCES = + +libbsp_a_LIBADD = startup.rel dlentry.rel + +libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \ + ../../../libcpu/@RTEMS_CPU@/ppc403/clock.rel \ + ../../../libcpu/@RTEMS_CPU@/ppc403/timer.rel \ + ../../../libcpu/@RTEMS_CPU@/ppc403/console.rel \ + ../../../libcpu/@RTEMS_CPU@/ppc403/tty_drv.rel \ + ../../../libcpu/@RTEMS_CPU@/ppc403/vectors.rel \ + ../../../libcpu/@RTEMS_CPU@/ppc403/ictrl.rel + all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) EXTRA_DIST = times diff --git a/c/src/lib/libbsp/powerpc/gen405/configure.ac b/c/src/lib/libbsp/powerpc/gen405/configure.ac index 5cb9cea2b0..b7a8a2b054 100644 --- a/c/src/lib/libbsp/powerpc/gen405/configure.ac +++ b/c/src/lib/libbsp/powerpc/gen405/configure.ac @@ -32,8 +32,7 @@ RTEMS_BSPOPTS_HELP([PPC_VECTOR_FILE_BASE], NOTE: Vectors are actually at 0xFFF00000 but file starts at offset.]) # Explicitly list all Makefiles here -AC_CONFIG_FILES([Makefile -wrapup/Makefile]) +AC_CONFIG_FILES([Makefile]) RTEMS_PPC_EXCEPTIONS([old]) diff --git a/c/src/lib/libbsp/powerpc/gen405/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/gen405/wrapup/Makefile.am deleted file mode 100644 index 664c5a28ad..0000000000 --- a/c/src/lib/libbsp/powerpc/gen405/wrapup/Makefile.am +++ /dev/null @@ -1,21 +0,0 @@ -## -## $Id$ -## - -include $(top_srcdir)/../../../../automake/compile.am - -noinst_LIBRARIES = ../libbsp.a -CLEANFILES = ../libbsp.a -___libbsp_a_SOURCES = - -___libbsp_a_LIBADD = ../startup.rel ../dlentry.rel - -___libbsp_a_LIBADD += ../@exceptions@/rtems-cpu.rel \ - ../../../../libcpu/@RTEMS_CPU@/ppc403/clock.rel \ - ../../../../libcpu/@RTEMS_CPU@/ppc403/timer.rel \ - ../../../../libcpu/@RTEMS_CPU@/ppc403/console.rel \ - ../../../../libcpu/@RTEMS_CPU@/ppc403/tty_drv.rel \ - ../../../../libcpu/@RTEMS_CPU@/ppc403/vectors.rel \ - ../../../../libcpu/@RTEMS_CPU@/ppc403/ictrl.rel - -include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/helas403/ChangeLog b/c/src/lib/libbsp/powerpc/helas403/ChangeLog index c473570dbc..c86e6c818d 100644 --- a/c/src/lib/libbsp/powerpc/helas403/ChangeLog +++ b/c/src/lib/libbsp/powerpc/helas403/ChangeLog @@ -1,3 +1,9 @@ +2005-02-11 Ralf Corsepius + + * Makefile.am: Merge-in wrapup/Makefile.am. + * wrapup/Makefile.am: Remove. + * configure.ac: Reflect changes above. + 2005-02-10 Ralf Corsepius * dlentry/dlentry.S, flashentry/flashentry.S: diff --git a/c/src/lib/libbsp/powerpc/helas403/Makefile.am b/c/src/lib/libbsp/powerpc/helas403/Makefile.am index cc51a252fc..f655a2e351 100644 --- a/c/src/lib/libbsp/powerpc/helas403/Makefile.am +++ b/c/src/lib/libbsp/powerpc/helas403/Makefile.am @@ -4,10 +4,6 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal -# wrapup is the one that actually builds and installs the library -# from the individual .rel files built in other directories -SUBDIRS = . @exceptions@ wrapup - include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am @@ -45,6 +41,18 @@ startup_rel_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \ startup_rel_CPPFLAGS = $(AM_CPPFLAGS) startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) +noinst_LIBRARIES = libbsp.a +libbsp_a_SOURCES = + +libbsp_a_LIBADD = startup.rel dlentry.rel flashentry.rel + +libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \ + ../../../libcpu/@RTEMS_CPU@/ppc403/clock.rel \ + ../../../libcpu/@RTEMS_CPU@/ppc403/timer.rel \ + ../../../libcpu/@RTEMS_CPU@/ppc403/console.rel \ + ../../../libcpu/@RTEMS_CPU@/ppc403/vectors.rel \ + ../../../libcpu/@RTEMS_CPU@/ppc403/ictrl.rel + all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) EXTRA_DIST = times diff --git a/c/src/lib/libbsp/powerpc/helas403/configure.ac b/c/src/lib/libbsp/powerpc/helas403/configure.ac index 2c52325951..9c20c40799 100644 --- a/c/src/lib/libbsp/powerpc/helas403/configure.ac +++ b/c/src/lib/libbsp/powerpc/helas403/configure.ac @@ -31,8 +31,7 @@ RTEMS_BSPOPTS_HELP([PPC_VECTOR_FILE_BASE], NOTE: Vectors are actually at 0xFFF00000 but file starts at offset.]) # Explicitly list all Makefiles here -AC_CONFIG_FILES([Makefile -wrapup/Makefile]) +AC_CONFIG_FILES([Makefile]) RTEMS_PPC_EXCEPTIONS([old]) diff --git a/c/src/lib/libbsp/powerpc/helas403/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/helas403/wrapup/Makefile.am deleted file mode 100644 index 47291b9199..0000000000 --- a/c/src/lib/libbsp/powerpc/helas403/wrapup/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -## -## $Id$ -## - -include $(top_srcdir)/../../../../automake/compile.am - -noinst_LIBRARIES = ../libbsp.a -CLEANFILES = ../libbsp.a -___libbsp_a_SOURCES = - -___libbsp_a_LIBADD = ../startup.rel ../dlentry.rel ../flashentry.rel - -___libbsp_a_LIBADD += ../@exceptions@/rtems-cpu.rel \ - ../../../../libcpu/@RTEMS_CPU@/ppc403/clock.rel \ - ../../../../libcpu/@RTEMS_CPU@/ppc403/timer.rel \ - ../../../../libcpu/@RTEMS_CPU@/ppc403/console.rel \ - ../../../../libcpu/@RTEMS_CPU@/ppc403/vectors.rel \ - ../../../../libcpu/@RTEMS_CPU@/ppc403/ictrl.rel - -include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog b/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog index a6625d1f57..e88a99db22 100644 --- a/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog +++ b/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog @@ -1,3 +1,9 @@ +2005-02-11 Ralf Corsepius + + * Makefile.am: Merge-in wrapup/Makefile.am. + * wrapup/Makefile.am: Remove. + * configure.ac: Reflect changes above. + 2005-01-20 Joel Sherrill * include/commproc.h: The variable cpmp was not used anywhere but diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/Makefile.am b/c/src/lib/libbsp/powerpc/mbx8xx/Makefile.am index acc017de5e..f77067296a 100644 --- a/c/src/lib/libbsp/powerpc/mbx8xx/Makefile.am +++ b/c/src/lib/libbsp/powerpc/mbx8xx/Makefile.am @@ -4,10 +4,6 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal -# wrapup is the one that actually builds and installs the library -# from the individual .rel files built in other directories -SUBDIRS = . @exceptions@ wrapup - include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am @@ -73,6 +69,25 @@ network_rel_CPPFLAGS = $(AM_CPPFLAGS) $(network_CPPFLAGS) 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_LIBADD += ../../../libcpu/powerpc/shared/cpuIdent.rel \ + ../../../libcpu/powerpc/shared/cache.rel \ + ../../../libcpu/powerpc/@exceptions@/rtems-cpu.rel \ + ../../../libcpu/powerpc/mpc8xx/clock.rel \ + ../../../libcpu/powerpc/mpc8xx/console-generic.rel \ + ../../../libcpu/powerpc/mpc8xx/cpm.rel \ + ../../../libcpu/powerpc/mpc8xx/mmu.rel \ + ../../../libcpu/powerpc/mpc8xx/timer.rel \ + ../../../libcpu/powerpc/mpc8xx/exceptions.rel + all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) PREINSTALL_DIRS = diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/configure.ac b/c/src/lib/libbsp/powerpc/mbx8xx/configure.ac index b5127369f6..1a4b47f0aa 100644 --- a/c/src/lib/libbsp/powerpc/mbx8xx/configure.ac +++ b/c/src/lib/libbsp/powerpc/mbx8xx/configure.ac @@ -115,8 +115,7 @@ RTEMS_BSPOPTS_HELP([DISPATCH_HANDLER_STAT], [used by irq/irq.c]) # Explicitly list a Makefile here -AC_CONFIG_FILES([Makefile -wrapup/Makefile]) +AC_CONFIG_FILES([Makefile]) RTEMS_PPC_EXCEPTIONS([new]) diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/mbx8xx/wrapup/Makefile.am deleted file mode 100644 index 39738ec8a4..0000000000 --- a/c/src/lib/libbsp/powerpc/mbx8xx/wrapup/Makefile.am +++ /dev/null @@ -1,27 +0,0 @@ -## -## $Id$ -## - -include $(top_srcdir)/../../../../automake/compile.am - -noinst_LIBRARIES = ../libbsp.a -CLEANFILES = ../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_LIBADD += ../../../../libcpu/powerpc/shared/cpuIdent.rel \ - ../../../../libcpu/powerpc/shared/cache.rel \ - ../@exceptions@/rtems-cpu.rel \ - ../../../../libcpu/powerpc/mpc8xx/clock.rel \ - ../../../../libcpu/powerpc/mpc8xx/console-generic.rel \ - ../../../../libcpu/powerpc/mpc8xx/cpm.rel \ - ../../../../libcpu/powerpc/mpc8xx/mmu.rel \ - ../../../../libcpu/powerpc/mpc8xx/timer.rel \ - ../../../../libcpu/powerpc/mpc8xx/exceptions.rel - -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 8cf7d22c16..640f5a66ae 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog @@ -1,3 +1,9 @@ +2005-02-11 Ralf Corsepius + + * Makefile.am: Merge-in wrapup/Makefile.am. + * wrapup/Makefile.am: Remove. + * configure.ac: Reflect changes above. + 2005-01-07 Ralf Corsepius * Makefile.am: Eliminate CFLAGS_OPTIMIZE_V. diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am index 843992b089..6775dafff7 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am @@ -6,7 +6,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal # wrapup is the one that actually builds and installs the library # from the individual .rel files built in other directories -SUBDIRS = . bootloader @exceptions@ wrapup +SUBDIRS = . bootloader include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am @@ -141,6 +141,18 @@ vme_rel_SOURCES = ../../shared/vmeUniverse/vmeUniverse.c \ 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 vectors.rel motorola.rel tod.rel vme.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 \ + ../../../libcpu/@RTEMS_CPU@/mpc6xx/exceptions.rel \ + ../../../libcpu/@RTEMS_CPU@/mpc6xx/mmu.rel \ + ../../../libcpu/@RTEMS_CPU@/mpc6xx/timer.rel + all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) EXTRA_DIST += BOOTING README.mtx603e README.MVME2100 README.MVME2300 \ diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/configure.ac b/c/src/lib/libbsp/powerpc/motorola_powerpc/configure.ac index 115828ebe4..61dbb32d38 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/configure.ac +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/configure.ac @@ -48,8 +48,7 @@ AC_DEFINE_UNQUOTED([USE_ENHANCED_INTR_API],[1], # Explicitly list all Makefiles here AC_CONFIG_FILES([Makefile -bootloader/Makefile -wrapup/Makefile]) +bootloader/Makefile]) RTEMS_PPC_EXCEPTIONS([new]) diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/wrapup/Makefile.am deleted file mode 100644 index b4590add92..0000000000 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/wrapup/Makefile.am +++ /dev/null @@ -1,21 +0,0 @@ -## -## $Id$ -## - -include $(top_srcdir)/../../../../automake/compile.am - -noinst_LIBRARIES = ../libbsp.a -CLEANFILES = ../libbsp.a -___libbsp_a_SOURCES = -___libbsp_a_LIBADD = ../startup.rel ../pclock.rel ../console.rel ../irq.rel \ - ../openpic.rel ../pci.rel ../residual.rel ../vectors.rel ../motorola.rel \ - ../tod.rel ../vme.rel -___libbsp_a_LIBADD += ../../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \ - ../../../../libcpu/@RTEMS_CPU@/shared/stack.rel \ - ../@exceptions@/rtems-cpu.rel \ - ../../../../libcpu/$(RTEMS_CPU)/mpc6xx/clock.rel \ - ../../../../libcpu/$(RTEMS_CPU)/mpc6xx/exceptions.rel \ - ../../../../libcpu/$(RTEMS_CPU)/mpc6xx/mmu.rel \ - ../../../../libcpu/$(RTEMS_CPU)/mpc6xx/timer.rel - -include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog b/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog index badeac768e..8520629bf5 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog @@ -1,3 +1,9 @@ +2005-02-11 Ralf Corsepius + + * Makefile.am: Merge-in wrapup/Makefile.am. + * wrapup/Makefile.am: Remove. + * configure.ac: Reflect changes above. + 2005-01-07 Ralf Corsepius * Makefile.am: Eliminate CFLAGS_OPTIMIZE_V. diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am b/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am index 018e5e6925..8cf012b6da 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am @@ -4,10 +4,6 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal -# wrapup is the one that actually builds and installs the library -# from the individual .rel files built in other directories -SUBDIRS = . @exceptions@ wrapup - include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am @@ -73,6 +69,22 @@ network_rel_CPPFLAGS = $(AM_CPPFLAGS) $(network_CPPFLAGS) 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 \ + ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \ + ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \ + ../../../libcpu/@RTEMS_CPU@/mpc8260/clock.rel \ + ../../../libcpu/@RTEMS_CPU@/mpc8260/console-generic.rel \ + ../../../libcpu/@RTEMS_CPU@/mpc8260/cpm.rel \ + ../../../libcpu/@RTEMS_CPU@/mpc8260/mmu.rel \ + ../../../libcpu/@RTEMS_CPU@/mpc8260/timer.rel \ + ../../../libcpu/@RTEMS_CPU@/mpc8260/exceptions.rel + all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) EXTRA_DIST += times diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/configure.ac b/c/src/lib/libbsp/powerpc/mpc8260ads/configure.ac index 4e40133b50..5d1b4e0595 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/configure.ac +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/configure.ac @@ -68,8 +68,7 @@ RTEMS_CHECK_NETWORKING AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes") # Explicitly list a Makefile here -AC_CONFIG_FILES([Makefile -wrapup/Makefile]) +AC_CONFIG_FILES([Makefile]) RTEMS_PPC_EXCEPTIONS([new]) diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/mpc8260ads/wrapup/Makefile.am deleted file mode 100644 index 3036e28e4a..0000000000 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/wrapup/Makefile.am +++ /dev/null @@ -1,25 +0,0 @@ -## -## $Id$ -## - -include $(top_srcdir)/../../../../automake/compile.am - -noinst_LIBRARIES = ../libbsp.a -CLEANFILES = ../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/powerpc/shared/cpuIdent.rel \ - ../../../../libcpu/powerpc/shared/cache.rel \ - ../@exceptions@/rtems-cpu.rel \ - ../../../../libcpu/powerpc/mpc8260/clock.rel \ - ../../../../libcpu/powerpc/mpc8260/console-generic.rel \ - ../../../../libcpu/powerpc/mpc8260/cpm.rel \ - ../../../../libcpu/powerpc/mpc8260/mmu.rel \ - ../../../../libcpu/powerpc/mpc8260/timer.rel \ - ../../../../libcpu/powerpc/mpc8260/exceptions.rel - -include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog b/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog index 92ec99de8c..0a4b0c9d55 100644 --- a/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog +++ b/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog @@ -1,3 +1,9 @@ +2005-02-11 Ralf Corsepius + + * Makefile.am: Merge-in wrapup/Makefile.am. + * wrapup/Makefile.am: Remove. + * configure.ac: Reflect changes above. + 2005-01-26 Joel Sherrill * irq/irq.c, startup/bspstart.c: Now compiles with gcc 4.x. diff --git a/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am b/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am index dd40f1e5fd..04383df66b 100644 --- a/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am +++ b/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am @@ -4,10 +4,6 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal -# wrapup is the one that actually builds and installs the library -# from the individual .rel files built in other directories -SUBDIRS = . @exceptions@ wrapup - include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am @@ -131,6 +127,23 @@ 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 \ + ../../../libcpu/@RTEMS_CPU@/shared/stack.rel \ + ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \ + ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \ + ../../../libcpu/@RTEMS_CPU@/mpc6xx/clock.rel \ + ../../../libcpu/@RTEMS_CPU@/mpc6xx/exceptions.rel \ + ../../../libcpu/@RTEMS_CPU@/mpc6xx/mmu.rel \ + ../../../libcpu/@RTEMS_CPU@/mpc6xx/timer.rel + all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) ### diff --git a/c/src/lib/libbsp/powerpc/mvme5500/configure.ac b/c/src/lib/libbsp/powerpc/mvme5500/configure.ac index aad105895f..414a9182f1 100644 --- a/c/src/lib/libbsp/powerpc/mvme5500/configure.ac +++ b/c/src/lib/libbsp/powerpc/mvme5500/configure.ac @@ -33,8 +33,7 @@ RTEMS_BSPOPTS_HELP([PPC_USE_DATA_CACHE], # Explicitly list all Makefiles here -AC_CONFIG_FILES([Makefile -wrapup/Makefile]) +AC_CONFIG_FILES([Makefile]) RTEMS_PPC_EXCEPTIONS([new]) diff --git a/c/src/lib/libbsp/powerpc/mvme5500/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/mvme5500/wrapup/Makefile.am deleted file mode 100644 index 0008a7fe6c..0000000000 --- a/c/src/lib/libbsp/powerpc/mvme5500/wrapup/Makefile.am +++ /dev/null @@ -1,25 +0,0 @@ -## -## Makefile.am,v 1.12.2.1 2003/02/20 21:57:21 joel Exp -## - -include $(top_srcdir)/../../../../automake/compile.am - -noinst_LIBRARIES = ../libbsp.a -CLEANFILES = ../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 \ - ../../../../libcpu/@RTEMS_CPU@/shared/stack.rel \ - ../../../../libcpu/@RTEMS_CPU@/shared/cache.rel \ - ../@exceptions@/rtems-cpu.rel \ - ../../../../libcpu/$(RTEMS_CPU)/mpc6xx/clock.rel \ - ../../../../libcpu/$(RTEMS_CPU)/mpc6xx/exceptions.rel \ - ../../../../libcpu/$(RTEMS_CPU)/mpc6xx/mmu.rel \ - ../../../../libcpu/$(RTEMS_CPU)/mpc6xx/timer.rel - -include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/ChangeLog b/c/src/lib/libbsp/powerpc/ppcn_60x/ChangeLog index 7fe30fa3ad..1ab7e80de2 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/ChangeLog +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/ChangeLog @@ -1,3 +1,9 @@ +2005-02-11 Ralf Corsepius + + * Makefile.am: Merge-in wrapup/Makefile.am. + * wrapup/Makefile.am: Remove. + * configure.ac: Reflect changes above. + 2005-02-10 Ralf Corsepius * vectors/vectors.S: Remove PPC_ABI_POWEROPEN. diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/Makefile.am b/c/src/lib/libbsp/powerpc/ppcn_60x/Makefile.am index 9af9eefa68..1c4f9c4b3c 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/Makefile.am +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/Makefile.am @@ -4,10 +4,6 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal -# wrapup is the one that actually builds and installs the library -# from the individual .rel files built in other directories -SUBDIRS = . @exceptions@ wrapup - include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am @@ -95,6 +91,15 @@ 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 \ + nvram.rel universe.rel pci.rel vectors.rel +if HAS_NETWORKING +libbsp_a_LIBADD += network.rel +endif +libbsp_a_LIBADD += ../../../@RTEMS_CPU@/@exceptions@/rtems-cpu.rel + all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) EXTRA_DIST += STATUS diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/configure.ac b/c/src/lib/libbsp/powerpc/ppcn_60x/configure.ac index fc4c432c47..f61f79d428 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/configure.ac +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/configure.ac @@ -60,8 +60,7 @@ RTEMS_BSPOPTS_HELP([PPC_VECTOR_FILE_BASE], NOTE: Vectors are actually at 0xFFF00000 but file starts at offset.]) # Explicitly list all Makefiles here -AC_CONFIG_FILES([Makefile -wrapup/Makefile]) +AC_CONFIG_FILES([Makefile]) RTEMS_PPC_EXCEPTIONS([old]) diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/ppcn_60x/wrapup/Makefile.am deleted file mode 100644 index c513644a7f..0000000000 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/wrapup/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ -## -## $Id$ -## - -include $(top_srcdir)/../../../../automake/compile.am - -noinst_LIBRARIES = ../libbsp.a -CLEANFILES = ../libbsp.a -___libbsp_a_SOURCES = -___libbsp_a_LIBADD = ../startup.rel ../clock.rel ../console.rel ../timer.rel \ - ../tod.rel ../nvram.rel ../universe.rel ../pci.rel ../vectors.rel -if HAS_NETWORKING -___libbsp_a_LIBADD += ../network.rel -endif -___libbsp_a_LIBADD += ../@exceptions@/rtems-cpu.rel - -include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/psim/ChangeLog b/c/src/lib/libbsp/powerpc/psim/ChangeLog index ad1d8cf187..e9475f7c9c 100644 --- a/c/src/lib/libbsp/powerpc/psim/ChangeLog +++ b/c/src/lib/libbsp/powerpc/psim/ChangeLog @@ -1,3 +1,9 @@ +2005-02-11 Ralf Corsepius + + * Makefile.am: Merge-in wrapup/Makefile.am. + * wrapup/Makefile.am: Remove. + * configure.ac: Reflect changes above. + 2005-01-07 Ralf Corsepius * Makefile.am: Eliminate CFLAGS_OPTIMIZE_V. diff --git a/c/src/lib/libbsp/powerpc/psim/Makefile.am b/c/src/lib/libbsp/powerpc/psim/Makefile.am index 740e3400be..4b7ec4e4f7 100644 --- a/c/src/lib/libbsp/powerpc/psim/Makefile.am +++ b/c/src/lib/libbsp/powerpc/psim/Makefile.am @@ -6,7 +6,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal # wrapup is the one that actually builds and installs the library # from the individual .rel files built in other directories -SUBDIRS = . @exceptions@ wrapup tools +SUBDIRS = . tools include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am @@ -83,6 +83,21 @@ shmsupp_rel_CPPFLAGS = $(AM_CPPFLAGS) shmsupp_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) endif +noinst_LIBRARIES = libbsp.a +libbsp_a_SOURCES = +libbsp_a_LIBADD = startup.rel pclock.rel console.rel irq.rel vectors.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 \ + ../../../libcpu/@RTEMS_CPU@/mpc6xx/exceptions.rel \ + ../../../libcpu/@RTEMS_CPU@/mpc6xx/mmu.rel \ + ../../../libcpu/@RTEMS_CPU@/mpc6xx/timer.rel + +if HAS_MP +libbsp_a_LIBADD += shmsupp.rel +endif + all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) PREINSTALL_DIRS = diff --git a/c/src/lib/libbsp/powerpc/psim/configure.ac b/c/src/lib/libbsp/powerpc/psim/configure.ac index e7a690fcc6..534e4b2447 100644 --- a/c/src/lib/libbsp/powerpc/psim/configure.ac +++ b/c/src/lib/libbsp/powerpc/psim/configure.ac @@ -30,8 +30,7 @@ RTEMS_BSPOPTS_HELP([PPC_VECTOR_FILE_BASE], NOTE: Vectors are actually at 0xFFF00000 but file starts at offset.]) # Explicitly list all Makefiles here -AC_CONFIG_FILES([Makefile -wrapup/Makefile]) +AC_CONFIG_FILES([Makefile]) RTEMS_PPC_EXCEPTIONS([new]) diff --git a/c/src/lib/libbsp/powerpc/psim/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/psim/wrapup/Makefile.am deleted file mode 100644 index b3180e94a2..0000000000 --- a/c/src/lib/libbsp/powerpc/psim/wrapup/Makefile.am +++ /dev/null @@ -1,25 +0,0 @@ -## -## $Id$ -## - -include $(top_srcdir)/../../../../automake/compile.am - -noinst_LIBRARIES = ../libbsp.a -CLEANFILES = ../libbsp.a -___libbsp_a_SOURCES = -___libbsp_a_LIBADD = ../startup.rel ../pclock.rel ../console.rel ../irq.rel \ - ../vectors.rel -___libbsp_a_LIBADD += ../../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \ - ../../../../libcpu/@RTEMS_CPU@/shared/stack.rel \ - ../@exceptions@/rtems-cpu.rel \ - ../../../../libcpu/$(RTEMS_CPU)/mpc6xx/clock.rel \ - ../../../../libcpu/$(RTEMS_CPU)/mpc6xx/exceptions.rel \ - ../../../../libcpu/$(RTEMS_CPU)/mpc6xx/mmu.rel \ - ../../../../libcpu/$(RTEMS_CPU)/mpc6xx/timer.rel - -if HAS_MP -___libbsp_a_LIBADD += ../shmsupp.rel -endif -___libbsp_a_LIBADD += ../@exceptions@/rtems-cpu.rel - -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 7d037932c2..3028bdf161 100644 --- a/c/src/lib/libbsp/powerpc/score603e/ChangeLog +++ b/c/src/lib/libbsp/powerpc/score603e/ChangeLog @@ -1,3 +1,9 @@ +2005-02-11 Ralf Corsepius + + * Makefile.am: Merge-in wrapup/Makefile.am. + * wrapup/Makefile.am: Remove. + * configure.ac: Reflect changes above. + 2005-02-09 Ralf Corsepius * vectors/vectors.S: Remove XCOFF support. diff --git a/c/src/lib/libbsp/powerpc/score603e/Makefile.am b/c/src/lib/libbsp/powerpc/score603e/Makefile.am index 9a53dcd99c..278727c063 100644 --- a/c/src/lib/libbsp/powerpc/score603e/Makefile.am +++ b/c/src/lib/libbsp/powerpc/score603e/Makefile.am @@ -4,10 +4,6 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal -# wrapup is the one that actually builds and installs the library -# from the individual .rel files built in other directories -SUBDIRS = . @exceptions@ wrapup - include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am @@ -76,6 +72,12 @@ vectors_rel_SOURCES = vectors/vectors.S vectors_rel_CPPFLAGS = $(AM_CPPFLAGS) vectors_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) +noinst_LIBRARIES = libbsp.a +libbsp_a_SOURCES = +libbsp_a_LIBADD = startup.rel clock.rel console.rel timer.rel tod.rel \ + vectors.rel PCI_bus.rel +libbsp_a_LIBADD += ../../../@RTEMS_CPU@/@exceptions@/rtems-cpu.rel + all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) PREINSTALL_DIRS = diff --git a/c/src/lib/libbsp/powerpc/score603e/configure.ac b/c/src/lib/libbsp/powerpc/score603e/configure.ac index ee759c1869..325bf04097 100644 --- a/c/src/lib/libbsp/powerpc/score603e/configure.ac +++ b/c/src/lib/libbsp/powerpc/score603e/configure.ac @@ -67,8 +67,7 @@ RTEMS_BSPOPTS_HELP([PPC_VECTOR_FILE_BASE], NOTE: Vectors are actually at 0xFFF00000 but file starts at offset.]) # Explicitly list all Makefiles here -AC_CONFIG_FILES([Makefile -wrapup/Makefile]) +AC_CONFIG_FILES([Makefile]) RTEMS_PPC_EXCEPTIONS([old]) diff --git a/c/src/lib/libbsp/powerpc/score603e/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/score603e/wrapup/Makefile.am deleted file mode 100644 index c3c3f0ea36..0000000000 --- a/c/src/lib/libbsp/powerpc/score603e/wrapup/Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ -## -## $Id$ -## - -include $(top_srcdir)/../../../../automake/compile.am - -noinst_LIBRARIES = ../libbsp.a -CLEANFILES = ../libbsp.a -___libbsp_a_SOURCES = -___libbsp_a_LIBADD = ../startup.rel ../clock.rel ../console.rel ../timer.rel \ - ../tod.rel ../vectors.rel ../PCI_bus.rel -___libbsp_a_LIBADD += ../@exceptions@/rtems-cpu.rel - -include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/ss555/ChangeLog b/c/src/lib/libbsp/powerpc/ss555/ChangeLog index 94f2ffe3f8..4fd56652d2 100644 --- a/c/src/lib/libbsp/powerpc/ss555/ChangeLog +++ b/c/src/lib/libbsp/powerpc/ss555/ChangeLog @@ -1,3 +1,9 @@ +2005-02-11 Ralf Corsepius + + * Makefile.am: Merge-in wrapup/Makefile.am. + * wrapup/Makefile.am: Remove. + * configure.ac: Reflect changes above. + 2005-01-07 Ralf Corsepius * Makefile.am: Eliminate CFLAGS_OPTIMIZE_V. diff --git a/c/src/lib/libbsp/powerpc/ss555/Makefile.am b/c/src/lib/libbsp/powerpc/ss555/Makefile.am index 522ea9f60b..9e4015b52f 100644 --- a/c/src/lib/libbsp/powerpc/ss555/Makefile.am +++ b/c/src/lib/libbsp/powerpc/ss555/Makefile.am @@ -4,10 +4,6 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal -# wrapup is the one that actually builds and installs the library -# from the individual .rel files built in other directories -SUBDIRS = . @exceptions@ wrapup - include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am @@ -53,6 +49,18 @@ tm27supp_rel_SOURCES = startup/tm27supp.c tm27supp_rel_CPPFLAGS = $(AM_CPPFLAGS) tm27supp_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) +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 \ + ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \ + ../../../libcpu/@RTEMS_CPU@/mpc5xx/clock.rel \ + ../../../libcpu/@RTEMS_CPU@/mpc5xx/console-generic.rel \ + ../../../libcpu/@RTEMS_CPU@/mpc5xx/exceptions.rel \ + ../../../libcpu/@RTEMS_CPU@/mpc5xx/irq.rel \ + ../../../libcpu/@RTEMS_CPU@/mpc5xx/timer.rel \ + ../../../libcpu/@RTEMS_CPU@/mpc5xx/vectors.rel + all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) PREINSTALL_DIRS = diff --git a/c/src/lib/libbsp/powerpc/ss555/configure.ac b/c/src/lib/libbsp/powerpc/ss555/configure.ac index 6da4accdaf..d43361f473 100644 --- a/c/src/lib/libbsp/powerpc/ss555/configure.ac +++ b/c/src/lib/libbsp/powerpc/ss555/configure.ac @@ -45,8 +45,7 @@ RTEMS_BSPOPTS_HELP([PRINTK_MINOR], for the SCI ports.]) # Explicitly list a Makefile here -AC_CONFIG_FILES([Makefile -wrapup/Makefile]) +AC_CONFIG_FILES([Makefile]) RTEMS_PPC_EXCEPTIONS([new]) diff --git a/c/src/lib/libbsp/powerpc/ss555/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/ss555/wrapup/Makefile.am deleted file mode 100644 index 73059f55b2..0000000000 --- a/c/src/lib/libbsp/powerpc/ss555/wrapup/Makefile.am +++ /dev/null @@ -1,23 +0,0 @@ -## -## $Id$ -## - -include $(top_srcdir)/../../../../automake/compile.am - -noinst_LIBRARIES = ../libbsp.a -CLEANFILES = ../libbsp.a -___libbsp_a_SOURCES = - -___libbsp_a_LIBADD = ../pclock.rel ../console.rel ../startup.rel \ - ../tm27supp.rel - -___libbsp_a_LIBADD += ../../../../libcpu/powerpc/shared/cpuIdent.rel \ - ../@exceptions@/rtems-cpu.rel \ - ../../../../libcpu/powerpc/mpc5xx/clock.rel \ - ../../../../libcpu/powerpc/mpc5xx/console-generic.rel \ - ../../../../libcpu/powerpc/mpc5xx/exceptions.rel \ - ../../../../libcpu/powerpc/mpc5xx/irq.rel \ - ../../../../libcpu/powerpc/mpc5xx/timer.rel \ - ../../../../libcpu/powerpc/mpc5xx/vectors.rel - -include $(top_srcdir)/../../../../automake/local.am -- cgit v1.2.3