Index: c/src/lib/libbsp/m68k/Makefile.am
===================================================================
--- c/src/lib/libbsp/m68k/Makefile.am	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
+++ c/src/lib/libbsp/m68k/Makefile.am	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -0,0 +1,12 @@
+## 
+## $Id$
+## 
+
+AUTOMAKE_OPTIONS = foreign 1.4
+ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
+
+## Descend into the $(RTEMS_BSP_FAMILY) directory
+SUBDIRS = shared $(RTEMS_BSP_FAMILY)
+
+include $(top_srcdir)/../../../../../automake/subdirs.am
+include $(top_srcdir)/../../../../../automake/local.am
Index: c/src/lib/libbsp/m68k/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ 	(revision )
@@ -1,26 +1,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ..
-subdir = m68k
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/directory.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-
-# Descend into the $(RTEMS_BSP_FAMILY) directory
-SUBDIRS = $(RTEMS_BSP_FAMILY)
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
Index: c/src/lib/libbsp/m68k/configure.in
===================================================================
--- c/src/lib/libbsp/m68k/configure.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
+++ c/src/lib/libbsp/m68k/configure.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -0,0 +1,27 @@
+dnl Process this file with autoconf to produce a configure script.
+dnl
+dnl $Id$
+
+AC_PREREQ(2.13)
+AC_INIT(shared)
+RTEMS_TOP(../../../../..)
+AC_CONFIG_AUX_DIR(../../../../..)
+
+RTEMS_CANONICAL_TARGET_CPU
+AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-m68k,$RTEMS_VERSION,no)
+AM_MAINTAINER_MODE
+
+RTEMS_ENABLE_LIBCDIR
+
+RTEMS_ENV_RTEMSBSP
+RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
+RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
+RTEMS_PROJECT_ROOT
+
+RTEMS_BSP_ALIAS(${RTEMS_BSP},bspdir)
+AC_CONFIG_SUBDIRS($bspdir)
+
+# Explicitly list a Makefile here 
+AC_OUTPUT( 
+Makefile
+shared/Makefile)
Index: c/src/lib/libbsp/m68k/dmv152/Makefile.am
===================================================================
--- c/src/lib/libbsp/m68k/dmv152/Makefile.am	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
+++ c/src/lib/libbsp/m68k/dmv152/Makefile.am	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -0,0 +1,17 @@
+## 
+## $Id$
+## 
+
+AUTOMAKE_OPTIONS = foreign 1.4
+ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
+
+# wrapup is the one that actually builds and installs the library
+#  from the individual .rel files built in other directories
+SUBDIRS = . include start startup clock console spurious timer wrapup
+
+include $(top_srcdir)/../../bsp.am
+
+EXTRA_DIST = bsp_specs times
+
+include $(top_srcdir)/../../../../../../automake/subdirs.am
+include $(top_srcdir)/../../../../../../automake/local.am
Index: c/src/lib/libbsp/m68k/dmv152/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/dmv152/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ 	(revision )
@@ -1,27 +1,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ../..
-subdir = m68k/dmv152
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/directory.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-
-# wrapup is the one that actually builds and installs the library
-#  from the individual .rel files built in other directories
-SUBDIRS = include start startup clock console spurious timer wrapup
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
Index: c/src/lib/libbsp/m68k/dmv152/clock/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/dmv152/clock/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/dmv152/clock/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/dmv152/clock
+top_builddir = ..
+subdir = clock
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/dmv152/configure.in
===================================================================
--- c/src/lib/libbsp/m68k/dmv152/configure.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
+++ c/src/lib/libbsp/m68k/dmv152/configure.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -0,0 +1,33 @@
+dnl Process this file with autoconf to produce a configure script.
+dnl
+dnl $Id$
+
+AC_PREREQ(2.13)
+AC_INIT(bsp_specs)
+RTEMS_TOP(../../../../../..)
+AC_CONFIG_AUX_DIR(../../../../../..)
+
+RTEMS_CANONICAL_TARGET_CPU
+AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-m68k-dmv152,$RTEMS_VERSION,no)
+AM_MAINTAINER_MODE
+
+RTEMS_ENABLE_LIBCDIR
+
+RTEMS_ENV_RTEMSBSP
+RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
+RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
+RTEMS_CANONICAL_HOST
+
+RTEMS_PROJECT_ROOT
+
+# Explicitly list a Makefile here 
+AC_OUTPUT( 
+Makefile
+clock/Makefile
+console/Makefile
+include/Makefile
+spurious/Makefile
+start/Makefile
+startup/Makefile
+timer/Makefile
+wrapup/Makefile)
Index: c/src/lib/libbsp/m68k/dmv152/console/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/dmv152/console/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/dmv152/console/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/dmv152/console
+top_builddir = ..
+subdir = console
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/dmv152/include/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/dmv152/include/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/dmv152/include/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/dmv152/include
+top_builddir = ..
+subdir = include
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/dmv152/spurious/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/dmv152/spurious/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/dmv152/spurious/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/dmv152/spurious
+top_builddir = ..
+subdir = spurious
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/dmv152/start/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/dmv152/start/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/dmv152/start/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/dmv152/start
+top_builddir = ..
+subdir = start
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/dmv152/startup/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/dmv152/startup/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/dmv152/startup/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/dmv152/startup
+top_builddir = ..
+subdir = startup
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/dmv152/timer/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/dmv152/timer/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/dmv152/timer/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/dmv152/timer
+top_builddir = ..
+subdir = timer
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/dmv152/wrapup/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/dmv152/wrapup/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/dmv152/wrapup/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/dmv152/wrapup
+top_builddir = ..
+subdir = wrapup
 
 RTEMS_ROOT = @RTEMS_ROOT@
@@ -57,7 +57,4 @@
 	$(INSTALL_VARIANT) -m 644 $(LIB) $(PROJECT_RELEASE)/lib
 
-$(PROJECT_ROOT)/@RTEMS_BSP@/lib/bsp_specs: ../bsp_specs
-	$(INSTALL_DATA) $< $@
-
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
Index: c/src/lib/libbsp/m68k/efi332/Makefile.am
===================================================================
--- c/src/lib/libbsp/m68k/efi332/Makefile.am	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
+++ c/src/lib/libbsp/m68k/efi332/Makefile.am	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -0,0 +1,17 @@
+## 
+## $Id$
+## 
+
+AUTOMAKE_OPTIONS = foreign 1.4
+ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
+
+# wrapup is the one that actually builds and installs the library
+#  from the individual .rel files built in other directories
+SUBDIRS = . include start startup clock console spurious timer wrapup
+
+include $(top_srcdir)/../../bsp.am
+
+EXTRA_DIST = bsp_specs times
+
+include $(top_srcdir)/../../../../../../automake/subdirs.am
+include $(top_srcdir)/../../../../../../automake/local.am
Index: c/src/lib/libbsp/m68k/efi332/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/efi332/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ 	(revision )
@@ -1,27 +1,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ../..
-subdir = m68k/efi332
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/directory.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-
-# wrapup is the one that actually builds and installs the library
-#  from the individual .rel files built in other directories
-SUBDIRS = include start startup clock console spurious timer wrapup
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
Index: c/src/lib/libbsp/m68k/efi332/clock/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/efi332/clock/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/efi332/clock/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/efi332/clock
+top_builddir = ..
+subdir = clock
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/efi332/configure.in
===================================================================
--- c/src/lib/libbsp/m68k/efi332/configure.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
+++ c/src/lib/libbsp/m68k/efi332/configure.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -0,0 +1,33 @@
+dnl Process this file with autoconf to produce a configure script.
+dnl
+dnl $Id$
+
+AC_PREREQ(2.13)
+AC_INIT(bsp_specs)
+RTEMS_TOP(../../../../../..)
+AC_CONFIG_AUX_DIR(../../../../../..)
+
+RTEMS_CANONICAL_TARGET_CPU
+AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-m68k-efi332,$RTEMS_VERSION,no)
+AM_MAINTAINER_MODE
+
+RTEMS_ENABLE_LIBCDIR
+
+RTEMS_ENV_RTEMSBSP
+RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
+RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
+RTEMS_CANONICAL_HOST
+
+RTEMS_PROJECT_ROOT
+
+# Explicitly list a Makefile here 
+AC_OUTPUT( 
+Makefile
+clock/Makefile
+console/Makefile
+include/Makefile
+spurious/Makefile
+start/Makefile
+startup/Makefile
+timer/Makefile
+wrapup/Makefile)
Index: c/src/lib/libbsp/m68k/efi332/console/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/efi332/console/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/efi332/console/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/efi332/console
+top_builddir = ..
+subdir = console
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/efi332/include/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/efi332/include/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/efi332/include/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/efi332/include
+top_builddir = ..
+subdir = include
 
 RTEMS_ROOT = @RTEMS_ROOT@
