summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2000-01-10 18:10:59 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2000-01-10 18:10:59 +0000
commit362ec23ed72f6fedb1cc78dc867727a75552d9e2 (patch)
tree7e42e44b17a9bba1644c218cb9a4873c683251e0
parentf9b48de90eddf65dbb9c85bc634d88448ac6e652 (diff)
downloadrtems-362ec23ed72f6fedb1cc78dc867727a75552d9e2.tar.bz2
Patch rtems-rc-20000104-12.diff from Ralf Corsepius <corsepiu@faw.uni-ulm.de>
which converts the PowerPC BSPs to configuration and more automake. * Besides adding partial automake support, rsp converting all powerpc BSPs to make them compliant to the new configuration scheme, this patch attempts to fix several configuration bugs in powerpc related Makefiles.
-rw-r--r--c/src/lib/libbsp/powerpc/Makefile.am12
-rw-r--r--c/src/lib/libbsp/powerpc/Makefile.in26
-rw-r--r--c/src/lib/libbsp/powerpc/configure.in40
-rw-r--r--c/src/lib/libbsp/powerpc/dmv177/Makefile.in18
-rw-r--r--c/src/lib/libbsp/powerpc/dmv177/clock/Makefile.in4
-rw-r--r--c/src/lib/libbsp/powerpc/dmv177/configure.in57
-rw-r--r--c/src/lib/libbsp/powerpc/dmv177/console/Makefile.in4
-rw-r--r--c/src/lib/libbsp/powerpc/dmv177/include/Makefile.in4
-rw-r--r--c/src/lib/libbsp/powerpc/dmv177/scv64/Makefile.in4
-rw-r--r--c/src/lib/libbsp/powerpc/dmv177/sonic/Makefile.in4
-rw-r--r--c/src/lib/libbsp/powerpc/dmv177/start/Makefile.in4
-rw-r--r--c/src/lib/libbsp/powerpc/dmv177/startup/Makefile.in4
-rw-r--r--c/src/lib/libbsp/powerpc/dmv177/timer/Makefile.in4
-rw-r--r--c/src/lib/libbsp/powerpc/dmv177/tod/Makefile.in4
-rw-r--r--c/src/lib/libbsp/powerpc/dmv177/wrapup/Makefile.in4
-rw-r--r--c/src/lib/libbsp/powerpc/eth_comm/Makefile.in18
-rw-r--r--c/src/lib/libbsp/powerpc/eth_comm/canbus/Makefile.in4
-rw-r--r--c/src/lib/libbsp/powerpc/eth_comm/configure.in57
-rw-r--r--c/src/lib/libbsp/powerpc/eth_comm/console/Makefile.in4
-rw-r--r--c/src/lib/libbsp/powerpc/eth_comm/include/Makefile.in4
-rw-r--r--c/src/lib/libbsp/powerpc/eth_comm/network/Makefile.in4
-rw-r--r--c/src/lib/libbsp/powerpc/eth_comm/start/Makefile.in4
-rw-r--r--c/src/lib/libbsp/powerpc/eth_comm/startup/Makefile.in4
-rw-r--r--c/src/lib/libbsp/powerpc/eth_comm/wrapup/Makefile.in6
-rw-r--r--c/src/lib/libbsp/powerpc/helas403/Makefile.in18
-rw-r--r--c/src/lib/libbsp/powerpc/helas403/configure.in57
-rw-r--r--c/src/lib/libbsp/powerpc/helas403/dlentry/Makefile.in4
-rw-r--r--c/src/lib/libbsp/powerpc/helas403/flashentry/Makefile.in4
-rw-r--r--c/src/lib/libbsp/powerpc/helas403/include/Makefile.in4
-rw-r--r--c/src/lib/libbsp/powerpc/helas403/startup/Makefile.in4
-rw-r--r--c/src/lib/libbsp/powerpc/helas403/wrapup/Makefile.in6
-rw-r--r--c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.in18
-rw-r--r--c/src/lib/libbsp/powerpc/motorola_powerpc/bootloader/Makefile.in7
-rw-r--r--c/src/lib/libbsp/powerpc/motorola_powerpc/clock/Makefile.in4
-rw-r--r--c/src/lib/libbsp/powerpc/motorola_powerpc/configure.in57
-rw-r--r--c/src/lib/libbsp/powerpc/motorola_powerpc/console/Makefile.in4
-rw-r--r--c/src/lib/libbsp/powerpc/motorola_powerpc/include/Makefile.in8
-rw-r--r--c/src/lib/libbsp/powerpc/motorola_powerpc/irq/Makefile.in4
-rw-r--r--c/src/lib/libbsp/powerpc/motorola_powerpc/motorola/Makefile.in4
-rw-r--r--c/src/lib/libbsp/powerpc/motorola_powerpc/openpic/Makefile.in4
-rw-r--r--c/src/lib/libbsp/powerpc/motorola_powerpc/pci/Makefile.in4
-rw-r--r--c/src/lib/libbsp/powerpc/motorola_powerpc/residual/Makefile.in4
-rw-r--r--c/src/lib/libbsp/powerpc/motorola_powerpc/start/Makefile.in4
-rw-r--r--c/src/lib/libbsp/powerpc/motorola_powerpc/startup/Makefile.in7
-rw-r--r--c/src/lib/libbsp/powerpc/motorola_powerpc/vectors/Makefile.in4
-rw-r--r--c/src/lib/libbsp/powerpc/motorola_powerpc/wrapup/Makefile.in8
-rw-r--r--c/src/lib/libbsp/powerpc/papyrus/Makefile.in18
-rw-r--r--c/src/lib/libbsp/powerpc/papyrus/configure.in57
-rw-r--r--c/src/lib/libbsp/powerpc/papyrus/dlentry/Makefile.in4
-rw-r--r--c/src/lib/libbsp/powerpc/papyrus/flashentry/Makefile.in4
-rw-r--r--c/src/lib/libbsp/powerpc/papyrus/include/Makefile.in4
-rw-r--r--c/src/lib/libbsp/powerpc/papyrus/startup/Makefile.in4
-rw-r--r--c/src/lib/libbsp/powerpc/papyrus/wrapup/Makefile.in6
-rw-r--r--c/src/lib/libbsp/powerpc/ppcn_60x/Makefile.in18
-rw-r--r--c/src/lib/libbsp/powerpc/ppcn_60x/clock/Makefile.in4
-rw-r--r--c/src/lib/libbsp/powerpc/ppcn_60x/configure.in57
-rw-r--r--c/src/lib/libbsp/powerpc/ppcn_60x/console/Makefile.in4
-rw-r--r--c/src/lib/libbsp/powerpc/ppcn_60x/include/Makefile.in4
-rw-r--r--c/src/lib/libbsp/powerpc/ppcn_60x/network/Makefile.in4
-rw-r--r--c/src/lib/libbsp/powerpc/ppcn_60x/nvram/Makefile.in4
-rw-r--r--c/src/lib/libbsp/powerpc/ppcn_60x/pci/Makefile.in4
-rw-r--r--c/src/lib/libbsp/powerpc/ppcn_60x/start/Makefile.in4
-rw-r--r--c/src/lib/libbsp/powerpc/ppcn_60x/startup/Makefile.in4
-rw-r--r--c/src/lib/libbsp/powerpc/ppcn_60x/timer/Makefile.in4
-rw-r--r--c/src/lib/libbsp/powerpc/ppcn_60x/tod/Makefile.in4
-rw-r--r--c/src/lib/libbsp/powerpc/ppcn_60x/universe/Makefile.in4
-rw-r--r--c/src/lib/libbsp/powerpc/ppcn_60x/vectors/Makefile.in4
-rw-r--r--c/src/lib/libbsp/powerpc/ppcn_60x/wrapup/Makefile.in4
-rw-r--r--c/src/lib/libbsp/powerpc/psim/Makefile.in22
-rw-r--r--c/src/lib/libbsp/powerpc/psim/clock/Makefile.in4
-rw-r--r--c/src/lib/libbsp/powerpc/psim/configure.in57
-rw-r--r--c/src/lib/libbsp/powerpc/psim/console/Makefile.in4
-rw-r--r--c/src/lib/libbsp/powerpc/psim/include/Makefile.in4
-rw-r--r--c/src/lib/libbsp/powerpc/psim/shmsupp/Makefile.in4
-rw-r--r--c/src/lib/libbsp/powerpc/psim/start/Makefile.in4
-rw-r--r--c/src/lib/libbsp/powerpc/psim/startup/Makefile.in4
-rw-r--r--c/src/lib/libbsp/powerpc/psim/timer/Makefile.in4
-rw-r--r--c/src/lib/libbsp/powerpc/psim/vectors/Makefile.in4
-rw-r--r--c/src/lib/libbsp/powerpc/psim/wrapup/Makefile.in4
-rw-r--r--c/src/lib/libbsp/powerpc/score603e/Makefile.in18
-rw-r--r--c/src/lib/libbsp/powerpc/score603e/PCI_bus/Makefile.in4
-rw-r--r--c/src/lib/libbsp/powerpc/score603e/clock/Makefile.in4
-rw-r--r--c/src/lib/libbsp/powerpc/score603e/configure.in57
-rw-r--r--c/src/lib/libbsp/powerpc/score603e/console/Makefile.in4
-rw-r--r--c/src/lib/libbsp/powerpc/score603e/include/Makefile.in4
-rw-r--r--c/src/lib/libbsp/powerpc/score603e/start/Makefile.in4
-rw-r--r--c/src/lib/libbsp/powerpc/score603e/startup/Makefile.in4
-rw-r--r--c/src/lib/libbsp/powerpc/score603e/timer/Makefile.in4
-rw-r--r--c/src/lib/libbsp/powerpc/score603e/tod/Makefile.in4
-rw-r--r--c/src/lib/libbsp/powerpc/score603e/vectors/Makefile.in4
-rw-r--r--c/src/lib/libbsp/powerpc/score603e/wrapup/Makefile.in4
-rw-r--r--c/src/lib/libbsp/powerpc/shared/Makefile.am11
-rw-r--r--c/src/lib/libbsp/powerpc/shared/Makefile.in36
-rw-r--r--c/src/lib/libbsp/powerpc/shared/bootloader/Makefile.am21
-rw-r--r--c/src/lib/libbsp/powerpc/shared/bootloader/Makefile.in44
-rw-r--r--c/src/lib/libbsp/powerpc/shared/clock/Makefile.am11
-rw-r--r--c/src/lib/libbsp/powerpc/shared/clock/Makefile.in38
-rw-r--r--c/src/lib/libbsp/powerpc/shared/console/Makefile.am24
-rw-r--r--c/src/lib/libbsp/powerpc/shared/console/Makefile.in48
-rw-r--r--c/src/lib/libbsp/powerpc/shared/include/Makefile.am10
-rw-r--r--c/src/lib/libbsp/powerpc/shared/include/Makefile.in48
-rw-r--r--c/src/lib/libbsp/powerpc/shared/irq/Makefile.am25
-rw-r--r--c/src/lib/libbsp/powerpc/shared/irq/Makefile.in41
-rw-r--r--c/src/lib/libbsp/powerpc/shared/motorola/Makefile.am23
-rw-r--r--c/src/lib/libbsp/powerpc/shared/motorola/Makefile.in41
-rw-r--r--c/src/lib/libbsp/powerpc/shared/openpic/Makefile.am23
-rw-r--r--c/src/lib/libbsp/powerpc/shared/openpic/Makefile.in42
-rw-r--r--c/src/lib/libbsp/powerpc/shared/pci/Makefile.am23
-rw-r--r--c/src/lib/libbsp/powerpc/shared/pci/Makefile.in42
-rw-r--r--c/src/lib/libbsp/powerpc/shared/residual/Makefile.am23
-rw-r--r--c/src/lib/libbsp/powerpc/shared/residual/Makefile.in50
-rw-r--r--c/src/lib/libbsp/powerpc/shared/start/Makefile.am11
-rw-r--r--c/src/lib/libbsp/powerpc/shared/start/Makefile.in29
-rw-r--r--c/src/lib/libbsp/powerpc/shared/startup/Makefile.am13
-rw-r--r--c/src/lib/libbsp/powerpc/shared/startup/Makefile.in35
-rw-r--r--c/src/lib/libbsp/powerpc/shared/vectors/Makefile.am25
-rw-r--r--c/src/lib/libbsp/powerpc/shared/vectors/Makefile.in39
117 files changed, 1028 insertions, 738 deletions
diff --git a/c/src/lib/libbsp/powerpc/Makefile.am b/c/src/lib/libbsp/powerpc/Makefile.am
new file mode 100644
index 0000000000..aa7543aa89
--- /dev/null
+++ b/c/src/lib/libbsp/powerpc/Makefile.am
@@ -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
diff --git a/c/src/lib/libbsp/powerpc/Makefile.in b/c/src/lib/libbsp/powerpc/Makefile.in
deleted file mode 100644
index 25b0558fb0..0000000000
--- a/c/src/lib/libbsp/powerpc/Makefile.in
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ..
-subdir = powerpc
-
-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
diff --git a/c/src/lib/libbsp/powerpc/configure.in b/c/src/lib/libbsp/powerpc/configure.in
new file mode 100644
index 0000000000..77835eaf26
--- /dev/null
+++ b/c/src/lib/libbsp/powerpc/configure.in
@@ -0,0 +1,40 @@
+dnl Process this file with autoconf to produce a configure script.
+dnl
+dnl $Id$
+
+AC_PREREQ(2.13)
+AC_INIT(dmv177)
+RTEMS_TOP(../../../../..)
+AC_CONFIG_AUX_DIR(../../../../..)
+
+RTEMS_CANONICAL_TARGET_CPU
+AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-powerpc,$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
+shared/bootloader/Makefile
+shared/clock/Makefile
+shared/console/Makefile
+shared/include/Makefile
+shared/irq/Makefile
+shared/motorola/Makefile
+shared/openpic/Makefile
+shared/pci/Makefile
+shared/residual/Makefile
+shared/start/Makefile
+shared/startup/Makefile
+shared/vectors/Makefile)
diff --git a/c/src/lib/libbsp/powerpc/dmv177/Makefile.in b/c/src/lib/libbsp/powerpc/dmv177/Makefile.in
index 9297d39f94..fe17a37367 100644
--- a/c/src/lib/libbsp/powerpc/dmv177/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/dmv177/Makefile.in
@@ -5,8 +5,12 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../..
-subdir = powerpc/dmv177
+top_builddir = .
+
+ACLOCAL = aclocal
+AUTOCONF = autoconf
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ACLOCAL_AMFLAGS = -I @RTEMS_TOPdir@/aclocal
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
@@ -33,4 +37,12 @@ SUBDIRS = include clock console startup start timer scv64 tod \
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+ && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in
+ cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+
+config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ $(SHELL) ./config.status --recheck
+$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4)
+ cd $(srcdir) && $(AUTOCONF)
diff --git a/c/src/lib/libbsp/powerpc/dmv177/clock/Makefile.in b/c/src/lib/libbsp/powerpc/dmv177/clock/Makefile.in
index 955f3da65d..643805ea48 100644
--- a/c/src/lib/libbsp/powerpc/dmv177/clock/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/dmv177/clock/Makefile.in
@@ -5,8 +5,8 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/dmv177/clock
+top_builddir = ..
+subdir = clock
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
diff --git a/c/src/lib/libbsp/powerpc/dmv177/configure.in b/c/src/lib/libbsp/powerpc/dmv177/configure.in
new file mode 100644
index 0000000000..0b6351347d
--- /dev/null
+++ b/c/src/lib/libbsp/powerpc/dmv177/configure.in
@@ -0,0 +1,57 @@
+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
+AC_PROG_MAKE_SET
+AC_PROG_INSTALL
+AM_MAINTAINER_MODE
+
+RTEMS_ENABLE_MULTIPROCESSING
+RTEMS_ENABLE_NETWORKING
+RTEMS_ENABLE_LIBCDIR
+
+RTEMS_ENV_RTEMSBSP
+
+RTEMS_CHECK_CPU
+RTEMS_CANONICAL_HOST
+
+RTEMS_PROJECT_ROOT
+
+dnl check target cc
+RTEMS_PROG_CC_FOR_TARGET
+RTEMS_CANONICALIZE_TOOLS
+
+RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
+RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP)
+RTEMS_CHECK_NETWORKING(RTEMS_BSP)
+
+# find all the Makefiles for the BSPs
+RTEMS_CHECK_MAKEFILE(.)
+
+# HACK: sed out bsp-tools from makefiles
+t="tools"
+if test -d "$srcdir/$t"; then
+ bsptools_cfgdirs="$bsptools_cfgdirs $t"
+ makefiles=`echo "$makefiles" | sed -e "s%.*$t/.*Makefile%%g"`
+fi
+
+if test "$HAS_MP" = "yes"; then
+:
+else
+ # HACK: sed out shmsupp/Makefile from makefiles
+ t="shmsupp"
+ makefiles=`echo "$makefiles" | sed -e "s%.*$t/.*Makefile%%g"`
+fi
+AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes")
+
+AC_CONFIG_SUBDIRS($bsptools_cfgdirs)
+
+# try to explicitly list a Makefile here
+AC_OUTPUT(
+$makefiles)
diff --git a/c/src/lib/libbsp/powerpc/dmv177/console/Makefile.in b/c/src/lib/libbsp/powerpc/dmv177/console/Makefile.in
index 0aa9c5e725..066e4958a6 100644
--- a/c/src/lib/libbsp/powerpc/dmv177/console/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/dmv177/console/Makefile.in
@@ -5,8 +5,8 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/dmv177/console
+top_builddir = ..
+subdir = console
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
diff --git a/c/src/lib/libbsp/powerpc/dmv177/include/Makefile.in b/c/src/lib/libbsp/powerpc/dmv177/include/Makefile.in
index b97fb95f6f..44dea341e7 100644
--- a/c/src/lib/libbsp/powerpc/dmv177/include/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/dmv177/include/Makefile.in
@@ -5,8 +5,8 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/dmv177/include
+top_builddir = ..
+subdir = include
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
diff --git a/c/src/lib/libbsp/powerpc/dmv177/scv64/Makefile.in b/c/src/lib/libbsp/powerpc/dmv177/scv64/Makefile.in
index f303a25dc6..53a1bf210b 100644
--- a/c/src/lib/libbsp/powerpc/dmv177/scv64/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/dmv177/scv64/Makefile.in
@@ -5,8 +5,8 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/dmv177/scv64
+top_builddir = ..
+subdir = scv64
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
diff --git a/c/src/lib/libbsp/powerpc/dmv177/sonic/Makefile.in b/c/src/lib/libbsp/powerpc/dmv177/sonic/Makefile.in
index e0ce5fb7dc..2bd3f0fcd4 100644
--- a/c/src/lib/libbsp/powerpc/dmv177/sonic/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/dmv177/sonic/Makefile.in
@@ -5,8 +5,8 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/dmv177/sonic
+top_builddir = ..
+subdir = sonic
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
diff --git a/c/src/lib/libbsp/powerpc/dmv177/start/Makefile.in b/c/src/lib/libbsp/powerpc/dmv177/start/Makefile.in
index 666647d7a7..e22c3d3ba7 100644
--- a/c/src/lib/libbsp/powerpc/dmv177/start/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/dmv177/start/Makefile.in
@@ -5,8 +5,8 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/dmv177/start
+top_builddir = ..
+subdir = start
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
diff --git a/c/src/lib/libbsp/powerpc/dmv177/startup/Makefile.in b/c/src/lib/libbsp/powerpc/dmv177/startup/Makefile.in
index 1f81024852..f060a25721 100644
--- a/c/src/lib/libbsp/powerpc/dmv177/startup/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/dmv177/startup/Makefile.in
@@ -5,8 +5,8 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/dmv177/startup
+top_builddir = ..
+subdir = startup
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
diff --git a/c/src/lib/libbsp/powerpc/dmv177/timer/Makefile.in b/c/src/lib/libbsp/powerpc/dmv177/timer/Makefile.in
index cb4f76864e..fbad29fdbc 100644
--- a/c/src/lib/libbsp/powerpc/dmv177/timer/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/dmv177/timer/Makefile.in
@@ -5,8 +5,8 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/dmv177/timer
+top_builddir = ..
+subdir = timer
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
diff --git a/c/src/lib/libbsp/powerpc/dmv177/tod/Makefile.in b/c/src/lib/libbsp/powerpc/dmv177/tod/Makefile.in
index 4044f98462..3275aec0dd 100644
--- a/c/src/lib/libbsp/powerpc/dmv177/tod/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/dmv177/tod/Makefile.in
@@ -5,8 +5,8 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/dmv177/tod
+top_builddir = ..
+subdir = tod
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
diff --git a/c/src/lib/libbsp/powerpc/dmv177/wrapup/Makefile.in b/c/src/lib/libbsp/powerpc/dmv177/wrapup/Makefile.in
index 00ac210122..b9a03b583d 100644
--- a/c/src/lib/libbsp/powerpc/dmv177/wrapup/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/dmv177/wrapup/Makefile.in
@@ -5,8 +5,8 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/dmv177/wrapup
+top_builddir = ..
+subdir = wrapup
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
diff --git a/c/src/lib/libbsp/powerpc/eth_comm/Makefile.in b/c/src/lib/libbsp/powerpc/eth_comm/Makefile.in
index ad67de8883..b52e2d5ea3 100644
--- a/c/src/lib/libbsp/powerpc/eth_comm/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/eth_comm/Makefile.in
@@ -5,8 +5,12 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../..
-subdir = powerpc/eth_comm
+top_builddir = .
+
+ACLOCAL = aclocal
+AUTOCONF = autoconf
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ACLOCAL_AMFLAGS = -I @RTEMS_TOPdir@/aclocal
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
@@ -32,4 +36,12 @@ SUBDIRS = include startup start canbus console $(NETWORKING_DRIVER) wrapup
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+ && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in
+ cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+
+config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ $(SHELL) ./config.status --recheck
+$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4)
+ cd $(srcdir) && $(AUTOCONF)
diff --git a/c/src/lib/libbsp/powerpc/eth_comm/canbus/Makefile.in b/c/src/lib/libbsp/powerpc/eth_comm/canbus/Makefile.in
index 97eb820791..59210f05a1 100644
--- a/c/src/lib/libbsp/powerpc/eth_comm/canbus/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/eth_comm/canbus/Makefile.in
@@ -5,8 +5,8 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/eth_comm/canbus
+top_builddir = ..
+subdir = canbus
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
diff --git a/c/src/lib/libbsp/powerpc/eth_comm/configure.in b/c/src/lib/libbsp/powerpc/eth_comm/configure.in
new file mode 100644
index 0000000000..0b6351347d
--- /dev/null
+++ b/c/src/lib/libbsp/powerpc/eth_comm/configure.in
@@ -0,0 +1,57 @@
+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
+AC_PROG_MAKE_SET
+AC_PROG_INSTALL
+AM_MAINTAINER_MODE
+
+RTEMS_ENABLE_MULTIPROCESSING
+RTEMS_ENABLE_NETWORKING
+RTEMS_ENABLE_LIBCDIR
+
+RTEMS_ENV_RTEMSBSP
+
+RTEMS_CHECK_CPU
+RTEMS_CANONICAL_HOST
+
+RTEMS_PROJECT_ROOT
+
+dnl check target cc
+RTEMS_PROG_CC_FOR_TARGET
+RTEMS_CANONICALIZE_TOOLS
+
+RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
+RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP)
+RTEMS_CHECK_NETWORKING(RTEMS_BSP)
+
+# find all the Makefiles for the BSPs
+RTEMS_CHECK_MAKEFILE(.)
+
+# HACK: sed out bsp-tools from makefiles
+t="tools"
+if test -d "$srcdir/$t"; then
+ bsptools_cfgdirs="$bsptools_cfgdirs $t"
+ makefiles=`echo "$makefiles" | sed -e "s%.*$t/.*Makefile%%g"`
+fi
+
+if test "$HAS_MP" = "yes"; then
+:
+else
+ # HACK: sed out shmsupp/Makefile from makefiles
+ t="shmsupp"
+ makefiles=`echo "$makefiles" | sed -e "s%.*$t/.*Makefile%%g"`
+fi
+AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes")
+
+AC_CONFIG_SUBDIRS($bsptools_cfgdirs)
+
+# try to explicitly list a Makefile here
+AC_OUTPUT(
+$makefiles)
diff --git a/c/src/lib/libbsp/powerpc/eth_comm/console/Makefile.in b/c/src/lib/libbsp/powerpc/eth_comm/console/Makefile.in
index c2c8b87d4b..810a0a40a1 100644
--- a/c/src/lib/libbsp/powerpc/eth_comm/console/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/eth_comm/console/Makefile.in
@@ -5,8 +5,8 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/eth_comm/console
+top_builddir = ..
+subdir = console
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
diff --git a/c/src/lib/libbsp/powerpc/eth_comm/include/Makefile.in b/c/src/lib/libbsp/powerpc/eth_comm/include/Makefile.in
index 843c3614d0..2f69e11804 100644
--- a/c/src/lib/libbsp/powerpc/eth_comm/include/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/eth_comm/include/Makefile.in
@@ -5,8 +5,8 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/eth_comm/include
+top_builddir = ..
+subdir = include
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
diff --git a/c/src/lib/libbsp/powerpc/eth_comm/network/Makefile.in b/c/src/lib/libbsp/powerpc/eth_comm/network/Makefile.in
index 06b2475822..15506dfd03 100644
--- a/c/src/lib/libbsp/powerpc/eth_comm/network/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/eth_comm/network/Makefile.in
@@ -5,8 +5,8 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/eth_comm/network
+top_builddir = ..
+subdir = network
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
diff --git a/c/src/lib/libbsp/powerpc/eth_comm/start/Makefile.in b/c/src/lib/libbsp/powerpc/eth_comm/start/Makefile.in
index 77f5be4b45..722a6ed21b 100644
--- a/c/src/lib/libbsp/powerpc/eth_comm/start/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/eth_comm/start/Makefile.in
@@ -5,8 +5,8 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/eth_comm/start
+top_builddir = ..
+subdir = start
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
diff --git a/c/src/lib/libbsp/powerpc/eth_comm/startup/Makefile.in b/c/src/lib/libbsp/powerpc/eth_comm/startup/Makefile.in
index 0067135692..79759c63f6 100644
--- a/c/src/lib/libbsp/powerpc/eth_comm/startup/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/eth_comm/startup/Makefile.in
@@ -5,8 +5,8 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/eth_comm/startup
+top_builddir = ..
+subdir = startup
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
diff --git a/c/src/lib/libbsp/powerpc/eth_comm/wrapup/Makefile.in b/c/src/lib/libbsp/powerpc/eth_comm/wrapup/Makefile.in
index 3f3ee8d796..b94f64e474 100644
--- a/c/src/lib/libbsp/powerpc/eth_comm/wrapup/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/eth_comm/wrapup/Makefile.in
@@ -5,8 +5,8 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/eth_comm/wrapup
+top_builddir = ..
+subdir = wrapup
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
@@ -20,7 +20,7 @@ NETWORKING_DRIVER = $(NETWORKING_DRIVER_$(HAS_NETWORKING)_V)
BSP_PIECES = startup start canbus console $(NETWORKING_DRIVER)
# pieces to pick up out of libcpu/ppc
# CPU_PIECES = mpc860/clock mpc860/timer mpc860/console-generic mpc860/vectors
-CPU_PIECES =
+CPU_PIECES =
GENERIC_PIECES =
# bummer; have to use $foreach since % pattern subst rules only replace 1x
diff --git a/c/src/lib/libbsp/powerpc/helas403/Makefile.in b/c/src/lib/libbsp/powerpc/helas403/Makefile.in
index 9866c145a9..c1cb2d8b2f 100644
--- a/c/src/lib/libbsp/powerpc/helas403/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/helas403/Makefile.in
@@ -5,8 +5,12 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../..
-subdir = powerpc/helas403
+top_builddir = .
+
+ACLOCAL = aclocal
+AUTOCONF = autoconf
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ACLOCAL_AMFLAGS = -I @RTEMS_TOPdir@/aclocal
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
@@ -28,4 +32,12 @@ SUBDIRS = include dlentry flashentry startup wrapup
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+ && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in
+ cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+
+config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ $(SHELL) ./config.status --recheck
+$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4)
+ cd $(srcdir) && $(AUTOCONF)
diff --git a/c/src/lib/libbsp/powerpc/helas403/configure.in b/c/src/lib/libbsp/powerpc/helas403/configure.in
new file mode 100644
index 0000000000..0b6351347d
--- /dev/null
+++ b/c/src/lib/libbsp/powerpc/helas403/configure.in
@@ -0,0 +1,57 @@
+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
+AC_PROG_MAKE_SET
+AC_PROG_INSTALL
+AM_MAINTAINER_MODE
+
+RTEMS_ENABLE_MULTIPROCESSING
+RTEMS_ENABLE_NETWORKING
+RTEMS_ENABLE_LIBCDIR
+
+RTEMS_ENV_RTEMSBSP
+
+RTEMS_CHECK_CPU
+RTEMS_CANONICAL_HOST
+
+RTEMS_PROJECT_ROOT
+
+dnl check target cc
+RTEMS_PROG_CC_FOR_TARGET
+RTEMS_CANONICALIZE_TOOLS
+
+RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
+RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP)
+RTEMS_CHECK_NETWORKING(RTEMS_BSP)
+
+# find all the Makefiles for the BSPs
+RTEMS_CHECK_MAKEFILE(.)
+
+# HACK: sed out bsp-tools from makefiles
+t="tools"
+if test -d "$srcdir/$t"; then
+ bsptools_cfgdirs="$bsptools_cfgdirs $t"
+ makefiles=`echo "$makefiles" | sed -e "s%.*$t/.*Makefile%%g"`
+fi
+
+if test "$HAS_MP" = "yes"; then
+:
+else
+ # HACK: sed out shmsupp/Makefile from makefiles
+ t="shmsupp"
+ makefiles=`echo "$makefiles" | sed -e "s%.*$t/.*Makefile%%g"`
+fi
+AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes")
+
+AC_CONFIG_SUBDIRS($bsptools_cfgdirs)
+
+# try to explicitly list a Makefile here
+AC_OUTPUT(
+$makefiles)
diff --git a/c/src/lib/libbsp/powerpc/helas403/dlentry/Makefile.in b/c/src/lib/libbsp/powerpc/helas403/dlentry/Makefile.in
index 16c188d93c..dc19dc41b0 100644
--- a/c/src/lib/libbsp/powerpc/helas403/dlentry/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/helas403/dlentry/Makefile.in
@@ -5,8 +5,8 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/helas403/dlentry
+top_builddir = ..
+subdir = dlentry
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
diff --git a/c/src/lib/libbsp/powerpc/helas403/flashentry/Makefile.in b/c/src/lib/libbsp/powerpc/helas403/flashentry/Makefile.in
index 4f713b011b..00064c79af 100644
--- a/c/src/lib/libbsp/powerpc/helas403/flashentry/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/helas403/flashentry/Makefile.in
@@ -5,8 +5,8 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/helas403/flashentry
+top_builddir = ..
+subdir = flashentry
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
diff --git a/c/src/lib/libbsp/powerpc/helas403/include/Makefile.in b/c/src/lib/libbsp/powerpc/helas403/include/Makefile.in
index 40c789094f..e8c70a72e0 100644
--- a/c/src/lib/libbsp/powerpc/helas403/include/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/helas403/include/Makefile.in
@@ -5,8 +5,8 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/helas403/include
+top_builddir = ..
+subdir = include
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
diff --git a/c/src/lib/libbsp/powerpc/helas403/startup/Makefile.in b/c/src/lib/libbsp/powerpc/helas403/startup/Makefile.in
index 2d8a716595..94b1b170e4 100644
--- a/c/src/lib/libbsp/powerpc/helas403/startup/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/helas403/startup/Makefile.in
@@ -5,8 +5,8 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/helas403/startup
+top_builddir = ..
+subdir = startup
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
diff --git a/c/src/lib/libbsp/powerpc/helas403/wrapup/Makefile.in b/c/src/lib/libbsp/powerpc/helas403/wrapup/Makefile.in
index 2145e07463..f923bdce73 100644
--- a/c/src/lib/libbsp/powerpc/helas403/wrapup/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/helas403/wrapup/Makefile.in
@@ -5,8 +5,8 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/helas403/wrapup
+top_builddir = ..
+subdir = wrapup
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
@@ -17,7 +17,7 @@ BSP_PIECES = startup dlentry flashentry
# pieces to pick up out of libcpu/ppc
# CPU_PIECES = ppc403/clock ppc403/timer ppc403/console ppc403/vectors \
# ppc403/ictrl
-CPU_PIECES =
+CPU_PIECES =
GENERIC_PIECES =
# bummer; have to use $foreach since % pattern subst rules only replace 1x
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.in b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.in
index 8546f0c6cb..50c4992d94 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.in
@@ -5,8 +5,12 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../..
-subdir = powerpc/mcp750
+top_builddir = .
+
+ACLOCAL = aclocal
+AUTOCONF = autoconf
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ACLOCAL_AMFLAGS = -I @RTEMS_TOPdir@/aclocal
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
@@ -29,4 +33,12 @@ SUBDIRS = clock console include pci residual openpic irq vectors start \
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+ && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in
+ cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+
+config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ $(SHELL) ./config.status --recheck
+$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4)
+ cd $(srcdir) && $(AUTOCONF)
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/bootloader/Makefile.in b/c/src/lib/libbsp/powerpc/motorola_powerpc/bootloader/Makefile.in
index 86ca29151d..a03db9e1d7 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/bootloader/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/bootloader/Makefile.in
@@ -5,13 +5,14 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/mcp750/bootloader
+top_builddir = ..
+subdir = bootloader
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
-VPATH = @srcdir@:@srcdir@/../../../shared:@srcdir@/../../shared/console:@srcdir@/../../shared/bootloader
+VPATH = \
+ @srcdir@:@srcdir@/../../../shared:@srcdir@/../../shared/console:@srcdir@/../../shared/bootloader
# C source names, if any, go here -- minus the .c
C_PIECES = misc pci zlib mm em86 polled_io lib
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/clock/Makefile.in b/c/src/lib/libbsp/powerpc/motorola_powerpc/clock/Makefile.in
index 4490d4b392..0075dce239 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/clock/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/clock/Makefile.in
@@ -5,8 +5,8 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/mcp750/clock
+top_builddir = ..
+subdir = clock
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/configure.in b/c/src/lib/libbsp/powerpc/motorola_powerpc/configure.in
new file mode 100644
index 0000000000..0b6351347d
--- /dev/null
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/configure.in
@@ -0,0 +1,57 @@
+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
+AC_PROG_MAKE_SET
+AC_PROG_INSTALL
+AM_MAINTAINER_MODE
+
+RTEMS_ENABLE_MULTIPROCESSING
+RTEMS_ENABLE_NETWORKING
+RTEMS_ENABLE_LIBCDIR
+
+RTEMS_ENV_RTEMSBSP
+
+RTEMS_CHECK_CPU
+RTEMS_CANONICAL_HOST
+
+RTEMS_PROJECT_ROOT
+
+dnl check target cc
+RTEMS_PROG_CC_FOR_TARGET
+RTEMS_CANONICALIZE_TOOLS
+
+RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
+RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP)
+RTEMS_CHECK_NETWORKING(RTEMS_BSP)
+
+# find all the Makefiles for the BSPs
+RTEMS_CHECK_MAKEFILE(.)
+
+# HACK: sed out bsp-tools from makefiles
+t="tools"
+if test -d "$srcdir/$t"; then
+ bsptools_cfgdirs="$bsptools_cfgdirs $t"
+ makefiles=`echo "$makefiles" | sed -e "s%.*$t/.*Makefile%%g"`
+fi
+
+if test "$HAS_MP" = "yes"; then
+:
+else
+ # HACK: sed out shmsupp/Makefile from makefiles
+ t="shmsupp"
+ makefiles=`echo "$makefiles" | sed -e "s%.*$t/.*Makefile%%g"`
+fi
+AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes")
+
+AC_CONFIG_SUBDIRS($bsptools_cfgdirs)
+
+# try to explicitly list a Makefile here
+AC_OUTPUT(
+$makefiles)
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/console/Makefile.in b/c/src/lib/libbsp/powerpc/motorola_powerpc/console/Makefile.in
index 71ccd2bf98..33f9f9c387 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/console/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/console/Makefile.in
@@ -5,8 +5,8 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/mcp750/console
+top_builddir = ..
+subdir = console
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/include/Makefile.in b/c/src/lib/libbsp/powerpc/motorola_powerpc/include/Makefile.in
index a7d0a6e46e..39692c9cdc 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/include/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/include/Makefile.in
@@ -5,8 +5,8 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/mcp750/include
+top_builddir = ..
+subdir = include
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
@@ -14,8 +14,8 @@ PROJECT_ROOT = @PROJECT_ROOT@
VPATH = @srcdir@
H_FILES = $(srcdir)/../../shared/include/nvram.h \
- $(srcdir)/../../shared/include/bsp.h \
- $(srcdir)/../../../shared/include/coverhd.h
+ $(srcdir)/../../shared/include/bsp.h \
+ $(srcdir)/../../../shared/include/coverhd.h
BSP_H_FILES = $(srcdir)/../../shared/console/consoleIo.h \
$(srcdir)/../../shared/console/uart.h $(srcdir)/../../shared/irq/irq.h \
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/irq/Makefile.in b/c/src/lib/libbsp/powerpc/motorola_powerpc/irq/Makefile.in
index 2f9bb6ae04..57116c2ab8 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/irq/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/irq/Makefile.in
@@ -5,8 +5,8 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/mcp750/irq
+top_builddir = ..
+subdir = irq
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/motorola/Makefile.in b/c/src/lib/libbsp/powerpc/motorola_powerpc/motorola/Makefile.in
index 614960112f..b8ee6f946b 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/motorola/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/motorola/Makefile.in
@@ -5,8 +5,8 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/mcp750/motorola
+top_builddir = ..
+subdir = motorola
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/openpic/Makefile.in b/c/src/lib/libbsp/powerpc/motorola_powerpc/openpic/Makefile.in
index 2f3e2c2c23..d42d217496 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/openpic/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/openpic/Makefile.in
@@ -5,8 +5,8 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/mcp750/openpic
+top_builddir = ..
+subdir = openpic
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/pci/Makefile.in b/c/src/lib/libbsp/powerpc/motorola_powerpc/pci/Makefile.in
index b2192fb262..206fcf179f 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/pci/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/pci/Makefile.in
@@ -5,8 +5,8 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/mcp750/pci
+top_builddir = ..
+subdir = pci
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/residual/Makefile.in b/c/src/lib/libbsp/powerpc/motorola_powerpc/residual/Makefile.in
index e94f6fdb6f..fb9fce42fb 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/residual/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/residual/Makefile.in
@@ -5,8 +5,8 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/mcp750/residual
+top_builddir = ..
+subdir = residual
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/start/Makefile.in b/c/src/lib/libbsp/powerpc/motorola_powerpc/start/Makefile.in
index 704bfeb8e8..859b05713e 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/start/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/start/Makefile.in
@@ -5,8 +5,8 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/mcp750/start
+top_builddir = ..
+subdir = start
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/startup/Makefile.in b/c/src/lib/libbsp/powerpc/motorola_powerpc/startup/Makefile.in
index faf523d8c4..8da11b0b61 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/startup/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/startup/Makefile.in
@@ -5,13 +5,14 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/mcp750/startup
+top_builddir = ..
+subdir = startup
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
-VPATH = @srcdir@:@srcdir@/../console:@srcdir@/../../../shared:@srcdir@/../../shared/startup
+VPATH = \
+ @srcdir@:@srcdir@/../console:@srcdir@/../../../shared:@srcdir@/../../shared/startup
# C source names, if any, go here -- minus the .c
C_PIECES = bootcard main bspstart bsppost bsplibc sbrk bspclean \
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/vectors/Makefile.in b/c/src/lib/libbsp/powerpc/motorola_powerpc/vectors/Makefile.in
index 33e1b3cefa..1a2a51cdce 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/vectors/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/vectors/Makefile.in
@@ -5,8 +5,8 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/mcp750/vectors
+top_builddir = ..
+subdir = vectors
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/wrapup/Makefile.in b/c/src/lib/libbsp/powerpc/motorola_powerpc/wrapup/Makefile.in
index 294ba38a89..babf10ac30 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/wrapup/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/wrapup/Makefile.in
@@ -5,8 +5,8 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/mcp750/wrapup
+top_builddir = ..
+subdir = wrapup
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
@@ -17,8 +17,8 @@ BSP_PIECES = clock console irq openpic pci residual startup vectors motorola
GENERIC_PIECES =
# bummer; have to use $foreach since % pattern subst rules only replace 1x
-OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.o) \
- $(foreach piece, $(GENERIC_PIECES), ../../../$(piece)/$(ARCH)/*.o)
+OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.o) $(foreach \
+ piece, $(GENERIC_PIECES), ../../../$(piece)/$(ARCH)/*.o)
LIB = $(ARCH)/libbsp.a
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
diff --git a/c/src/lib/libbsp/powerpc/papyrus/Makefile.in b/c/src/lib/libbsp/powerpc/papyrus/Makefile.in
index c76b1658da..c1cb2d8b2f 100644
--- a/c/src/lib/libbsp/powerpc/papyrus/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/papyrus/Makefile.in
@@ -5,8 +5,12 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../..
-subdir = powerpc/papyrus
+top_builddir = .
+
+ACLOCAL = aclocal
+AUTOCONF = autoconf
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ACLOCAL_AMFLAGS = -I @RTEMS_TOPdir@/aclocal
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
@@ -28,4 +32,12 @@ SUBDIRS = include dlentry flashentry startup wrapup
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+ && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in
+ cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+
+config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ $(SHELL) ./config.status --recheck
+$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4)
+ cd $(srcdir) && $(AUTOCONF)
diff --git a/c/src/lib/libbsp/powerpc/papyrus/configure.in b/c/src/lib/libbsp/powerpc/papyrus/configure.in
new file mode 100644
index 0000000000..0b6351347d
--- /dev/null
+++ b/c/src/lib/libbsp/powerpc/papyrus/configure.in
@@ -0,0 +1,57 @@
+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
+AC_PROG_MAKE_SET
+AC_PROG_INSTALL
+AM_MAINTAINER_MODE
+
+RTEMS_ENABLE_MULTIPROCESSING
+RTEMS_ENABLE_NETWORKING
+RTEMS_ENABLE_LIBCDIR
+
+RTEMS_ENV_RTEMSBSP
+
+RTEMS_CHECK_CPU
+RTEMS_CANONICAL_HOST
+
+RTEMS_PROJECT_ROOT
+
+dnl check target cc
+RTEMS_PROG_CC_FOR_TARGET
+RTEMS_CANONICALIZE_TOOLS
+
+RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
+RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP)
+RTEMS_CHECK_NETWORKING(RTEMS_BSP)
+
+# find all the Makefiles for the BSPs
+RTEMS_CHECK_MAKEFILE(.)
+
+# HACK: sed out bsp-tools from makefiles
+t="tools"
+if test -d "$srcdir/$t"; then
+ bsptools_cfgdirs="$bsptools_cfgdirs $t"
+ makefiles=`echo "$makefiles" | sed -e "s%.*$t/.*Makefile%%g"`
+fi
+
+if test "$HAS_MP" = "yes"; then
+:
+else
+ # HACK: sed out shmsupp/Makefile from makefiles
+ t="shmsupp"
+ makefiles=`echo "$makefiles" | sed -e "s%.*$t/.*Makefile%%g"`
+fi
+AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes")
+
+AC_CONFIG_SUBDIRS($bsptools_cfgdirs)
+
+# try to explicitly list a Makefile here
+AC_OUTPUT(
+$makefiles)
diff --git a/c/src/lib/libbsp/powerpc/papyrus/dlentry/Makefile.in b/c/src/lib/libbsp/powerpc/papyrus/dlentry/Makefile.in
index be2eb448dc..dc19dc41b0 100644
--- a/c/src/lib/libbsp/powerpc/papyrus/dlentry/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/papyrus/dlentry/Makefile.in
@@ -5,8 +5,8 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/papyrus/dlentry
+top_builddir = ..
+subdir = dlentry
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
diff --git a/c/src/lib/libbsp/powerpc/papyrus/flashentry/Makefile.in b/c/src/lib/libbsp/powerpc/papyrus/flashentry/Makefile.in
index d3563b6085..00064c79af 100644
--- a/c/src/lib/libbsp/powerpc/papyrus/flashentry/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/papyrus/flashentry/Makefile.in
@@ -5,8 +5,8 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/papyrus/flashentry
+top_builddir = ..
+subdir = flashentry
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
diff --git a/c/src/lib/libbsp/powerpc/papyrus/include/Makefile.in b/c/src/lib/libbsp/powerpc/papyrus/include/Makefile.in
index 18a3ad20a3..e8c70a72e0 100644
--- a/c/src/lib/libbsp/powerpc/papyrus/include/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/papyrus/include/Makefile.in
@@ -5,8 +5,8 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/papyrus/include
+top_builddir = ..
+subdir = include
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
diff --git a/c/src/lib/libbsp/powerpc/papyrus/startup/Makefile.in b/c/src/lib/libbsp/powerpc/papyrus/startup/Makefile.in
index 56c55694a1..94b1b170e4 100644
--- a/c/src/lib/libbsp/powerpc/papyrus/startup/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/papyrus/startup/Makefile.in
@@ -5,8 +5,8 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/papyrus/startup
+top_builddir = ..
+subdir = startup
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
diff --git a/c/src/lib/libbsp/powerpc/papyrus/wrapup/Makefile.in b/c/src/lib/libbsp/powerpc/papyrus/wrapup/Makefile.in
index 30adcd57fc..f923bdce73 100644
--- a/c/src/lib/libbsp/powerpc/papyrus/wrapup/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/papyrus/wrapup/Makefile.in
@@ -5,8 +5,8 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/papyrus/wrapup
+top_builddir = ..
+subdir = wrapup
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
@@ -17,7 +17,7 @@ BSP_PIECES = startup dlentry flashentry
# pieces to pick up out of libcpu/ppc
# CPU_PIECES = ppc403/clock ppc403/timer ppc403/console ppc403/vectors \
# ppc403/ictrl
-CPU_PIECES =
+CPU_PIECES =
GENERIC_PIECES =
# bummer; have to use $foreach since % pattern subst rules only replace 1x
diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/Makefile.in b/c/src/lib/libbsp/powerpc/ppcn_60x/Makefile.in
index 570c1b0386..e0f6e601a0 100644
--- a/c/src/lib/libbsp/powerpc/ppcn_60x/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/ppcn_60x/Makefile.in
@@ -5,8 +5,12 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../..
-subdir = powerpc/ppcn_60x
+top_builddir = .
+
+ACLOCAL = aclocal
+AUTOCONF = autoconf
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ACLOCAL_AMFLAGS = -I @RTEMS_TOPdir@/aclocal
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
@@ -33,4 +37,12 @@ SUBDIRS = include clock console startup start timer tod $(NETWORK_DRIVER) \
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+ && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in
+ cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+
+config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ $(SHELL) ./config.status --recheck
+$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4)
+ cd $(srcdir) && $(AUTOCONF)
diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/clock/Makefile.in b/c/src/lib/libbsp/powerpc/ppcn_60x/clock/Makefile.in
index 2b55b9188f..0824086899 100644
--- a/c/src/lib/libbsp/powerpc/ppcn_60x/clock/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/ppcn_60x/clock/Makefile.in
@@ -5,8 +5,8 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/ppcn_60x/clock
+top_builddir = ..
+subdir = clock
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/configure.in b/c/src/lib/libbsp/powerpc/ppcn_60x/configure.in
new file mode 100644
index 0000000000..0b6351347d
--- /dev/null
+++ b/c/src/lib/libbsp/powerpc/ppcn_60x/configure.in
@@ -0,0 +1,57 @@
+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
+AC_PROG_MAKE_SET
+AC_PROG_INSTALL
+AM_MAINTAINER_MODE
+
+RTEMS_ENABLE_MULTIPROCESSING
+RTEMS_ENABLE_NETWORKING
+RTEMS_ENABLE_LIBCDIR
+
+RTEMS_ENV_RTEMSBSP
+
+RTEMS_CHECK_CPU
+RTEMS_CANONICAL_HOST
+
+RTEMS_PROJECT_ROOT
+
+dnl check target cc
+RTEMS_PROG_CC_FOR_TARGET
+RTEMS_CANONICALIZE_TOOLS
+
+RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
+RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP)
+RTEMS_CHECK_NETWORKING(RTEMS_BSP)
+
+# find all the Makefiles for the BSPs
+RTEMS_CHECK_MAKEFILE(.)
+
+# HACK: sed out bsp-tools from makefiles
+t="tools"
+if test -d "$srcdir/$t"; then
+ bsptools_cfgdirs="$bsptools_cfgdirs $t"
+ makefiles=`echo "$makefiles" | sed -e "s%.*$t/.*Makefile%%g"`
+fi
+
+if test "$HAS_MP" = "yes"; then
+:
+else
+ # HACK: sed out shmsupp/Makefile from makefiles
+ t="shmsupp"
+ makefiles=`echo "$makefiles" | sed -e "s%.*$t/.*Makefile%%g"`
+fi
+AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes")
+
+AC_CONFIG_SUBDIRS($bsptools_cfgdirs)
+
+# try to explicitly list a Makefile here
+AC_OUTPUT(
+$makefiles)
diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/console/Makefile.in b/c/src/lib/libbsp/powerpc/ppcn_60x/console/Makefile.in
index fa6fe3df13..23aafd8b7d 100644
--- a/c/src/lib/libbsp/powerpc/ppcn_60x/console/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/ppcn_60x/console/Makefile.in
@@ -5,8 +5,8 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/ppcn_60x/console
+top_builddir = ..
+subdir = console
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/include/Makefile.in b/c/src/lib/libbsp/powerpc/ppcn_60x/include/Makefile.in
index 66d175ee4a..d620740904 100644
--- a/c/src/lib/libbsp/powerpc/ppcn_60x/include/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/ppcn_60x/include/Makefile.in
@@ -5,8 +5,8 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/ppcn_60x/include
+top_builddir = ..
+subdir = include
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/network/Makefile.in b/c/src/lib/libbsp/powerpc/ppcn_60x/network/Makefile.in
index a827a83240..9465ed9b26 100644
--- a/c/src/lib/libbsp/powerpc/ppcn_60x/network/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/ppcn_60x/network/Makefile.in
@@ -5,8 +5,8 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/ppcn_60x/network
+top_builddir = ..
+subdir = network
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/nvram/Makefile.in b/c/src/lib/libbsp/powerpc/ppcn_60x/nvram/Makefile.in
index 8137ded65d..039594752d 100644
--- a/c/src/lib/libbsp/powerpc/ppcn_60x/nvram/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/ppcn_60x/nvram/Makefile.in
@@ -5,8 +5,8 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/ppcn_60x/nvram
+top_builddir = ..
+subdir = nvram
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/pci/Makefile.in b/c/src/lib/libbsp/powerpc/ppcn_60x/pci/Makefile.in
index 9015017e41..3e66162a4a 100644
--- a/c/src/lib/libbsp/powerpc/ppcn_60x/pci/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/ppcn_60x/pci/Makefile.in
@@ -5,8 +5,8 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/ppcn_60x/pci
+top_builddir = ..
+subdir = pci
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/start/Makefile.in b/c/src/lib/libbsp/powerpc/ppcn_60x/start/Makefile.in
index 480098f6c6..722a6ed21b 100644
--- a/c/src/lib/libbsp/powerpc/ppcn_60x/start/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/ppcn_60x/start/Makefile.in
@@ -5,8 +5,8 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/ppcn_60x/start
+top_builddir = ..
+subdir = start
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/startup/Makefile.in b/c/src/lib/libbsp/powerpc/ppcn_60x/startup/Makefile.in
index b9c32f2295..761d3d9786 100644
--- a/c/src/lib/libbsp/powerpc/ppcn_60x/startup/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/ppcn_60x/startup/Makefile.in
@@ -5,8 +5,8 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/ppcn_60x/startup
+top_builddir = ..
+subdir = startup
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/timer/Makefile.in b/c/src/lib/libbsp/powerpc/ppcn_60x/timer/Makefile.in
index 40dc357c56..0058c8e5db 100644
--- a/c/src/lib/libbsp/powerpc/ppcn_60x/timer/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/ppcn_60x/timer/Makefile.in
@@ -5,8 +5,8 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/ppcn_60x/timer
+top_builddir = ..
+subdir = timer
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/tod/Makefile.in b/c/src/lib/libbsp/powerpc/ppcn_60x/tod/Makefile.in
index 2213a35182..911a5d6264 100644
--- a/c/src/lib/libbsp/powerpc/ppcn_60x/tod/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/ppcn_60x/tod/Makefile.in
@@ -5,8 +5,8 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/ppcn_60x/tod
+top_builddir = ..
+subdir = tod
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/universe/Makefile.in b/c/src/lib/libbsp/powerpc/ppcn_60x/universe/Makefile.in
index 523a05f820..ddd86a4d9a 100644
--- a/c/src/lib/libbsp/powerpc/ppcn_60x/universe/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/ppcn_60x/universe/Makefile.in
@@ -5,8 +5,8 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/ppcn_60x/universe
+top_builddir = ..
+subdir = universe
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/vectors/Makefile.in b/c/src/lib/libbsp/powerpc/ppcn_60x/vectors/Makefile.in
index 5a818f6c3a..3ce208fac7 100644
--- a/c/src/lib/libbsp/powerpc/ppcn_60x/vectors/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/ppcn_60x/vectors/Makefile.in
@@ -5,8 +5,8 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/ppcn_60x/vectors
+top_builddir = ..
+subdir = vectors
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/wrapup/Makefile.in b/c/src/lib/libbsp/powerpc/ppcn_60x/wrapup/Makefile.in
index 33d6c6c313..6ad9dd6d7b 100644
--- a/c/src/lib/libbsp/powerpc/ppcn_60x/wrapup/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/ppcn_60x/wrapup/Makefile.in
@@ -5,8 +5,8 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/ppcn_60x/wrapup
+top_builddir = ..
+subdir = wrapup
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
diff --git a/c/src/lib/libbsp/powerpc/psim/Makefile.in b/c/src/lib/libbsp/powerpc/psim/Makefile.in
index 2536ef2eaa..bf159090cb 100644
--- a/c/src/lib/libbsp/powerpc/psim/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/psim/Makefile.in
@@ -5,8 +5,12 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../..
-subdir = powerpc/psim
+top_builddir = .
+
+ACLOCAL = aclocal
+AUTOCONF = autoconf
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ACLOCAL_AMFLAGS = -I @RTEMS_TOPdir@/aclocal
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
@@ -29,9 +33,17 @@ MP_DRIVERS = $(MP_DRIVERS_$(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 clock console startup $(MP_DRIVERS) timer \
- vectors wrapup tools
+SUBDIRS = include start clock console startup $(MP_DRIVERS) timer vectors \
+ wrapup tools
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+ && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in
+ cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+
+config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ $(SHELL) ./config.status --recheck
+$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4)
+ cd $(srcdir) && $(AUTOCONF)
diff --git a/c/src/lib/libbsp/powerpc/psim/clock/Makefile.in b/c/src/lib/libbsp/powerpc/psim/clock/Makefile.in
index b3dbc0337f..643805ea48 100644
--- a/c/src/lib/libbsp/powerpc/psim/clock/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/psim/clock/Makefile.in
@@ -5,8 +5,8 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/psim/clock
+top_builddir = ..
+subdir = clock
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
diff --git a/c/src/lib/libbsp/powerpc/psim/configure.in b/c/src/lib/libbsp/powerpc/psim/configure.in
new file mode 100644
index 0000000000..0b6351347d
--- /dev/null
+++ b/c/src/lib/libbsp/powerpc/psim/configure.in
@@ -0,0 +1,57 @@
+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
+AC_PROG_MAKE_SET
+AC_PROG_INSTALL
+AM_MAINTAINER_MODE
+
+RTEMS_ENABLE_MULTIPROCESSING
+RTEMS_ENABLE_NETWORKING
+RTEMS_ENABLE_LIBCDIR
+
+RTEMS_ENV_RTEMSBSP
+
+RTEMS_CHECK_CPU
+RTEMS_CANONICAL_HOST
+
+RTEMS_PROJECT_ROOT
+
+dnl check target cc
+RTEMS_PROG_CC_FOR_TARGET
+RTEMS_CANONICALIZE_TOOLS
+
+RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
+RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP)
+RTEMS_CHECK_NETWORKING(RTEMS_BSP)
+
+# find all the Makefiles for the BSPs
+RTEMS_CHECK_MAKEFILE(.)
+
+# HACK: sed out bsp-tools from makefiles
+t="tools"
+if test -d "$srcdir/$t"; then
+ bsptools_cfgdirs="$bsptools_cfgdirs $t"
+ makefiles=`echo "$makefiles" | sed -e "s%.*$t/.*Makefile%%g"`
+fi
+
+if test "$HAS_MP" = "yes"; then
+:
+else
+ # HACK: sed out shmsupp/Makefile from makefiles
+ t="shmsupp"
+ makefiles=`echo "$makefiles" | sed -e "s%.*$t/.*Makefile%%g"`
+fi
+AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes")
+
+AC_CONFIG_SUBDIRS($bsptools_cfgdirs)
+
+# try to explicitly list a Makefile here
+AC_OUTPUT(
+$makefiles)
diff --git a/c/src/lib/libbsp/powerpc/psim/console/Makefile.in b/c/src/lib/libbsp/powerpc/psim/console/Makefile.in
index 46cf1b50a9..4d3852b153 100644
--- a/c/src/lib/libbsp/powerpc/psim/console/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/psim/console/Makefile.in
@@ -5,8 +5,8 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/psim/console
+top_builddir = ..
+subdir = console
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
diff --git a/c/src/lib/libbsp/powerpc/psim/include/Makefile.in b/c/src/lib/libbsp/powerpc/psim/include/Makefile.in
index e81a30d7c0..8a2fa40e65 100644
--- a/c/src/lib/libbsp/powerpc/psim/include/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/psim/include/Makefile.in
@@ -5,8 +5,8 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/psim/include
+top_builddir = ..
+subdir = include
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
diff --git a/c/src/lib/libbsp/powerpc/psim/shmsupp/Makefile.in b/c/src/lib/libbsp/powerpc/psim/shmsupp/Makefile.in
index eb7611e224..8e69f28a17 100644
--- a/c/src/lib/libbsp/powerpc/psim/shmsupp/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/psim/shmsupp/Makefile.in
@@ -5,8 +5,8 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/psim/shmsupp
+top_builddir = ..
+subdir = shmsupp
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
diff --git a/c/src/lib/libbsp/powerpc/psim/start/Makefile.in b/c/src/lib/libbsp/powerpc/psim/start/Makefile.in
index 5a0ff1f50d..722a6ed21b 100644
--- a/c/src/lib/libbsp/powerpc/psim/start/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/psim/start/Makefile.in
@@ -5,8 +5,8 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/psim/start
+top_builddir = ..
+subdir = start
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
diff --git a/c/src/lib/libbsp/powerpc/psim/startup/Makefile.in b/c/src/lib/libbsp/powerpc/psim/startup/Makefile.in
index 460756543b..1b9b125f57 100644
--- a/c/src/lib/libbsp/powerpc/psim/startup/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/psim/startup/Makefile.in
@@ -5,8 +5,8 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/psim/startup
+top_builddir = ..
+subdir = startup
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
diff --git a/c/src/lib/libbsp/powerpc/psim/timer/Makefile.in b/c/src/lib/libbsp/powerpc/psim/timer/Makefile.in
index 94a4ed775a..fbad29fdbc 100644
--- a/c/src/lib/libbsp/powerpc/psim/timer/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/psim/timer/Makefile.in
@@ -5,8 +5,8 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/psim/timer
+top_builddir = ..
+subdir = timer
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
diff --git a/c/src/lib/libbsp/powerpc/psim/vectors/Makefile.in b/c/src/lib/libbsp/powerpc/psim/vectors/Makefile.in
index 4c63099352..2465102202 100644
--- a/c/src/lib/libbsp/powerpc/psim/vectors/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/psim/vectors/Makefile.in
@@ -5,8 +5,8 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/psim/vectors
+top_builddir = ..
+subdir = vectors
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
diff --git a/c/src/lib/libbsp/powerpc/psim/wrapup/Makefile.in b/c/src/lib/libbsp/powerpc/psim/wrapup/Makefile.in
index d131cb446b..a07a971480 100644
--- a/c/src/lib/libbsp/powerpc/psim/wrapup/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/psim/wrapup/Makefile.in
@@ -5,8 +5,8 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/psim/wrapup
+top_builddir = ..
+subdir = wrapup
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
diff --git a/c/src/lib/libbsp/powerpc/score603e/Makefile.in b/c/src/lib/libbsp/powerpc/score603e/Makefile.in
index 49e9ace7d7..8457c048dd 100644
--- a/c/src/lib/libbsp/powerpc/score603e/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/score603e/Makefile.in
@@ -5,8 +5,12 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../..
-subdir = powerpc/score603e
+top_builddir = .
+
+ACLOCAL = aclocal
+AUTOCONF = autoconf
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ACLOCAL_AMFLAGS = -I @RTEMS_TOPdir@/aclocal
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
@@ -29,4 +33,12 @@ SUBDIRS = include clock console startup start timer tod PCI_bus vectors \
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+ && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in
+ cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+
+config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ $(SHELL) ./config.status --recheck
+$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4)
+ cd $(srcdir) && $(AUTOCONF)
diff --git a/c/src/lib/libbsp/powerpc/score603e/PCI_bus/Makefile.in b/c/src/lib/libbsp/powerpc/score603e/PCI_bus/Makefile.in
index a1fe511540..5bd277aa98 100644
--- a/c/src/lib/libbsp/powerpc/score603e/PCI_bus/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/score603e/PCI_bus/Makefile.in
@@ -5,8 +5,8 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/score603e/PCI_bus
+top_builddir = ..
+subdir = PCI_bus
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
diff --git a/c/src/lib/libbsp/powerpc/score603e/clock/Makefile.in b/c/src/lib/libbsp/powerpc/score603e/clock/Makefile.in
index 24841d653f..0824086899 100644
--- a/c/src/lib/libbsp/powerpc/score603e/clock/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/score603e/clock/Makefile.in
@@ -5,8 +5,8 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/score603e/clock
+top_builddir = ..
+subdir = clock
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
diff --git a/c/src/lib/libbsp/powerpc/score603e/configure.in b/c/src/lib/libbsp/powerpc/score603e/configure.in
new file mode 100644
index 0000000000..0b6351347d
--- /dev/null
+++ b/c/src/lib/libbsp/powerpc/score603e/configure.in
@@ -0,0 +1,57 @@
+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
+AC_PROG_MAKE_SET
+AC_PROG_INSTALL
+AM_MAINTAINER_MODE
+
+RTEMS_ENABLE_MULTIPROCESSING
+RTEMS_ENABLE_NETWORKING
+RTEMS_ENABLE_LIBCDIR
+
+RTEMS_ENV_RTEMSBSP
+
+RTEMS_CHECK_CPU
+RTEMS_CANONICAL_HOST
+
+RTEMS_PROJECT_ROOT
+
+dnl check target cc
+RTEMS_PROG_CC_FOR_TARGET
+RTEMS_CANONICALIZE_TOOLS
+
+RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
+RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP)
+RTEMS_CHECK_NETWORKING(RTEMS_BSP)
+
+# find all the Makefiles for the BSPs
+RTEMS_CHECK_MAKEFILE(.)
+
+# HACK: sed out bsp-tools from makefiles
+t="tools"
+if test -d "$srcdir/$t"; then
+ bsptools_cfgdirs="$bsptools_cfgdirs $t"
+ makefiles=`echo "$makefiles" | sed -e "s%.*$t/.*Makefile%%g"`
+fi
+
+if test "$HAS_MP" = "yes"; then
+:
+else
+ # HACK: sed out shmsupp/Makefile from makefiles
+ t="shmsupp"
+ makefiles=`echo "$makefiles" | sed -e "s%.*$t/.*Makefile%%g"`
+fi
+AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes")
+
+AC_CONFIG_SUBDIRS($bsptools_cfgdirs)
+
+# try to explicitly list a Makefile here
+AC_OUTPUT(
+$makefiles)
diff --git a/c/src/lib/libbsp/powerpc/score603e/console/Makefile.in b/c/src/lib/libbsp/powerpc/score603e/console/Makefile.in
index cc08bc74a1..bb551f86cc 100644
--- a/c/src/lib/libbsp/powerpc/score603e/console/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/score603e/console/Makefile.in
@@ -5,8 +5,8 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/score603e/console
+top_builddir = ..
+subdir = console
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
diff --git a/c/src/lib/libbsp/powerpc/score603e/include/Makefile.in b/c/src/lib/libbsp/powerpc/score603e/include/Makefile.in
index 9364d3ef8f..7d687fab5a 100644
--- a/c/src/lib/libbsp/powerpc/score603e/include/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/score603e/include/Makefile.in
@@ -5,8 +5,8 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/score603e/include
+top_builddir = ..
+subdir = include
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
diff --git a/c/src/lib/libbsp/powerpc/score603e/start/Makefile.in b/c/src/lib/libbsp/powerpc/score603e/start/Makefile.in
index 50fecbef8e..e22c3d3ba7 100644
--- a/c/src/lib/libbsp/powerpc/score603e/start/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/score603e/start/Makefile.in
@@ -5,8 +5,8 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/score603e/start
+top_builddir = ..
+subdir = start
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
diff --git a/c/src/lib/libbsp/powerpc/score603e/startup/Makefile.in b/c/src/lib/libbsp/powerpc/score603e/startup/Makefile.in
index 9e0fa62c4c..8d8482f605 100644
--- a/c/src/lib/libbsp/powerpc/score603e/startup/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/score603e/startup/Makefile.in
@@ -5,8 +5,8 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/score603e/startup
+top_builddir = ..
+subdir = startup
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
diff --git a/c/src/lib/libbsp/powerpc/score603e/timer/Makefile.in b/c/src/lib/libbsp/powerpc/score603e/timer/Makefile.in
index a0c030a008..0058c8e5db 100644
--- a/c/src/lib/libbsp/powerpc/score603e/timer/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/score603e/timer/Makefile.in
@@ -5,8 +5,8 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/score603e/timer
+top_builddir = ..
+subdir = timer
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
diff --git a/c/src/lib/libbsp/powerpc/score603e/tod/Makefile.in b/c/src/lib/libbsp/powerpc/score603e/tod/Makefile.in
index acdbe1f105..8f229e5910 100644
--- a/c/src/lib/libbsp/powerpc/score603e/tod/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/score603e/tod/Makefile.in
@@ -5,8 +5,8 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/score603e/tod
+top_builddir = ..
+subdir = tod
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
diff --git a/c/src/lib/libbsp/powerpc/score603e/vectors/Makefile.in b/c/src/lib/libbsp/powerpc/score603e/vectors/Makefile.in
index dd1875cee5..3ce208fac7 100644
--- a/c/src/lib/libbsp/powerpc/score603e/vectors/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/score603e/vectors/Makefile.in
@@ -5,8 +5,8 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/score603e/vectors
+top_builddir = ..
+subdir = vectors
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
diff --git a/c/src/lib/libbsp/powerpc/score603e/wrapup/Makefile.in b/c/src/lib/libbsp/powerpc/score603e/wrapup/Makefile.in
index 4d6988d22c..75ca10c81d 100644
--- a/c/src/lib/libbsp/powerpc/score603e/wrapup/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/score603e/wrapup/Makefile.in
@@ -5,8 +5,8 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/score603e/wrapup
+top_builddir = ..
+subdir = wrapup
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
diff --git a/c/src/lib/libbsp/powerpc/shared/Makefile.am b/c/src/lib/libbsp/powerpc/shared/Makefile.am
new file mode 100644
index 0000000000..471789bf3e
--- /dev/null
+++ b/c/src/lib/libbsp/powerpc/shared/Makefile.am
@@ -0,0 +1,11 @@
+##
+## $Id$
+##
+
+AUTOMAKE_OPTIONS = foreign 1.4
+
+SUBDIRS = clock console include pci residual openpic irq vectors start \
+ startup motorola bootloader
+
+include $(top_srcdir)/../../../../../automake/subdirs.am
+include $(top_srcdir)/../../../../../automake/local.am
diff --git a/c/src/lib/libbsp/powerpc/shared/Makefile.in b/c/src/lib/libbsp/powerpc/shared/Makefile.in
deleted file mode 100644
index fc6a413784..0000000000
--- a/c/src/lib/libbsp/powerpc/shared/Makefile.in
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ../..
-subdir = powerpc/shared
-
-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 =
-
-all: $(SRCS)
-
-# We only build the Network library if HAS_NETWORKING was defined
-NETWORK_yes_V = dec21140
-NETWORK = $(NETWORK_$(HAS_NETWORKING)_V)
-
-# wrapup is the one that actually builds and installs the library
-# from the individual .rel files built in other directories
-SUBDIRS = clock console include pci residual openpic irq vectors start \
- startup motorola bootloader $(NETWORK)
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/Makefile.am b/c/src/lib/libbsp/powerpc/shared/bootloader/Makefile.am
new file mode 100644
index 0000000000..dbf0286195
--- /dev/null
+++ b/c/src/lib/libbsp/powerpc/shared/bootloader/Makefile.am
@@ -0,0 +1,21 @@
+##
+## $Id$
+##
+
+AUTOMAKE_OPTIONS = foreign 1.4
+
+C_FILES = em86.c lib.c misc.c mm.c pci.c zlib.c
+
+H_FILES = bootldr.h zlib.h pci.h
+noinst_HEADERS = $(H_FILES)
+
+S_FILES = em86real.S exception.S head.S
+
+noinst_DATA = ppcboot.lds
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../../../../../automake/lib.am
+
+EXTRA_DIST = README $(C_FILES) $(S_FILES) $(noinst_DATA)
+
+include $(top_srcdir)/../../../../../automake/local.am
diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/Makefile.in b/c/src/lib/libbsp/powerpc/shared/bootloader/Makefile.in
deleted file mode 100644
index 5aa50af807..0000000000
--- a/c/src/lib/libbsp/powerpc/shared/bootloader/Makefile.in
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/shared/bootloader
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@:@srcdir@/../../../shared:@srcdir@/../console
-
-# C source names, if any, go here -- minus the .c
-C_PIECES =
-C_FILES = $(C_PIECES:%=%.c)
-C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
-
-H_FILES = @srcdir@/bootldr.h @srcdir@/zlib.h @srcdir@/pci.h
-
-# Assembly source names, if any, go here -- minus the .s
-S_PIECES =
-S_FILES = $(S_PIECES:%=%.S)
-S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o)
-
-SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES)
-OBJS = $(S_O_FILES) $(C_O_FILES)
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-
-CC_PIECES =
-CC_FILES = $(CC_PIECES:%=%.cc)
-CC_O_FILES = $(CC_PIECES:%=${ARCH}/%.o)
-
-all: ${ARCH} $(SRCS) ${OBJ}
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/lib/libbsp/powerpc/shared/clock/Makefile.am b/c/src/lib/libbsp/powerpc/shared/clock/Makefile.am
new file mode 100644
index 0000000000..34c37f20b3
--- /dev/null
+++ b/c/src/lib/libbsp/powerpc/shared/clock/Makefile.am
@@ -0,0 +1,11 @@
+##
+## $Id$
+##
+
+AUTOMAKE_OPTIONS = foreign 1.4
+
+C_FILES = p_clock.c
+
+EXTRA_DIST = $(C_FILES)
+
+include $(top_srcdir)/../../../../../automake/local.am
diff --git a/c/src/lib/libbsp/powerpc/shared/clock/Makefile.in b/c/src/lib/libbsp/powerpc/shared/clock/Makefile.in
deleted file mode 100644
index 9a02c0bf63..0000000000
--- a/c/src/lib/libbsp/powerpc/shared/clock/Makefile.in
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/shared/clock
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-H_FILES =
-
-SRCS = $(C_FILES) $(H_FILES)
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
-
-INSTALLDIRS = $(PROJECT_INCLUDE)/bsp
-
-$(INSTALLDIRS):
- @$(mkinstalldirs) $(INSTALLDIRS)
-
-all: ${ARCH} $(SRCS)
-
-# 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
diff --git a/c/src/lib/libbsp/powerpc/shared/console/Makefile.am b/c/src/lib/libbsp/powerpc/shared/console/Makefile.am
new file mode 100644
index 0000000000..63d1da3e03
--- /dev/null
+++ b/c/src/lib/libbsp/powerpc/shared/console/Makefile.am
@@ -0,0 +1,24 @@
+##
+## $Id$
+##
+
+AUTOMAKE_OPTIONS = foreign 1.4
+
+## C source names
+C_FILES = console.c inch.c polled_io.c uart.c
+
+H_FILES = consoleIo.h keyboard.h uart.h
+noinst_HEADERS = $(H_FILES)
+
+$(PROJECT_INCLUDE)/bsp:
+ $(mkinstalldirs) $@
+
+$(PROJECT_INCLUDE)/bsp/%.h: %.h
+ $(INSTALL_DATA) $< $@
+
+PREINSTALL_FILES = $(PROJECT_INCLUDE)/bsp \
+ $(H_FILES:%.h=$(PROJECT_INCLUDE)/bsp/%.h)
+
+EXTRA_DIST = $(C_FILES)
+
+include $(top_srcdir)/../../../../../automake/local.am
diff --git a/c/src/lib/libbsp/powerpc/shared/console/Makefile.in b/c/src/lib/libbsp/powerpc/shared/console/Makefile.in
deleted file mode 100644
index 1709fc8612..0000000000
--- a/c/src/lib/libbsp/powerpc/shared/console/Makefile.in
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-# $Id:
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/shared/console
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@:@srcdir@/../../../shared
-
-# C source names, if any, go here -- minus the .c
-H_FILES = $(srcdir)/consoleIo.h $(srcdir)/keyboard.h $(srcdir)/uart.h
-
-SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES)
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
-
-INSTALLDIRS = $(PROJECT_INCLUDE)/bsp
-
-$(INSTALLDIRS):
- @$(mkinstalldirs) $(INSTALLDIRS)
-
-#
-# 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'
-#
-
-preinstall:
- @$(mkinstalldirs) $(PROJECT_INCLUDE)/bsp
- @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/bsp
-
-all: ${ARCH} $(SRCS) preinstall
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/lib/libbsp/powerpc/shared/include/Makefile.am b/c/src/lib/libbsp/powerpc/shared/include/Makefile.am
new file mode 100644
index 0000000000..e7386a0fb4
--- /dev/null
+++ b/c/src/lib/libbsp/powerpc/shared/include/Makefile.am
@@ -0,0 +1,10 @@
+##
+## $Id$
+##
+
+AUTOMAKE_OPTIONS = foreign 1.4
+
+H_FILES = nvram.h bsp.h
+noinst_HEADERS = $(H_FILES)
+
+include $(top_srcdir)/../../../../../automake/local.am
diff --git a/c/src/lib/libbsp/powerpc/shared/include/Makefile.in b/c/src/lib/libbsp/powerpc/shared/include/Makefile.in
deleted file mode 100644
index b33c92dc03..0000000000
--- a/c/src/lib/libbsp/powerpc/shared/include/Makefile.in
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-# $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/shared/include
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-H_FILES = $(srcdir)/nvram.h $(srcdir)/bsp.h
-
-#
-# Equate files are for including from assembly preprocessed by
-# gm4 or gasp. No examples are provided except for those for
-# other CPUs. The best way to generate them would be to
-# provide a program which generates the constants used based
-# on the C equivalents.
-#
-
-EQ_FILES =
-
-SRCS = $(H_FILES) $(EQ_FILES)
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
-
-INSTALLDIRS = $(PROJECT_INCLUDE)
-
-$(INSTALLDIRS):
- @$(mkinstalldirs) $(INSTALLDIRS)
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS +=
-
-all: $(SRCS)
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/lib/libbsp/powerpc/shared/irq/Makefile.am b/c/src/lib/libbsp/powerpc/shared/irq/Makefile.am
new file mode 100644
index 0000000000..9e83f5f07f
--- /dev/null
+++ b/c/src/lib/libbsp/powerpc/shared/irq/Makefile.am
@@ -0,0 +1,25 @@
+##
+## $Id$
+##
+
+AUTOMAKE_OPTIONS = foreign 1.4
+
+C_FILES = i8259.c irq.c irq_init.c
+
+H_FILES = irq.h
+noinst_HEADERS = $(H_FILES)
+
+S_FILES = irq_asm.S
+
+$(PROJECT_INCLUDE)/bsp:
+ $(mkinstalldirs) $@
+
+$(PROJECT_INCLUDE)/bsp/%.h: %.h
+ $(INSTALL_DATA) $< $@
+
+PREINSTALL_FILES = $(PROJECT_INCLUDE)/bsp \
+ $(H_FILES:%.h=$(PROJECT_INCLUDE)/bsp/%.h)
+
+EXTRA_DIST = $(C_FILES) $(S_FILES)
+
+include $(top_srcdir)/../../../../../automake/local.am
diff --git a/c/src/lib/libbsp/powerpc/shared/irq/Makefile.in b/c/src/lib/libbsp/powerpc/shared/irq/Makefile.in
deleted file mode 100644
index bd971f4a10..0000000000
--- a/c/src/lib/libbsp/powerpc/shared/irq/Makefile.in
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/shared/irq
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-H_FILES = $(srcdir)/irq.h
-
-SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES)
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
-
-INSTALLDIRS = $(PROJECT_INCLUDE)/bsp
-
-$(INSTALLDIRS):
- @$(mkinstalldirs) $(INSTALLDIRS)
-
-preinstall:
- @$(mkinstalldirs) $(PROJECT_INCLUDE)/bsp
- @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/bsp
-
-all: ${ARCH} $(SRCS) preinstall
-
-install: all
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/lib/libbsp/powerpc/shared/motorola/Makefile.am b/c/src/lib/libbsp/powerpc/shared/motorola/Makefile.am
new file mode 100644
index 0000000000..4aa17eeb6b
--- /dev/null
+++ b/c/src/lib/libbsp/powerpc/shared/motorola/Makefile.am
@@ -0,0 +1,23 @@
+##
+## $Id$
+##
+
+AUTOMAKE_OPTIONS = foreign 1.4
+
+C_FILES = motorola.c
+
+H_FILES = motorola.h
+noinst_HEADERS = $(H_FILES)
+
+$(PROJECT_INCLUDE)/bsp:
+ $(mkinstalldirs) $@
+
+$(PROJECT_INCLUDE)/bsp/%.h: %.h
+ $(INSTALL_DATA) $< $@
+
+PREINSTALL_FILES = $(PROJECT_INCLUDE)/bsp \
+ $(H_FILES:%.h=$(PROJECT_INCLUDE)/bsp/%.h)
+
+EXTRA_DIST = $(C_FILES)
+
+include $(top_srcdir)/../../../../../automake/local.am
diff --git a/c/src/lib/libbsp/powerpc/shared/motorola/Makefile.in b/c/src/lib/libbsp/powerpc/shared/motorola/Makefile.in
deleted file mode 100644
index 7554571769..0000000000
--- a/c/src/lib/libbsp/powerpc/shared/motorola/Makefile.in
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/shared/motorola
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-H_FILES = $(srcdir)/motorola.h
-
-SRCS = $(C_FILES) $(H_FILES)
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
-
-INSTALLDIRS = $(PROJECT_INCLUDE)/bsp
-
-$(INSTALLDIRS):
- @$(mkinstalldirs) $(INSTALLDIRS)
-
-preinstall:
- @$(mkinstalldirs) $(PROJECT_INCLUDE)/bsp
- @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/bsp
-
-all: ${ARCH} $(SRCS) preinstall
-
-install: all
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/lib/libbsp/powerpc/shared/openpic/Makefile.am b/c/src/lib/libbsp/powerpc/shared/openpic/Makefile.am
new file mode 100644
index 0000000000..ff667a1282
--- /dev/null
+++ b/c/src/lib/libbsp/powerpc/shared/openpic/Makefile.am
@@ -0,0 +1,23 @@
+##
+## $Id$
+##
+
+AUTOMAKE_OPTIONS = foreign 1.4
+
+C_FILES = openpic.c
+
+H_FILES = openpic.h
+noinst_HEADERS = $(H_FILES)
+
+$(PROJECT_INCLUDE)/bsp:
+ $(mkinstalldirs) $@
+
+$(PROJECT_INCLUDE)/bsp/%.h: %.h
+ $(INSTALL_DATA) $< $@
+
+PREINSTALL_FILES = $(PROJECT_INCLUDE)/bsp \
+ $(H_FILES:%.h=$(PROJECT_INCLUDE)/bsp/%.h)
+
+EXTRA_DIST = $(C_FILES)
+
+include $(top_srcdir)/../../../../../automake/local.am
diff --git a/c/src/lib/libbsp/powerpc/shared/openpic/Makefile.in b/c/src/lib/libbsp/powerpc/shared/openpic/Makefile.in
deleted file mode 100644
index 6d1cd78ed3..0000000000
--- a/c/src/lib/libbsp/powerpc/shared/openpic/Makefile.in
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/shared/openpic
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-H_FILES = $(srcdir)/openpic.h
-
-SRCS = $(C_FILES) $(H_FILES)
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
-
-INSTALLDIRS = $(PROJECT_INCLUDE)/bsp
-
-$(INSTALLDIRS):
- @$(mkinstalldirs) $(INSTALLDIRS)
-
-preinstall:
- @$(mkinstalldirs) $(PROJECT_INCLUDE)/bsp
- @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/bsp
-
-all: ${ARCH} $(SRCS) preinstall
-
-# 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
diff --git a/c/src/lib/libbsp/powerpc/shared/pci/Makefile.am b/c/src/lib/libbsp/powerpc/shared/pci/Makefile.am
new file mode 100644
index 0000000000..eca5f197f5
--- /dev/null
+++ b/c/src/lib/libbsp/powerpc/shared/pci/Makefile.am
@@ -0,0 +1,23 @@
+##
+## $Id$
+##
+
+AUTOMAKE_OPTIONS = foreign 1.4
+
+C_FILES = pci.c
+
+H_FILES = pci.h
+noinst_HEADERS = $(H_FILES)
+
+$(PROJECT_INCLUDE)/bsp:
+ $(mkinstalldirs) $@
+
+$(PROJECT_INCLUDE)/bsp/%.h: %.h
+ $(INSTALL_DATA) $< $@
+
+PREINSTALL_FILES = $(PROJECT_INCLUDE)/bsp \
+ $(H_FILES:%.h=$(PROJECT_INCLUDE)/bsp/%.h)
+
+EXTRA_DIST = $(C_FILES)
+
+include $(top_srcdir)/../../../../../automake/local.am
diff --git a/c/src/lib/libbsp/powerpc/shared/pci/Makefile.in b/c/src/lib/libbsp/powerpc/shared/pci/Makefile.in
deleted file mode 100644
index 5186f9dab9..0000000000
--- a/c/src/lib/libbsp/powerpc/shared/pci/Makefile.in
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/shared/pci
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-H_FILES = $(srcdir)/pci.h
-
-SRCS = $(C_FILES) $(H_FILES)
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
-
-INSTALLDIRS = $(PROJECT_INCLUDE)/bsp
-
-$(INSTALLDIRS):
- @$(mkinstalldirs) $(INSTALLDIRS)
-
-preinstall:
- @$(mkinstalldirs) $(PROJECT_INCLUDE)/bsp
- @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/bsp
-
-all: ${ARCH} $(SRCS) preinstall
-
-# 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
diff --git a/c/src/lib/libbsp/powerpc/shared/residual/Makefile.am b/c/src/lib/libbsp/powerpc/shared/residual/Makefile.am
new file mode 100644
index 0000000000..b5b376fa4a
--- /dev/null
+++ b/c/src/lib/libbsp/powerpc/shared/residual/Makefile.am
@@ -0,0 +1,23 @@
+##
+## $Id$
+##
+
+AUTOMAKE_OPTIONS = foreign 1.4
+
+C_FILES = residual.c
+
+H_FILES = pnp.h residual.h
+noinst_HEADERS = $(H_FILES)
+
+$(PROJECT_INCLUDE)/bsp:
+ $(mkinstalldirs) $@
+
+$(PROJECT_INCLUDE)/bsp/%.h: %.h
+ $(INSTALL_DATA) $< $@
+
+PREINSTALL_FILES = $(PROJECT_INCLUDE)/bsp \
+ $(H_FILES:%.h=$(PROJECT_INCLUDE)/bsp/%.h)
+
+EXTRA_DIST = $(C_FILES)
+
+include $(top_srcdir)/../../../../../automake/local.am
diff --git a/c/src/lib/libbsp/powerpc/shared/residual/Makefile.in b/c/src/lib/libbsp/powerpc/shared/residual/Makefile.in
deleted file mode 100644
index 74cf7892c6..0000000000
--- a/c/src/lib/libbsp/powerpc/shared/residual/Makefile.in
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-# $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/shared/residual
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-PGM = ${ARCH}/residual.rel
-
-# C source names, if any, go here -- minus the .c
-C_PIECES = $(RESIDUAL_C_PIECES)
-C_FILES = $(C_PIECES:%=%.c)
-C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
-
-H_FILES = $(srcdir)/pnp.h $(srcdir)/residual.h
-
-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@
-mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
-
-INSTALLDIRS = $(PROJECT_INCLUDE)/bsp
-
-$(INSTALLDIRS):
- @$(mkinstalldirs) $(INSTALLDIRS)
-
-preinstall:
- @$(mkinstalldirs) $(PROJECT_INCLUDE)/bsp
- @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/bsp
-
-all: ${ARCH} $(SRCS) preinstall
-
-# 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
diff --git a/c/src/lib/libbsp/powerpc/shared/start/Makefile.am b/c/src/lib/libbsp/powerpc/shared/start/Makefile.am
new file mode 100644
index 0000000000..40d49d6d3a
--- /dev/null
+++ b/c/src/lib/libbsp/powerpc/shared/start/Makefile.am
@@ -0,0 +1,11 @@
+##
+## $Id$
+##
+
+AUTOMAKE_OPTIONS = foreign 1.4
+
+S_FILES = start.S
+
+EXTRA_DIST = $(S_FILES)
+
+include $(top_srcdir)/../../../../../automake/local.am
diff --git a/c/src/lib/libbsp/powerpc/shared/start/Makefile.in b/c/src/lib/libbsp/powerpc/shared/start/Makefile.in
deleted file mode 100644
index e4b90cc9ca..0000000000
--- a/c/src/lib/libbsp/powerpc/shared/start/Makefile.in
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/shared/start
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-H_FILES =
-
-SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES)
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-
-all: ${ARCH} $(SRCS)
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/lib/libbsp/powerpc/shared/startup/Makefile.am b/c/src/lib/libbsp/powerpc/shared/startup/Makefile.am
new file mode 100644
index 0000000000..07702da121
--- /dev/null
+++ b/c/src/lib/libbsp/powerpc/shared/startup/Makefile.am
@@ -0,0 +1,13 @@
+##
+## $Id$
+##
+
+AUTOMAKE_OPTIONS = foreign 1.4
+
+C_FILES = bspstart.c
+
+noinst_DATA = linkcmds
+
+EXTRA_DIST = $(C_FILES) $(noinst_DATA)
+
+include $(top_srcdir)/../../../../../automake/local.am
diff --git a/c/src/lib/libbsp/powerpc/shared/startup/Makefile.in b/c/src/lib/libbsp/powerpc/shared/startup/Makefile.in
deleted file mode 100644
index 984d5da57a..0000000000
--- a/c/src/lib/libbsp/powerpc/shared/startup/Makefile.in
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/shared/startup
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-H_FILES =
-
-SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES)
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
-
-INSTALLDIRS = $(PROJECT_RELEASE)/lib
-
-$(INSTALLDIRS):
- @$(mkinstalldirs) $(INSTALLDIRS)
-
-all: ${ARCH} $(SRCS)
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/lib/libbsp/powerpc/shared/vectors/Makefile.am b/c/src/lib/libbsp/powerpc/shared/vectors/Makefile.am
new file mode 100644
index 0000000000..b547001bd1
--- /dev/null
+++ b/c/src/lib/libbsp/powerpc/shared/vectors/Makefile.am
@@ -0,0 +1,25 @@
+##
+## $Id$
+##
+
+AUTOMAKE_OPTIONS = foreign 1.4
+
+C_FILES = vectors_init.c
+
+H_FILES = vectors.h
+noinst_HEADERS = $(H_FILES)
+
+S_FILES = vectors.S
+
+$(PROJECT_INCLUDE)/bsp:
+ $(mkinstalldirs) $@
+
+$(PROJECT_INCLUDE)/bsp/%.h: %.h
+ $(INSTALL_DATA) $< $@
+
+PREINSTALL_FILES = $(PROJECT_INCLUDE)/bsp \
+ $(H_FILES:%.h=$(PROJECT_INCLUDE)/bsp/%.h)
+
+EXTRA_DIST = $(C_FILES) $(S_FILES)
+
+include $(top_srcdir)/../../../../../automake/local.am
diff --git a/c/src/lib/libbsp/powerpc/shared/vectors/Makefile.in b/c/src/lib/libbsp/powerpc/shared/vectors/Makefile.in
deleted file mode 100644
index 43c28cb86a..0000000000
--- a/c/src/lib/libbsp/powerpc/shared/vectors/Makefile.in
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = powerpc/shared/vectors
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-H_FILES = $(srcdir)/vectors.h
-
-SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES)
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
-
-INSTALLDIRS = $(PROJECT_INCLUDE)/bsp
-
-$(INSTALLDIRS):
- @$(mkinstalldirs) $(INSTALLDIRS)
-
-preinstall:
- @$(mkinstalldirs) $(PROJECT_INCLUDE)/bsp
- @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/bsp
-
-all: ${ARCH} $(SRCS) preinstall
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status