2005-02-11 Ralf Corsepius <ralf.corsepius@rtems.org>

	* Makefile.am: Merge-in wrapup/Makefile.am.
	* wrapup/Makefile.am: Remove.
	* configure.ac: Reflect changes above.

4 files changed, 20 insertions, 24 deletions

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 <ralf.corsepius@rtems.org>
+
+	* Makefile.am: Merge-in wrapup/Makefile.am.
+	* wrapup/Makefile.am: Remove.
+	* configure.ac: Reflect changes above.
+
 2005-01-07	Ralf Corsepius <ralf.corsepius@rtems.org>
 
 	* 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