@@ -15,5 +15,5 @@
 
 H_FILES = $(srcdir)/bsp.h $(srcdir)/../../../shared/include/coverhd.h \
-    $(srcdir)/efi332.h 
+    $(srcdir)/efi332.h
 
 #
Index: c/src/lib/libbsp/m68k/efi332/spurious/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/efi332/spurious/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/efi332/spurious/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/efi332/spurious
+top_builddir = ..
+subdir = spurious
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/efi332/start/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/efi332/start/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/efi332/start/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/efi332/start
+top_builddir = ..
+subdir = start
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/efi332/startup/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/efi332/startup/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/efi332/startup/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/efi332/startup
+top_builddir = ..
+subdir = startup
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/efi332/timer/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/efi332/timer/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/efi332/timer/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/efi332/timer
+top_builddir = ..
+subdir = timer
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/efi332/wrapup/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/efi332/wrapup/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/efi332/wrapup/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/efi332/wrapup
+top_builddir = ..
+subdir = wrapup
 
 RTEMS_ROOT = @RTEMS_ROOT@
@@ -57,7 +57,4 @@
 	$(INSTALL_VARIANT) -m 644 $(LIB) $(PROJECT_RELEASE)/lib
 
-$(PROJECT_ROOT)/@RTEMS_BSP@/lib/bsp_specs: ../bsp_specs
-	$(INSTALL_DATA) $< $@
-
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
Index: c/src/lib/libbsp/m68k/efi68k/Makefile.am
===================================================================
--- c/src/lib/libbsp/m68k/efi68k/Makefile.am	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
+++ c/src/lib/libbsp/m68k/efi68k/Makefile.am	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -0,0 +1,17 @@
+## 
+## $Id$
+## 
+
+AUTOMAKE_OPTIONS = foreign 1.4
+ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
+
+# wrapup is the one that actually builds and installs the library
+#  from the individual .rel files built in other directories
+SUBDIRS = . include start startup clock console spurious timer wrapup
+
+include $(top_srcdir)/../../bsp.am
+
+EXTRA_DIST = bsp_specs times
+
+include $(top_srcdir)/../../../../../../automake/subdirs.am
+include $(top_srcdir)/../../../../../../automake/local.am
Index: c/src/lib/libbsp/m68k/efi68k/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/efi68k/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ 	(revision )
@@ -1,27 +1,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ../..
-subdir = m68k/efi68k
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/directory.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-
-# wrapup is the one that actually builds and installs the library
-#  from the individual .rel files built in other directories
-SUBDIRS = include start startup clock console spurious timer wrapup
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
Index: c/src/lib/libbsp/m68k/efi68k/clock/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/efi68k/clock/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/efi68k/clock/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/efi68k/clock
+top_builddir = ..
+subdir = clock
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/efi68k/configure.in
===================================================================
--- c/src/lib/libbsp/m68k/efi68k/configure.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
+++ c/src/lib/libbsp/m68k/efi68k/configure.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -0,0 +1,33 @@
+dnl Process this file with autoconf to produce a configure script.
+dnl
+dnl $Id$
+
+AC_PREREQ(2.13)
+AC_INIT(bsp_specs)
+RTEMS_TOP(../../../../../..)
+AC_CONFIG_AUX_DIR(../../../../../..)
+
+RTEMS_CANONICAL_TARGET_CPU
+AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-m68k-efi68k,$RTEMS_VERSION,no)
+AM_MAINTAINER_MODE
+
+RTEMS_ENABLE_LIBCDIR
+
+RTEMS_ENV_RTEMSBSP
+RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
+RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
+RTEMS_CANONICAL_HOST
+
+RTEMS_PROJECT_ROOT
+
+# Explicitly list a Makefile here 
+AC_OUTPUT( 
+Makefile
+clock/Makefile
+console/Makefile
+include/Makefile
+spurious/Makefile
+start/Makefile
+startup/Makefile
+timer/Makefile
+wrapup/Makefile)
Index: c/src/lib/libbsp/m68k/efi68k/console/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/efi68k/console/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/efi68k/console/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/efi68k/console
+top_builddir = ..
+subdir = console
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/efi68k/include/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/efi68k/include/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/efi68k/include/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/efi68k/include
+top_builddir = ..
+subdir = include
 
 RTEMS_ROOT = @RTEMS_ROOT@
@@ -15,5 +15,5 @@
 
 H_FILES = $(srcdir)/bsp.h $(srcdir)/../../../shared/include/coverhd.h \
-     $(srcdir)/efi68k.h $(srcdir)/16550.h $(srcdir)/DP8570A.h 
+    $(srcdir)/efi68k.h $(srcdir)/16550.h $(srcdir)/DP8570A.h
 
 #
Index: c/src/lib/libbsp/m68k/efi68k/spurious/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/efi68k/spurious/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/efi68k/spurious/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/efi68k/spurious
+top_builddir = ..
+subdir = spurious
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/efi68k/start/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/efi68k/start/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/efi68k/start/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/efi68k/start
+top_builddir = ..
+subdir = start
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/efi68k/startup/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/efi68k/startup/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/efi68k/startup/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/efi68k/startup
+top_builddir = ..
+subdir = startup
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/efi68k/timer/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/efi68k/timer/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/efi68k/timer/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/efi68k/timer
+top_builddir = ..
+subdir = timer
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/efi68k/wrapup/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/efi68k/wrapup/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/efi68k/wrapup/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/efi68k/wrapup
+top_builddir = ..
+subdir = wrapup
 
 RTEMS_ROOT = @RTEMS_ROOT@
@@ -57,7 +57,4 @@
 	$(INSTALL_VARIANT) -m 644 $(LIB) $(PROJECT_RELEASE)/lib
 
