Added ppc-rtems as alternative name.

Moved files around in list of Makefile's to better support
--disable-tests option.

2 files changed, 78 insertions, 56 deletions

diff --git a/configure b/configure
index d78cecc00c..2d2652a4c6 100644
--- a/configure
+++ b/configure
@@ -830,8 +830,7 @@ c/src/lib/libhwapi/support/checksum/Makefile \
 c/src/lib/libhwapi/support/wrapup/Makefile \
 c/src/lib/libhwapi/support/dumpbuf/Makefile"
 
-tests_mk="c/src/tests/Makefile \
-c/src/tests/libtests/Makefile \
+tests_mk="c/src/tests/libtests/Makefile \
 c/src/tests/libtests/cpuuse/Makefile \
 c/src/tests/libtests/malloctest/Makefile \
 c/src/tests/libtests/rtmonuse/Makefile \
@@ -896,15 +895,6 @@ c/src/tests/psxtests/psx12/Makefile \
 c/src/tests/psxtests/psxhdrs/Makefile \
 c/src/tests/psxtests/support/Makefile \
 c/src/tests/psxtests/support/include/Makefile \
-c/src/tests/samples/Makefile \
-c/src/tests/samples/base_mp/Makefile \
-c/src/tests/samples/base_mp/node1/Makefile \
-c/src/tests/samples/base_mp/node2/Makefile \
-c/src/tests/samples/base_sp/Makefile \
-c/src/tests/samples/cdtest/Makefile \
-c/src/tests/samples/hello/Makefile \
-c/src/tests/samples/paranoia/Makefile \
-c/src/tests/samples/ticker/Makefile \
 c/src/tests/sptests/Makefile \
 c/src/tests/sptests/sp01/Makefile \
 c/src/tests/sptests/sp02/Makefile \
@@ -931,10 +921,6 @@ c/src/tests/sptests/sp24/Makefile \
 c/src/tests/sptests/sp25/Makefile \
 c/src/tests/sptests/spfatal/Makefile \
 c/src/tests/sptests/spsize/Makefile \
-c/src/tests/support/Makefile \
-c/src/tests/support/include/Makefile \
-c/src/tests/support/stubdr/Makefile \
-c/src/tests/support/wrapup/Makefile \
 c/src/tests/tmtests/Makefile \
 c/src/tests/tmtests/include/Makefile \
 c/src/tests/tmtests/tm01/Makefile \
@@ -967,18 +953,10 @@ c/src/tests/tmtests/tm27/Makefile \
 c/src/tests/tmtests/tm28/Makefile \
 c/src/tests/tmtests/tm29/Makefile \
 c/src/tests/tmtests/tmck/Makefile \
-c/src/tests/tmtests/tmoverhd/Makefile \
-c/src/tests/tools/Makefile \
-c/src/tests/tools/generic/Makefile \
-c/src/tests/tools/hppa1_1/Makefile \
-c/src/tests/tools/hppa1_1/simhppa/Makefile \
-c/src/tests/tools/sparc/Makefile \
-c/src/tests/tools/sparc/erc32/Makefile \
-c/src/tests/tools/unix/Makefile \
-c/src/tests/tools/unix/posix/Makefile"
+c/src/tests/tmtests/tmoverhd/Makefile"
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:982: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:960: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1051,7 +1029,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:1055: checking host system type" >&5
+echo "configure:1033: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -1072,7 +1050,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
 echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:1076: checking target system type" >&5
+echo "configure:1054: checking target system type" >&5
 
 target_alias=$target
 case "$target_alias" in
@@ -1090,7 +1068,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$target" 1>&6
 
 echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:1094: checking build system type" >&5
+echo "configure:1072: checking build system type" >&5
 
 build_alias=$build
 case "$build_alias" in
@@ -1262,7 +1240,7 @@ case "${target}" in
 	makefiles=$no_cpu_mk
 	RTEMS_HAS_POSIX_API=no
 	;;
-  powerpc-rtems*)
+  powerpc-rtems*|ppc-rtems*)
 	rtems_bsp=papyrus
        	makefiles=$powerpc_mk
 	;;
