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.

7 files changed, 83 insertions, 14 deletions

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