-$(PROJECT_ROOT)/@RTEMS_BSP@/lib/bsp_specs: ../bsp_specs
-	$(INSTALL_DATA) $< $@
-
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
Index: c/src/lib/libbsp/m68k/gen68302/Makefile.am
===================================================================
--- c/src/lib/libbsp/m68k/gen68302/Makefile.am	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
+++ c/src/lib/libbsp/m68k/gen68302/Makefile.am	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -0,0 +1,17 @@
+## 
+## $Id$
+## 
+
+AUTOMAKE_OPTIONS = foreign 1.4
+ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
+
+# wrapup is the one that actually builds and installs the library
+#  from the individual .rel files built in other directories
+SUBDIRS = . include start startup clock console timer wrapup
+
+include $(top_srcdir)/../../bsp.am
+
+EXTRA_DIST = bsp_specs times
+
+include $(top_srcdir)/../../../../../../automake/subdirs.am
+include $(top_srcdir)/../../../../../../automake/local.am
Index: c/src/lib/libbsp/m68k/gen68302/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/gen68302/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ 	(revision )
@@ -1,31 +1,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ../..
-subdir = m68k/gen68302
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/directory.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-
-SRCS = README
-
-all: $(SRCS)
-
-# wrapup is the one that actually builds and installs the library
-#  from the individual .rel files built in other directories
-SUBDIRS = include start startup clock console timer wrapup
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
Index: c/src/lib/libbsp/m68k/gen68302/clock/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/gen68302/clock/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/gen68302/clock/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/gen68302/clock
+top_builddir = ..
+subdir = clock
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/gen68302/configure.in
===================================================================
--- c/src/lib/libbsp/m68k/gen68302/configure.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
+++ c/src/lib/libbsp/m68k/gen68302/configure.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -0,0 +1,32 @@
+dnl Process this file with autoconf to produce a configure script.
+dnl
+dnl $Id$
+
+AC_PREREQ(2.13)
+AC_INIT(bsp_specs)
+RTEMS_TOP(../../../../../..)
+AC_CONFIG_AUX_DIR(../../../../../..)
+
+RTEMS_CANONICAL_TARGET_CPU
+AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-m68k-gen68302,$RTEMS_VERSION,no)
+AM_MAINTAINER_MODE
+
+RTEMS_ENABLE_LIBCDIR
+
+RTEMS_ENV_RTEMSBSP
+RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
+RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
+RTEMS_CANONICAL_HOST
+
+RTEMS_PROJECT_ROOT
+
+# Explicitly list a Makefile here 
+AC_OUTPUT( 
+Makefile
+clock/Makefile
+console/Makefile
+include/Makefile
+start/Makefile
+startup/Makefile
+timer/Makefile
+wrapup/Makefile)
Index: c/src/lib/libbsp/m68k/gen68302/console/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/gen68302/console/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/gen68302/console/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/gen68302/console
+top_builddir = ..
+subdir = console
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/gen68302/include/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/gen68302/include/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/gen68302/include/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/gen68302/include
+top_builddir = ..
+subdir = include
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/gen68302/start/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/gen68302/start/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/gen68302/start/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/gen68302/start
+top_builddir = ..
+subdir = start
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/gen68302/startup/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/gen68302/startup/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/gen68302/startup/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/gen68302/startup
+top_builddir = ..
+subdir = startup
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/gen68302/timer/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/gen68302/timer/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/gen68302/timer/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/gen68302/timer
+top_builddir = ..
+subdir = timer
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/gen68302/wrapup/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/gen68302/wrapup/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/gen68302/wrapup/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/gen68302/wrapup
+top_builddir = ..
+subdir = wrapup
 
 RTEMS_ROOT = @RTEMS_ROOT@
@@ -57,7 +57,4 @@
 	$(INSTALL_VARIANT) -m 644 $(LIB) $(PROJECT_RELEASE)/lib
 
-$(PROJECT_ROOT)/@RTEMS_BSP@/lib/bsp_specs: ../bsp_specs
-	$(INSTALL_DATA) $< $@
-
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
Index: c/src/lib/libbsp/m68k/gen68340/Makefile.am
===================================================================
--- c/src/lib/libbsp/m68k/gen68340/Makefile.am	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
+++ c/src/lib/libbsp/m68k/gen68340/Makefile.am	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -0,0 +1,17 @@
+## 
+## $Id$
+## 
+
+AUTOMAKE_OPTIONS = foreign 1.4
+ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
+
+# wrapup is the one that actually builds and installs the library
+#  from the individual .rel files built in other directories
+SUBDIRS = . include start startup clock console timer wrapup
+
+include $(top_srcdir)/../../bsp.am
+
+EXTRA_DIST = bsp_specs times
+
+include $(top_srcdir)/../../../../../../automake/subdirs.am
+include $(top_srcdir)/../../../../../../automake/local.am
Index: c/src/lib/libbsp/m68k/gen68340/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/gen68340/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ 	(revision )
@@ -1,31 +1,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ../..
-subdir = m68k/gen68340
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/directory.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-
-SRCS = README
-
-all: $(SRCS)
-
-# wrapup is the one that actually builds and installs the library
-#  from the individual .rel files built in other directories
-SUBDIRS = include start startup clock console timer wrapup
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
Index: c/src/lib/libbsp/m68k/gen68340/clock/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/gen68340/clock/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/gen68340/clock/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/gen68340/clock
+top_builddir = ..
+subdir = clock
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/gen68340/configure.in
===================================================================
--- c/src/lib/libbsp/m68k/gen68340/configure.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
+++ c/src/lib/libbsp/m68k/gen68340/configure.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -0,0 +1,32 @@
+dnl Process this file with autoconf to produce a configure script.
+dnl
+dnl $Id$
+
+AC_PREREQ(2.13)
+AC_INIT(bsp_specs)
+RTEMS_TOP(../../../../../..)
+AC_CONFIG_AUX_DIR(../../../../../..)
+
+RTEMS_CANONICAL_TARGET_CPU
+AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-m68k-gen68340,$RTEMS_VERSION,no)
+AM_MAINTAINER_MODE
+
+RTEMS_ENABLE_LIBCDIR
+
+RTEMS_ENV_RTEMSBSP
+RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
+RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
+RTEMS_CANONICAL_HOST
+
+RTEMS_PROJECT_ROOT
+
+# Explicitly list a Makefile here 
+AC_OUTPUT( 
+Makefile
+clock/Makefile
+console/Makefile
+include/Makefile
+start/Makefile
+startup/Makefile
+timer/Makefile
+wrapup/Makefile)
Index: c/src/lib/libbsp/m68k/gen68340/console/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/gen68340/console/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/gen68340/console/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/gen68340/console
+top_builddir = ..
+subdir = console
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/gen68340/include/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/gen68340/include/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/gen68340/include/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/gen68340/include
+top_builddir = ..
+subdir = include
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/gen68340/start/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/gen68340/start/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/gen68340/start/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/gen68340/start
+top_builddir = ..
+subdir = start
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/gen68340/startup/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/gen68340/startup/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/gen68340/startup/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/gen68340/startup
+top_builddir = ..
+subdir = startup
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/gen68340/timer/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/gen68340/timer/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/gen68340/timer/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/gen68340/timer
+top_builddir = ..
+subdir = timer
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/gen68340/wrapup/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/gen68340/wrapup/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/gen68340/wrapup/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/gen68340/wrapup
+top_builddir = ..
+subdir = wrapup
 
 RTEMS_ROOT = @RTEMS_ROOT@
@@ -62,7 +62,4 @@
 	$(INSTALL_VARIANT) -m 644 $(LIB) $(PROJECT_RELEASE)/lib
 