@@ -1309,7 +1287,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1313: checking for $ac_word" >&5
+echo "configure:1291: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1338,7 +1316,7 @@ test -n "$AWK" && break
 done
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:1342: checking whether ln -s works" >&5
+echo "configure:1320: checking whether ln -s works" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1579,6 +1557,28 @@ c/src/lib/libmisc/stackchk/Makefile \
 c/src/lib/libmisc/wrapup/Makefile \
 c/src/lib/start/Makefile \
 c/src/lib/wrapup/Makefile \
+c/src/tests/Makefile \
+c/src/tests/samples/Makefile \
+c/src/tests/samples/base_mp/Makefile \
+c/src/tests/samples/base_mp/node1/Makefile \
+c/src/tests/samples/base_mp/node2/Makefile \
+c/src/tests/samples/base_sp/Makefile \
+c/src/tests/samples/cdtest/Makefile \
+c/src/tests/samples/hello/Makefile \
+c/src/tests/samples/paranoia/Makefile \
+c/src/tests/samples/ticker/Makefile \
+c/src/tests/support/Makefile \
+c/src/tests/support/include/Makefile \
+c/src/tests/support/stubdr/Makefile \
+c/src/tests/support/wrapup/Makefile \
+c/src/tests/tools/Makefile \
+c/src/tests/tools/generic/Makefile \
+c/src/tests/tools/hppa1_1/Makefile \
+c/src/tests/tools/hppa1_1/simhppa/Makefile \
+c/src/tests/tools/sparc/Makefile \
+c/src/tests/tools/sparc/erc32/Makefile \
+c/src/tests/tools/unix/Makefile \
+c/src/tests/tools/unix/posix/Makefile \
 $makefiles \
 c/update-tools/Makefile " | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
@@ -1739,6 +1739,28 @@ c/src/lib/libmisc/stackchk/Makefile \
 c/src/lib/libmisc/wrapup/Makefile \
 c/src/lib/start/Makefile \
 c/src/lib/wrapup/Makefile \
+c/src/tests/Makefile \
+c/src/tests/samples/Makefile \
+c/src/tests/samples/base_mp/Makefile \
+c/src/tests/samples/base_mp/node1/Makefile \
+c/src/tests/samples/base_mp/node2/Makefile \
+c/src/tests/samples/base_sp/Makefile \
+c/src/tests/samples/cdtest/Makefile \
+c/src/tests/samples/hello/Makefile \
+c/src/tests/samples/paranoia/Makefile \
+c/src/tests/samples/ticker/Makefile \
+c/src/tests/support/Makefile \
+c/src/tests/support/include/Makefile \
+c/src/tests/support/stubdr/Makefile \
+c/src/tests/support/wrapup/Makefile \
+c/src/tests/tools/Makefile \
+c/src/tests/tools/generic/Makefile \
+c/src/tests/tools/hppa1_1/Makefile \
+c/src/tests/tools/hppa1_1/simhppa/Makefile \
+c/src/tests/tools/sparc/Makefile \
+c/src/tests/tools/sparc/erc32/Makefile \
+c/src/tests/tools/unix/Makefile \
+c/src/tests/tools/unix/posix/Makefile \
 $makefiles \
 c/update-tools/Makefile "}
 EOF
diff --git a/configure.in b/configure.in
index 11b96f8e18..2fa19a1367 100644
--- a/configure.in
+++ b/configure.in
@@ -281,8 +281,7 @@ c/src/lib/libhwapi/support/checksum/Makefile \
 c/src/lib/libhwapi/support/wrapup/Makefile \
 c/src/lib/libhwapi/support/dumpbuf/Makefile"
 
-tests_mk="c/src/tests/Makefile \
-c/src/tests/libtests/Makefile \
+tests_mk="c/src/tests/libtests/Makefile \
 c/src/tests/libtests/cpuuse/Makefile \
 c/src/tests/libtests/malloctest/Makefile \
 c/src/tests/libtests/rtmonuse/Makefile \
@@ -347,15 +346,6 @@ c/src/tests/psxtests/psx12/Makefile \
 c/src/tests/psxtests/psxhdrs/Makefile \
 c/src/tests/psxtests/support/Makefile \
 c/src/tests/psxtests/support/include/Makefile \
