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.

11 files changed, 92 insertions, 23 deletions

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@