-$(PROJECT_ROOT)/@RTEMS_BSP@/lib/bsp_specs: ../bsp_specs
-	$(INSTALL_DATA) $< $@
-
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
Index: c/src/lib/libbsp/m68k/gen68360/Makefile.am
===================================================================
--- c/src/lib/libbsp/m68k/gen68360/Makefile.am	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
+++ c/src/lib/libbsp/m68k/gen68360/Makefile.am	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -0,0 +1,23 @@
+## 
+## $Id$
+## 
+
+AUTOMAKE_OPTIONS = foreign 1.4
+ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
+
+# wrapup is the one that actually builds and installs the library
+#  from the individual .rel files built in other directories
+
+if HAS_NETWORKING
+NETWORKING_DRIVER = network
+endif
+
+SUBDIRS = . include start startup clock console timer $(NETWORKING_DRIVER) \
+    wrapup
+
+include $(top_srcdir)/../../bsp.am
+
+EXTRA_DIST = bsp_specs times
+
+include $(top_srcdir)/../../../../../../automake/subdirs.am
+include $(top_srcdir)/../../../../../../automake/local.am
Index: c/src/lib/libbsp/m68k/gen68360/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/gen68360/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ 	(revision )
@@ -1,36 +1,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ../..
-subdir = m68k/gen68360
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/directory.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-
-SRCS = README
-
-# We only build the networking device driver if HAS_NETWORKING was defined
-NETWORKING_DRIVER_yes_V = network
-NETWORKING_DRIVER = $(NETWORKING_DRIVER_$(HAS_NETWORKING)_V)
-
-all: $(SRCS)
-
-# wrapup is the one that actually builds and installs the library
-#  from the individual .rel files built in other directories
-SUBDIRS = include start startup clock console timer $(NETWORKING_DRIVER) \
-    wrapup
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
Index: c/src/lib/libbsp/m68k/gen68360/clock/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/gen68360/clock/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/gen68360/clock/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/gen68360/clock
+top_builddir = ..
+subdir = clock
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/gen68360/configure.in
===================================================================
--- c/src/lib/libbsp/m68k/gen68360/configure.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
+++ c/src/lib/libbsp/m68k/gen68360/configure.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -0,0 +1,35 @@
+dnl Process this file with autoconf to produce a configure script.
+dnl
+dnl $Id$
+
+AC_PREREQ(2.13)
+AC_INIT(bsp_specs)
+RTEMS_TOP(../../../../../..)
+AC_CONFIG_AUX_DIR(../../../../../..)
+
+RTEMS_CANONICAL_TARGET_CPU
+AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-m68k-dmv152,$RTEMS_VERSION,no)
+AM_MAINTAINER_MODE
+
+RTEMS_ENABLE_LIBCDIR
+
+RTEMS_ENV_RTEMSBSP
+RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
+RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
+RTEMS_CHECK_NETWORKING
+RTEMS_CANONICAL_HOST
+
+RTEMS_PROJECT_ROOT
+AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes")
+
+# Explicitly list a Makefile here 
+AC_OUTPUT( 
+Makefile
+clock/Makefile
+console/Makefile
+include/Makefile
+network/Makefile
+start/Makefile
+startup/Makefile
+timer/Makefile
+wrapup/Makefile)
Index: c/src/lib/libbsp/m68k/gen68360/console/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/gen68360/console/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/gen68360/console/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/gen68360/console
+top_builddir = ..
+subdir = console
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/gen68360/include/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/gen68360/include/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/gen68360/include/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/gen68360/include
+top_builddir = ..
+subdir = include
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/gen68360/network/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/gen68360/network/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/gen68360/network/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/gen68360/network
+top_builddir = ..
+subdir = network
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/gen68360/start/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/gen68360/start/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/gen68360/start/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/gen68360/start
+top_builddir = ..
+subdir = start
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/gen68360/startup/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/gen68360/startup/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/gen68360/startup/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/gen68360/startup
+top_builddir = ..
+subdir = startup
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/gen68360/timer/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/gen68360/timer/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/gen68360/timer/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/gen68360/timer
+top_builddir = ..
+subdir = timer
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/gen68360/wrapup/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/gen68360/wrapup/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/gen68360/wrapup/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/gen68360/wrapup
+top_builddir = ..
+subdir = wrapup
 
 RTEMS_ROOT = @RTEMS_ROOT@
@@ -66,7 +66,4 @@
 	$(INSTALL_VARIANT) -m 644 $(LIB) $(PROJECT_RELEASE)/lib
 