-c/src/tests/samples/Makefile \
-c/src/tests/samples/base_mp/Makefile \
-c/src/tests/samples/base_mp/node1/Makefile \
-c/src/tests/samples/base_mp/node2/Makefile \
-c/src/tests/samples/base_sp/Makefile \
-c/src/tests/samples/cdtest/Makefile \
-c/src/tests/samples/hello/Makefile \
-c/src/tests/samples/paranoia/Makefile \
-c/src/tests/samples/ticker/Makefile \
 c/src/tests/sptests/Makefile \
 c/src/tests/sptests/sp01/Makefile \
 c/src/tests/sptests/sp02/Makefile \
@@ -382,10 +372,6 @@ c/src/tests/sptests/sp24/Makefile \
 c/src/tests/sptests/sp25/Makefile \
 c/src/tests/sptests/spfatal/Makefile \
 c/src/tests/sptests/spsize/Makefile \
-c/src/tests/support/Makefile \
-c/src/tests/support/include/Makefile \
-c/src/tests/support/stubdr/Makefile \
-c/src/tests/support/wrapup/Makefile \
 c/src/tests/tmtests/Makefile \
 c/src/tests/tmtests/include/Makefile \
 c/src/tests/tmtests/tm01/Makefile \
@@ -418,15 +404,7 @@ c/src/tests/tmtests/tm27/Makefile \
 c/src/tests/tmtests/tm28/Makefile \
 c/src/tests/tmtests/tm29/Makefile \
 c/src/tests/tmtests/tmck/Makefile \
-c/src/tests/tmtests/tmoverhd/Makefile \
-c/src/tests/tools/Makefile \
-c/src/tests/tools/generic/Makefile \
-c/src/tests/tools/hppa1_1/Makefile \
-c/src/tests/tools/hppa1_1/simhppa/Makefile \
-c/src/tests/tools/sparc/Makefile \
-c/src/tests/tools/sparc/erc32/Makefile \
-c/src/tests/tools/unix/Makefile \
-c/src/tests/tools/unix/posix/Makefile"
+c/src/tests/tmtests/tmoverhd/Makefile"
 
 dnl Checks for programs.
 AC_PROG_MAKE_SET
@@ -536,7 +514,7 @@ case "${target}" in
 	makefiles=$no_cpu_mk
 	RTEMS_HAS_POSIX_API=no
 	;;
-  powerpc-rtems*)
+  powerpc-rtems*|ppc-rtems*)
 	rtems_bsp=papyrus
        	makefiles=$powerpc_mk
 	;;
@@ -675,6 +653,28 @@ c/src/lib/libmisc/stackchk/Makefile \
 c/src/lib/libmisc/wrapup/Makefile \
 c/src/lib/start/Makefile \
 c/src/lib/wrapup/Makefile \
+c/src/tests/Makefile \
+c/src/tests/samples/Makefile \
+c/src/tests/samples/base_mp/Makefile \
+c/src/tests/samples/base_mp/node1/Makefile \
+c/src/tests/samples/base_mp/node2/Makefile \
+c/src/tests/samples/base_sp/Makefile \
+c/src/tests/samples/cdtest/Makefile \
+c/src/tests/samples/hello/Makefile \
+c/src/tests/samples/paranoia/Makefile \
+c/src/tests/samples/ticker/Makefile \
+c/src/tests/support/Makefile \
+c/src/tests/support/include/Makefile \
+c/src/tests/support/stubdr/Makefile \
+c/src/tests/support/wrapup/Makefile \
+c/src/tests/tools/Makefile \
+c/src/tests/tools/generic/Makefile \
+c/src/tests/tools/hppa1_1/Makefile \
+c/src/tests/tools/hppa1_1/simhppa/Makefile \
+c/src/tests/tools/sparc/Makefile \
+c/src/tests/tools/sparc/erc32/Makefile \
+c/src/tests/tools/unix/Makefile \
+c/src/tests/tools/unix/posix/Makefile \
 $makefiles \
 c/update-tools/Makefile )