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, 27 deletions

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