-$(PROJECT_ROOT)/@RTEMS_BSP@/lib/bsp_specs: ../bsp_specs
-	$(INSTALL_DATA) $< $@
-
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
Index: c/src/lib/libbsp/m68k/idp/Makefile.am
===================================================================
--- c/src/lib/libbsp/m68k/idp/Makefile.am	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
+++ c/src/lib/libbsp/m68k/idp/Makefile.am	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -0,0 +1,17 @@
+## 
+## $Id$
+## 
+
+AUTOMAKE_OPTIONS = foreign 1.4
+ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
+
+# wrapup is the one that actually builds and installs the library
+#  from the individual .rel files built in other directories
+SUBDIRS = . include start startup clock console timer wrapup
+
+include $(top_srcdir)/../../bsp.am
+
+EXTRA_DIST = bsp_specs times
+
+include $(top_srcdir)/../../../../../../automake/subdirs.am
+include $(top_srcdir)/../../../../../../automake/local.am
Index: c/src/lib/libbsp/m68k/idp/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/idp/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ 	(revision )
@@ -1,27 +1,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ../..
-subdir = m68k/idp
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/directory.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-
-# wrapup is the one that actually builds and installs the library
-#  from the individual .rel files built in other directories
-SUBDIRS = include start startup clock console timer wrapup
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
Index: c/src/lib/libbsp/m68k/idp/clock/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/idp/clock/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/idp/clock/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/idp/clock
+top_builddir = ..
+subdir = clock
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/idp/configure.in
===================================================================
--- c/src/lib/libbsp/m68k/idp/configure.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
+++ c/src/lib/libbsp/m68k/idp/configure.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -0,0 +1,32 @@
+dnl Process this file with autoconf to produce a configure script.
+dnl
+dnl $Id$
+
+AC_PREREQ(2.13)
+AC_INIT(bsp_specs)
+RTEMS_TOP(../../../../../..)
+AC_CONFIG_AUX_DIR(../../../../../..)
+
+RTEMS_CANONICAL_TARGET_CPU
+AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-m68k-idp,$RTEMS_VERSION,no)
+AM_MAINTAINER_MODE
+
+RTEMS_ENABLE_LIBCDIR
+
+RTEMS_ENV_RTEMSBSP
+RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
+RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
+RTEMS_CANONICAL_HOST
+
+RTEMS_PROJECT_ROOT
+
+# Explicitly list a Makefile here 
+AC_OUTPUT( 
+Makefile
+clock/Makefile
+console/Makefile
+include/Makefile
+start/Makefile
+startup/Makefile
+timer/Makefile
+wrapup/Makefile)
Index: c/src/lib/libbsp/m68k/idp/console/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/idp/console/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/idp/console/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/idp/console
+top_builddir = ..
+subdir = console
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/idp/include/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/idp/include/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/idp/include/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/idp/include
+top_builddir = ..
+subdir = include
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/idp/start/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/idp/start/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/idp/start/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/idp/start
+top_builddir = ..
+subdir = start
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/idp/startup/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/idp/startup/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/idp/startup/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/idp/startup
+top_builddir = ..
+subdir = startup
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/idp/timer/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/idp/timer/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/idp/timer/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/idp/timer
+top_builddir = ..
+subdir = timer
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/idp/wrapup/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/idp/wrapup/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/idp/wrapup/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/idp/wrapup
+top_builddir = ..
+subdir = wrapup
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/mvme136/Makefile.am
===================================================================
--- c/src/lib/libbsp/m68k/mvme136/Makefile.am	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
+++ c/src/lib/libbsp/m68k/mvme136/Makefile.am	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -0,0 +1,17 @@
+## 
+## $Id$
+## 
+
+AUTOMAKE_OPTIONS = foreign 1.4
+ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
+
+# wrapup is the one that actually builds and installs the library
+#  from the individual .rel files built in other directories
+SUBDIRS = . include start startup clock console shmsupp timer wrapup
+
+include $(top_srcdir)/../../bsp.am
+
+EXTRA_DIST = bsp_specs times
+
+include $(top_srcdir)/../../../../../../automake/subdirs.am
+include $(top_srcdir)/../../../../../../automake/local.am
Index: c/src/lib/libbsp/m68k/mvme136/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/mvme136/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ 	(revision )
@@ -1,31 +1,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ../..
-subdir = m68k/mvme136
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/directory.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-
-# We only build the multiprocessing support if HAS_MP was defined
-MP_SUPPORT_yes_V = shmsupp
-MP_SUPPORT = $(MP_SUPPORT_$(HAS_MP)_V)
-
-# wrapup is the one that actually builds and installs the library
-#  from the individual .rel files built in other directories
-SUBDIRS = include start startup clock console $(MP_SUPPORT) timer wrapup
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
Index: c/src/lib/libbsp/m68k/mvme136/clock/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/mvme136/clock/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/mvme136/clock/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/mvme136/clock
+top_builddir = ..
+subdir = clock
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/mvme136/configure.in
===================================================================
--- c/src/lib/libbsp/m68k/mvme136/configure.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
+++ c/src/lib/libbsp/m68k/mvme136/configure.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -0,0 +1,36 @@
+dnl Process this file with autoconf to produce a configure script.
+dnl
+dnl $Id$
+
+AC_PREREQ(2.13)
+AC_INIT(bsp_specs)
+RTEMS_TOP(../../../../../..)
+AC_CONFIG_AUX_DIR(../../../../../..)
+
+RTEMS_CANONICAL_TARGET_CPU
+AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-m68k-mvme136,$RTEMS_VERSION,no)
+AM_MAINTAINER_MODE
+
+RTEMS_ENABLE_LIBCDIR
+
+RTEMS_ENV_RTEMSBSP
+RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
+RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
+RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP)
+RTEMS_CANONICAL_HOST
+
+AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes");
+
+RTEMS_PROJECT_ROOT
+
+# Explicitly list a Makefile here 
+AC_OUTPUT( 
+Makefile
+clock/Makefile
+console/Makefile
+include/Makefile
+shmsupp/Makefile
+start/Makefile
+startup/Makefile
+timer/Makefile
+wrapup/Makefile)
Index: c/src/lib/libbsp/m68k/mvme136/console/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/mvme136/console/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/mvme136/console/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/mvme136/console
+top_builddir = ..
+subdir = console
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/mvme136/include/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/mvme136/include/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/mvme136/include/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/mvme136/include
+top_builddir = ..
+subdir = include
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/mvme136/shmsupp/Makefile.am
===================================================================
--- c/src/lib/libbsp/m68k/mvme136/shmsupp/Makefile.am	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
+++ c/src/lib/libbsp/m68k/mvme136/shmsupp/Makefile.am	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -0,0 +1,35 @@
+## 
+## $Id$
+## 
+
+AUTOMAKE_OPTIONS = foreign 1.4
+
+PGM = ${ARCH}/shmsupp.rel
+
+## C source names
+C_FILES = addrconv.c getcfg.c lock.c mpisr.c
+C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
+
+OBJS = $(C_O_FILES)
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../../../../../../automake/lib.am
+
+#
+# (OPTIONAL) Add local stuff here using +=
+#
+
+$(PGM): ${OBJS}
+	$(make-rel)
+
+if HAS_MP
+all-local: ${ARCH} $(PGM)
+else
+all-local:
+endif
+
+# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
+
+EXTRA_DIST = $(C_FILES)
+
+include $(top_srcdir)/../../../../../../automake/local.am
Index: c/src/lib/libbsp/m68k/mvme136/shmsupp/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/mvme136/shmsupp/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ 	(revision )
@@ -1,65 +1,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/mvme136/shmsupp
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-PGM = ${ARCH}/shmsupp.rel
-
-# C source names, if any, go here -- minus the .c
-C_PIECES = addrconv getcfg lock mpisr
-C_FILES = $(C_PIECES:%=%.c)
-C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
-
-H_FILES =
-
-SRCS = $(C_FILES) $(H_FILES)
-OBJS = $(C_O_FILES)
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-DEFINES +=
-CPPFLAGS +=
-CFLAGS +=
-
-LD_PATHS +=
-LD_LIBS +=
-LDFLAGS +=
-
-#
-# Add your list of files to delete here.  The config files
-#  already know how to delete some stuff, so you may want
-#  to just run 'make clean' first to see what gets missed.
-#  'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS +=
-
-$(PGM): ${OBJS}
-	$(make-rel)
-
-all: ${ARCH} $(SRCS) $(PGM)
-
-# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
-install: all
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
Index: c/src/lib/libbsp/m68k/mvme136/start/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/mvme136/start/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/mvme136/start/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/mvme136/start
+top_builddir = ..
+subdir = start
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/mvme136/startup/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/mvme136/startup/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/mvme136/startup/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/mvme136/startup
+top_builddir = ..
+subdir = startup
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/mvme136/timer/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/mvme136/timer/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/mvme136/timer/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/mvme136/timer
+top_builddir = ..
+subdir = timer
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/mvme136/wrapup/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/mvme136/wrapup/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/mvme136/wrapup/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/mvme136/wrapup
+top_builddir = ..
+subdir = wrapup
 
 RTEMS_ROOT = @RTEMS_ROOT@
@@ -65,7 +65,4 @@
 	$(INSTALL_VARIANT) -m 644 $(LIB) $(PROJECT_RELEASE)/lib
 
