Correct oversights in previous patch

c/src/lib/libbsp/m68k/mvme162/ChangeLog

@@ -3,10 +3,11 @@
 	* README: Remove references to consolex.
 	* Makefile.am: Merge-in clock/Makefile.am, console/Makefile.am,
 	network/Makefile.am, startup/Makefile.am, timer/Makefile.am, 
-	tod/Makefile.am.
+	tod/Makefile.am, wrapup/Makefile.am.
 	Use automake compilation rules.
 	* clock/Makefile.am, console/Makefile.am, network/Makefile.am
-	startup/Makefile.am, timer/Makefile.am, tod/Makefile.am: Remove.
+	startup/Makefile.am, timer/Makefile.am, tod/Makefile.am,
+	wrapup/Makefile.am: Remove.
 	* configure.ac: Reflect changes above.	
 
 2004-01-28	Ralf Corsepius <corsepiu@faw.uni-ulm.de>

c/src/lib/libbsp/m68k/mvme162/wrapup/Makefile.am

@@ -1,31 +0,0 @@
-##
-## $Id$
-##
-
-# We only build the networking device driver if HAS_NETWORKING was defined
-if HAS_NETWORKING
-NETWORKING_DRIVER = network
-endif
-
-BSP_PIECES = startup clock console timer tod $(NETWORKING_DRIVER)
-
-# bummer; have to use $foreach since % pattern subst rules only replace 1x
-OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \
-    $(wildcard ../consolex/$(ARCH)/consolex.rel) \
-    ../../../../libcpu/@RTEMS_CPU@/shared/cache$(LIB_VARIANT).rel \
-    ../../../../libcpu/@RTEMS_CPU@/shared/misc$(LIB_VARIANT).rel
-
-if HAS_FPSP
-OBJS += \
-    ../../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/fpsp$(LIB_VARIANT).rel
-endif
-
-include $(top_srcdir)/../../../../automake/compile.am
-include $(top_srcdir)/../../../../automake/lib.am
-
-$(ARCH)/libbsp.a: $(OBJS)
-	$(make-library)
-
-noinst_DATA = $(ARCH)/libbsp.a
-
-include $(top_srcdir)/../../../../automake/local.am

c/src/lib/libbsp/m68k/mvme167/ChangeLog

@@ -3,6 +3,7 @@
 	* Makefile.am: Merge-in clock/Makefile.am, console/Makefile.am
 	fatal/Makefile.am, network/Makefile.am, startup/Makefile.am,
 	timer/Makefile.am, wrapup/Makefile.am.
+	Use automake compilation rules.
 	* clock/Makefile.am, console/Makefile.am, fatal/Makefile.am,
 	network/Makefile.am, startup/Makefile.am, timer/Makefile.am,
 	wrapup/Makefile.am: Remove.