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, 26 insertions, 33 deletions

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 <ralf.corsepius@rtems.org>
+
+	* Makefile.am: Merge-in wrapup/Makefile.am.
+	* wrapup/Makefile.am: Remove.
+	* configure.ac: Reflect changes above.
+
 2005-01-20	Joel Sherrill <joel@OARcorp.com>
 
 	* 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