-$(PROJECT_ROOT)/@RTEMS_BSP@/lib/bsp_specs: ../bsp_specs
-	$(INSTALL_DATA) $< $@
-
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
Index: c/src/lib/libbsp/m68k/mvme147/Makefile.am
===================================================================
--- c/src/lib/libbsp/m68k/mvme147/Makefile.am	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
+++ c/src/lib/libbsp/m68k/mvme147/Makefile.am	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -0,0 +1,17 @@
+## 
+## $Id$
+## 
+
+AUTOMAKE_OPTIONS = foreign 1.4
+ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
+
+# wrapup is the one that actually builds and installs the library
+#  from the individual .rel files built in other directories
+SUBDIRS = . include start startup clock console timer wrapup
+
+include $(top_srcdir)/../../bsp.am
+
+EXTRA_DIST = bsp_specs times
+
+include $(top_srcdir)/../../../../../../automake/subdirs.am
+include $(top_srcdir)/../../../../../../automake/local.am
Index: c/src/lib/libbsp/m68k/mvme147/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/mvme147/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ 	(revision )
@@ -1,27 +1,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ../..
-subdir = m68k/mvme147
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/directory.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-
-# wrapup is the one that actually builds and installs the library
-#  from the individual .rel files built in other directories
-SUBDIRS = include start startup clock console timer wrapup
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
Index: c/src/lib/libbsp/m68k/mvme147/clock/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/mvme147/clock/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/mvme147/clock/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/mvme147/clock
+top_builddir = ..
+subdir = clock
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/mvme147/configure.in
===================================================================
--- c/src/lib/libbsp/m68k/mvme147/configure.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
+++ c/src/lib/libbsp/m68k/mvme147/configure.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -0,0 +1,32 @@
+dnl Process this file with autoconf to produce a configure script.
+dnl
+dnl $Id$
+
+AC_PREREQ(2.13)
+AC_INIT(bsp_specs)
+RTEMS_TOP(../../../../../..)
+AC_CONFIG_AUX_DIR(../../../../../..)
+
+RTEMS_CANONICAL_TARGET_CPU
+AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-m68k-mvme147,$RTEMS_VERSION,no)
+AM_MAINTAINER_MODE
+
+RTEMS_ENABLE_LIBCDIR
+
+RTEMS_ENV_RTEMSBSP
+RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
+RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
+RTEMS_CANONICAL_HOST
+
+RTEMS_PROJECT_ROOT
+
+# Explicitly list a Makefile here 
+AC_OUTPUT( 
+Makefile
+clock/Makefile
+console/Makefile
+include/Makefile
+start/Makefile
+startup/Makefile
+timer/Makefile
+wrapup/Makefile)
Index: c/src/lib/libbsp/m68k/mvme147/console/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/mvme147/console/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/mvme147/console/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/mvme147/console
+top_builddir = ..
+subdir = console
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/mvme147/include/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/mvme147/include/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/mvme147/include/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/mvme147/include
+top_builddir = ..
+subdir = include
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/mvme147/start/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/mvme147/start/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/mvme147/start/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/mvme147/start
+top_builddir = ..
+subdir = start
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/mvme147/startup/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/mvme147/startup/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/mvme147/startup/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/mvme147/startup
+top_builddir = ..
+subdir = startup
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/mvme147/timer/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/mvme147/timer/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/mvme147/timer/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/mvme147/timer
+top_builddir = ..
+subdir = timer
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/mvme147/wrapup/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/mvme147/wrapup/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/mvme147/wrapup/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/mvme147/wrapup
+top_builddir = ..
+subdir = wrapup
 
 RTEMS_ROOT = @RTEMS_ROOT@
@@ -57,7 +57,4 @@
 	$(INSTALL_VARIANT) -m 644 $(LIB) $(PROJECT_RELEASE)/lib
 
-$(PROJECT_ROOT)/@RTEMS_BSP@/lib/bsp_specs: ../bsp_specs
-	$(INSTALL_DATA) $< $@
-
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
Index: c/src/lib/libbsp/m68k/mvme147s/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/mvme147s/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ 	(revision )
@@ -1,31 +1,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ../..
-subdir = m68k/mvme147s
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/directory.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-
-# We only build the multiprocessing support if HAS_MP was defined
-MP_SUPPORT_yes_V = shmsupp
-MP_SUPPORT = $(MP_SUPPORT_$(HAS_MP)_V)
-
-# wrapup is the one that actually builds and installs the library
-#  from the individual .rel files built in other directories
-SUBDIRS = include start startup clock console timer $(MP_SUPPORT) wrapup
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
Index: c/src/lib/libbsp/m68k/mvme147s/clock/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/mvme147s/clock/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/mvme147s/clock/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/mvme147s/clock
+top_builddir = ..
+subdir = clock
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/mvme147s/configure.in
===================================================================
--- c/src/lib/libbsp/m68k/mvme147s/configure.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
+++ c/src/lib/libbsp/m68k/mvme147s/configure.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -0,0 +1,36 @@
+dnl Process this file with autoconf to produce a configure script.
+dnl
+dnl $Id$
+
+AC_PREREQ(2.13)
+AC_INIT(bsp_specs)
+RTEMS_TOP(../../../../../..)
+AC_CONFIG_AUX_DIR(../../../../../..)
+
+RTEMS_CANONICAL_TARGET_CPU
+AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-m68k-mvme147s,$RTEMS_VERSION,no)
+AM_MAINTAINER_MODE
+
+RTEMS_ENABLE_LIBCDIR
+
+RTEMS_ENV_RTEMSBSP
+RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
+RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
+RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP)
+RTEMS_CANONICAL_HOST
+
+AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes");
+
+RTEMS_PROJECT_ROOT
+
+# Explicitly list a Makefile here 
+AC_OUTPUT( 
+Makefile
+clock/Makefile
+console/Makefile
+include/Makefile
+shmsupp/Makefile
+start/Makefile
+startup/Makefile
+timer/Makefile
+wrapup/Makefile)
Index: c/src/lib/libbsp/m68k/mvme147s/console/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/mvme147s/console/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/mvme147s/console/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/mvme147s/console
+top_builddir = ..
+subdir = console
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/mvme147s/include/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/mvme147s/include/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/mvme147s/include/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/mvme147s/include
+top_builddir = ..
+subdir = include
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/mvme147s/shmsupp/Makefile.am
===================================================================
--- c/src/lib/libbsp/m68k/mvme147s/shmsupp/Makefile.am	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
+++ c/src/lib/libbsp/m68k/mvme147s/shmsupp/Makefile.am	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -0,0 +1,35 @@
+## 
+## $Id$
+## 
+
+AUTOMAKE_OPTIONS = foreign 1.4
+
+PGM = ${ARCH}/shmsupp.rel
+
+## C source names
+C_FILES = addrconv.c getcfg.c lock.c mpisr.c
+C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
+
+OBJS = $(C_O_FILES)
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../../../../../../automake/lib.am
+
+#
+# (OPTIONAL) Add local stuff here using +=
+#
+
+$(PGM): ${OBJS}
+	$(make-rel)
+
+if HAS_MP
+all-local: ${ARCH} $(PGM)
+else
+all-local:
+endif
+
+# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
+
+EXTRA_DIST = $(C_FILES)
+
+include $(top_srcdir)/../../../../../../automake/local.am
Index: c/src/lib/libbsp/m68k/mvme147s/shmsupp/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/mvme147s/shmsupp/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ 	(revision )
@@ -1,65 +1,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/mvme147s/shmsupp
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-PGM = ${ARCH}/shmsupp.rel
-
-# C source names, if any, go here -- minus the .c
-C_PIECES = addrconv getcfg lock mpisr
-C_FILES = $(C_PIECES:%=%.c)
-C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
-
-H_FILES =
-
-SRCS = $(C_FILES) $(H_FILES)
-OBJS = $(C_O_FILES)
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-DEFINES +=
-CPPFLAGS +=
-CFLAGS +=
-
-LD_PATHS +=
-LD_LIBS +=
-LDFLAGS +=
-
-#
-# Add your list of files to delete here.  The config files
-#  already know how to delete some stuff, so you may want
-#  to just run 'make clean' first to see what gets missed.
-#  'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS +=
-
-$(PGM): ${OBJS}
-	$(make-rel)
-
-all: ${ARCH} $(SRCS) $(PGM)
-
-# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
-install: all
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
Index: c/src/lib/libbsp/m68k/mvme147s/start/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/mvme147s/start/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/mvme147s/start/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/mvme147s/start
+top_builddir = ..
+subdir = start
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/mvme147s/startup/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/mvme147s/startup/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/mvme147s/startup/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/mvme147s/startup
+top_builddir = ..
+subdir = startup
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/mvme147s/timer/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/mvme147s/timer/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/mvme147s/timer/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/mvme147s/timer
+top_builddir = ..
+subdir = timer
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/mvme147s/wrapup/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/mvme147s/wrapup/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/mvme147s/wrapup/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/mvme147s/wrapup
+top_builddir = ..
+subdir = wrapup
 
 RTEMS_ROOT = @RTEMS_ROOT@
@@ -65,7 +65,4 @@
 	$(INSTALL_VARIANT) -m 644 $(LIB) $(PROJECT_RELEASE)/lib
 
-$(PROJECT_ROOT)/@RTEMS_BSP@/lib/bsp_specs: ../bsp_specs
-	$(INSTALL_DATA) $< $@
-
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
Index: c/src/lib/libbsp/m68k/mvme162/Makefile.am
===================================================================
--- c/src/lib/libbsp/m68k/mvme162/Makefile.am	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
+++ c/src/lib/libbsp/m68k/mvme162/Makefile.am	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -0,0 +1,25 @@
+## 
+## $Id$
+## 
+
+AUTOMAKE_OPTIONS = foreign 1.4
+ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
+
+# consolex is a predecessor of the termios and libchip concepts.
+# It is no longer being compiled into the source.
+# The MVME162 has 2 z8530's to yield four serial ports.
+# The application can access these by referencing the consolex driver
+# with "CONSOLEX_DRIVER_TABLE_ENTRY" in the driver table definition,
+# in place of "CONSOLE_DRIVER_TABLE_ENTRY".  See consolex/cTest.c for
+# an example.
+
+# wrapup is the one that actually builds and installs the library
+#  from the individual .rel files built in other directories
+SUBDIRS = . include start startup clock console timer tod wrapup
+
+include $(top_srcdir)/../../bsp.am
+
+EXTRA_DIST = bsp_specs times
+
+include $(top_srcdir)/../../../../../../automake/subdirs.am
+include $(top_srcdir)/../../../../../../automake/local.am
Index: c/src/lib/libbsp/m68k/mvme162/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/mvme162/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ 	(revision )
@@ -1,39 +1,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ../..
-subdir = m68k/mvme162
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/directory.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-
-SRCS = README
-
-# consolex is a predecessor of the termios and libchip concepts.
-# It is no longer being compiled into the source.
-# The MVME162 has 2 z8530's to yield four serial ports. 
-# The application can access these by referencing the consolex driver
-# with "CONSOLEX_DRIVER_TABLE_ENTRY" in the driver table definition,
-# in place of "CONSOLE_DRIVER_TABLE_ENTRY".  See consolex/cTest.c for
-# an example.
-
-# wrapup is the one that actually builds and installs the library
-#  from the individual .rel files built in other directories
-#
-# XXXX add tools
-SUBDIRS = include start startup clock console timer tod wrapup
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
Index: c/src/lib/libbsp/m68k/mvme162/clock/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/mvme162/clock/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/mvme162/clock/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/mvme162/clock
+top_builddir = ..
+subdir = clock
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/mvme162/configure.in
===================================================================
--- c/src/lib/libbsp/m68k/mvme162/configure.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
+++ c/src/lib/libbsp/m68k/mvme162/configure.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -0,0 +1,37 @@
+dnl Process this file with autoconf to produce a configure script.
+dnl
+dnl $Id$
+
+AC_PREREQ(2.13)
+AC_INIT(bsp_specs)
+RTEMS_TOP(../../../../../..)
+AC_CONFIG_AUX_DIR(../../../../../..)
+
+RTEMS_CANONICAL_TARGET_CPU
+AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-m68k-mvme162,$RTEMS_VERSION,no)
+AM_MAINTAINER_MODE
+
+RTEMS_ENABLE_LIBCDIR
+
+RTEMS_ENV_RTEMSBSP
+RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
+RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
+RTEMS_CANONICAL_HOST
+
+RTEMS_PROJECT_ROOT
+
+AC_CONFIG_SUBDIRS(tools)
+
+# Explicitly list a Makefile here 
+AC_OUTPUT( 
+Makefile
+clock/Makefile
+console/Makefile
+include/Makefile
+start/Makefile
+startup/Makefile
+timer/Makefile
+tod/Makefile
+wrapup/Makefile)
+
+## consolex/Makefile
Index: c/src/lib/libbsp/m68k/mvme162/console/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/mvme162/console/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/mvme162/console/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/mvme162/console
+top_builddir = ..
+subdir = console
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/mvme162/consolex/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/mvme162/consolex/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/mvme162/consolex/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/mvme162/consolex
+top_builddir = ..
+subdir = consolex
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/mvme162/include/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/mvme162/include/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/mvme162/include/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/mvme162/include
+top_builddir = ..
+subdir = include
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/mvme162/start/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/mvme162/start/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/mvme162/start/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/mvme162/start
+top_builddir = ..
+subdir = start
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/mvme162/startup/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/mvme162/startup/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/mvme162/startup/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/mvme162/startup
+top_builddir = ..
+subdir = startup
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/mvme162/timer/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/mvme162/timer/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/mvme162/timer/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/mvme162/timer
+top_builddir = ..
+subdir = timer
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/mvme162/tod/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/mvme162/tod/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/mvme162/tod/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/mvme162/tod
+top_builddir = ..
+subdir = tod
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/mvme162/wrapup/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/mvme162/wrapup/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/mvme162/wrapup/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/mvme162/wrapup
+top_builddir = ..
+subdir = wrapup
 
 RTEMS_ROOT = @RTEMS_ROOT@
@@ -63,7 +63,4 @@
 	$(INSTALL_VARIANT) -m 644 $(LIB) $(PROJECT_RELEASE)/lib
 
-$(PROJECT_ROOT)/@RTEMS_BSP@/lib/bsp_specs: ../bsp_specs
-	$(INSTALL_DATA) $< $@
-
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
Index: c/src/lib/libbsp/m68k/mvme167/Makefile.am
===================================================================
--- c/src/lib/libbsp/m68k/mvme167/Makefile.am	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
+++ c/src/lib/libbsp/m68k/mvme167/Makefile.am	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -0,0 +1,17 @@
+## 
+## $Id$
+## 
+
+AUTOMAKE_OPTIONS = foreign 1.4
+ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
+
+# wrapup is the one that actually builds and installs the library
+#  from the individual .rel files built in other directories
+SUBDIRS = . include start startup clock console fatal timer wrapup
+
+include $(top_srcdir)/../../bsp.am
+
+EXTRA_DIST = bsp_specs times
+
+include $(top_srcdir)/../../../../../../automake/subdirs.am
+include $(top_srcdir)/../../../../../../automake/local.am
Index: c/src/lib/libbsp/m68k/mvme167/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/mvme167/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ 	(revision )
@@ -1,29 +1,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ../..
-subdir = m68k/mvme167
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/directory.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-
-# wrapup is the one that actually builds and installs the library
-#  from the individual .rel files built in other directories
-# include subdir must be first, otherwise the header files will not
-#  be installed when the other files are compiled.
-SUBDIRS = include start startup clock console fatal timer wrapup
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
Index: c/src/lib/libbsp/m68k/mvme167/clock/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/mvme167/clock/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/mvme167/clock/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/mvme167/clock
+top_builddir = ..
+subdir = clock
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/mvme167/configure.in
===================================================================
--- c/src/lib/libbsp/m68k/mvme167/configure.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
+++ c/src/lib/libbsp/m68k/mvme167/configure.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -0,0 +1,33 @@
+dnl Process this file with autoconf to produce a configure script.
+dnl
+dnl $Id$
+
+AC_PREREQ(2.13)
+AC_INIT(bsp_specs)
+RTEMS_TOP(../../../../../..)
+AC_CONFIG_AUX_DIR(../../../../../..)
+
+RTEMS_CANONICAL_TARGET_CPU
+AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-m68k-mvme167,$RTEMS_VERSION,no)
+AM_MAINTAINER_MODE
+
+RTEMS_ENABLE_LIBCDIR
+
+RTEMS_ENV_RTEMSBSP
+RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
+RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
+RTEMS_CANONICAL_HOST
+
+RTEMS_PROJECT_ROOT
+
+# Explicitly list a Makefile here 
+AC_OUTPUT( 
+Makefile
+clock/Makefile
+console/Makefile
+fatal/Makefile
+include/Makefile
+start/Makefile
+startup/Makefile
+timer/Makefile
+wrapup/Makefile)
Index: c/src/lib/libbsp/m68k/mvme167/console/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/mvme167/console/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/mvme167/console/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/mvme167/console
+top_builddir = ..
+subdir = console
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/mvme167/fatal/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/mvme167/fatal/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/mvme167/fatal/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/mvme167/fatal
+top_builddir = ..
+subdir = fatal
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/mvme167/include/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/mvme167/include/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/mvme167/include/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/mvme167/include
+top_builddir = ..
+subdir = include
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/mvme167/start/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/mvme167/start/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/mvme167/start/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/mvme167/start
+top_builddir = ..
+subdir = start
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/mvme167/startup/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/mvme167/startup/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/mvme167/startup/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/mvme167/startup
+top_builddir = ..
+subdir = startup
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/mvme167/timer/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/mvme167/timer/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/mvme167/timer/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/mvme167/timer
+top_builddir = ..
+subdir = timer
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/mvme167/wrapup/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/mvme167/wrapup/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/mvme167/wrapup/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/mvme167/wrapup
+top_builddir = ..
+subdir = wrapup
 
 RTEMS_ROOT = @RTEMS_ROOT@
@@ -66,7 +66,4 @@
 	$(INSTALL_VARIANT) -m 644 $(LIB) $(PROJECT_RELEASE)/lib
 
-$(PROJECT_ROOT)/@RTEMS_BSP@/lib/bsp_specs: ../bsp_specs
-	$(INSTALL_DATA) $< $@
-
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
Index: c/src/lib/libbsp/m68k/ods68302/Makefile.am
===================================================================
--- c/src/lib/libbsp/m68k/ods68302/Makefile.am	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
+++ c/src/lib/libbsp/m68k/ods68302/Makefile.am	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -0,0 +1,17 @@
+## 
+## $Id$
+## 
+
+AUTOMAKE_OPTIONS = foreign 1.4
+ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
+
+# wrapup is the one that actually builds and installs the library
+#  from the individual .rel files built in other directories
+SUBDIRS = . include start startup clock console timer wrapup
+
+include $(top_srcdir)/../../bsp.am
+
+EXTRA_DIST = bsp_specs times
+
+include $(top_srcdir)/../../../../../../automake/subdirs.am
+include $(top_srcdir)/../../../../../../automake/local.am
Index: c/src/lib/libbsp/m68k/ods68302/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/ods68302/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ 	(revision )
@@ -1,31 +1,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ../..
-subdir = m68k/ods68302
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/directory.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-
-SRCS = README
-
-all: $(SRCS)
-
-# wrapup is the one that actually builds and installs the library
-#  from the individual .rel files built in other directories
-SUBDIRS = include start startup clock console timer wrapup
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
Index: c/src/lib/libbsp/m68k/ods68302/clock/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/ods68302/clock/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/ods68302/clock/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/ods68302/clock
+top_builddir = ..
+subdir = clock
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/ods68302/configure.in
===================================================================
--- c/src/lib/libbsp/m68k/ods68302/configure.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
+++ c/src/lib/libbsp/m68k/ods68302/configure.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -0,0 +1,32 @@
+dnl Process this file with autoconf to produce a configure script.
+dnl
+dnl $Id$
+
+AC_PREREQ(2.13)
+AC_INIT(bsp_specs)
+RTEMS_TOP(../../../../../..)
+AC_CONFIG_AUX_DIR(../../../../../..)
+
+RTEMS_CANONICAL_TARGET_CPU
+AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-m68k-ods68302,$RTEMS_VERSION,no)
+AM_MAINTAINER_MODE
+
+RTEMS_ENABLE_LIBCDIR
+
+RTEMS_ENV_RTEMSBSP
+RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
+RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
+RTEMS_CANONICAL_HOST
+
+RTEMS_PROJECT_ROOT
+
+# Explicitly list a Makefile here 
+AC_OUTPUT( 
+Makefile
+clock/Makefile
+console/Makefile
+include/Makefile
+start/Makefile
+startup/Makefile
+timer/Makefile
+wrapup/Makefile)
Index: c/src/lib/libbsp/m68k/ods68302/console/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/ods68302/console/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/ods68302/console/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/ods68302/console
+top_builddir = ..
+subdir = console
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/ods68302/include/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/ods68302/include/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/ods68302/include/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/ods68302/include
+top_builddir = ..
+subdir = include
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/ods68302/start/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/ods68302/start/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/ods68302/start/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/ods68302/start
+top_builddir = ..
+subdir = start
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/ods68302/startup/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/ods68302/startup/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/ods68302/startup/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/ods68302/startup
+top_builddir = ..
+subdir = startup
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/ods68302/timer/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/ods68302/timer/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/ods68302/timer/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/ods68302/timer
+top_builddir = ..
+subdir = timer
 
 RTEMS_ROOT = @RTEMS_ROOT@
Index: c/src/lib/libbsp/m68k/ods68302/wrapup/Makefile.in
===================================================================
--- c/src/lib/libbsp/m68k/ods68302/wrapup/Makefile.in	(revision 66fe6be6cd52c386a60ad77d5791198970d8495c)
+++ c/src/lib/libbsp/m68k/ods68302/wrapup/Makefile.in	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -6,6 +6,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/ods68302/wrapup
+top_builddir = ..
+subdir = wrapup
 
 RTEMS_ROOT = @RTEMS_ROOT@
@@ -57,7 +57,4 @@
 	$(INSTALL_VARIANT) -m 644 $(LIB) $(PROJECT_RELEASE)/lib
 
-$(PROJECT_ROOT)/@RTEMS_BSP@/lib/bsp_specs: ../bsp_specs
-	$(INSTALL_DATA) $< $@
-
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
Index: c/src/lib/libbsp/m68k/shared/Makefile.am
===================================================================
--- c/src/lib/libbsp/m68k/shared/Makefile.am	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
+++ c/src/lib/libbsp/m68k/shared/Makefile.am	(revision 7068e2465b84ff1561ae556a597efed94c86ec2e)
@@ -0,0 +1,12 @@
+##
+## $Id$
+##
+
+AUTOMAKE_OPTIONS = foreign 1.4
+
+C_FILES = setvec.c
+S_FILES = start.S
+
+EXTRA_DIST = $(C_FILES) $(S_FILES)
+
+include $(top_srcdir)/../../../../../automake/local.am
