From 87cec4844ba26da5010e708f4971b9f3cf7f9d2e Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 16 Dec 1997 18:40:08 +0000 Subject: Changed RTEMS_BSP to RTEMS_BSP_LIST. --- configure | 47 +++++++++++++++++++++++------------------------ configure.in | 13 ++++--------- 2 files changed, 27 insertions(+), 33 deletions(-) diff --git a/configure b/configure index f4cc227519..14a0a04476 100644 --- a/configure +++ b/configure @@ -1450,7 +1450,7 @@ echo "configure:1414: checking for bsps" >&5 # Is there code where there should be for this BSP? if test -d "$srcdir/c/src/lib/libbsp/$target_cpu/$bspdir"; then - RTEMS_BSP="$RTEMS_BSP $i" + RTEMS_BSP_LIST="$RTEMS_BSP_LIST $i" # make sure the Makefiles in a bsp directory are only done once echo $bspdirs | grep $bspdir >/dev/null 2>&1 if test $? -ne 0 ; then @@ -1528,7 +1528,6 @@ if [ "${program_prefix}" = "NONE" ] ; then fi fi - RTEMS_ROOT=`cd $srcdir/c; pwd` PROJECT_ROOT=`pwd;` @@ -1544,7 +1543,7 @@ fi # If the tests are enabled, then find all the test suite Makefiles echo $ac_n "checking Are the test suites enabled? ""... $ac_c" 1>&6 -echo "configure:1548: checking Are the test suites enabled? " >&5 +echo "configure:1547: checking Are the test suites enabled? " >&5 tests_enabled=yes # Check whether --enable-tests or --disable-tests was given. if test "${enable_tests+set}" = set; then @@ -1564,7 +1563,7 @@ fi if test "$tests_enabled" = "yes"; then echo $ac_n "checking for Makefile.in in c/src/tests/tools/$target_cpu""... $ac_c" 1>&6 -echo "configure:1568: checking for Makefile.in in c/src/tests/tools/$target_cpu" >&5 +echo "configure:1567: checking for Makefile.in in c/src/tests/tools/$target_cpu" >&5 if test -d $srcdir/c/src/tests/tools/$target_cpu; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -1579,7 +1578,7 @@ fi echo $ac_n "checking for Makefile.in in c/src/tests/libtests""... $ac_c" 1>&6 -echo "configure:1583: checking for Makefile.in in c/src/tests/libtests" >&5 +echo "configure:1582: checking for Makefile.in in c/src/tests/libtests" >&5 if test -d $srcdir/c/src/tests/libtests; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -1594,7 +1593,7 @@ fi echo $ac_n "checking for Makefile.in in c/src/tests/sptests""... $ac_c" 1>&6 -echo "configure:1598: checking for Makefile.in in c/src/tests/sptests" >&5 +echo "configure:1597: checking for Makefile.in in c/src/tests/sptests" >&5 if test -d $srcdir/c/src/tests/sptests; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -1609,7 +1608,7 @@ fi echo $ac_n "checking for Makefile.in in c/src/tests/tmtests""... $ac_c" 1>&6 -echo "configure:1613: checking for Makefile.in in c/src/tests/tmtests" >&5 +echo "configure:1612: checking for Makefile.in in c/src/tests/tmtests" >&5 if test -d $srcdir/c/src/tests/tmtests; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -1624,7 +1623,7 @@ fi echo $ac_n "checking for Makefile.in in c/src/tests/mptests""... $ac_c" 1>&6 -echo "configure:1628: checking for Makefile.in in c/src/tests/mptests" >&5 +echo "configure:1627: checking for Makefile.in in c/src/tests/mptests" >&5 if test -d $srcdir/c/src/tests/mptests; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -1640,7 +1639,7 @@ fi if test "$RTEMS_HAS_POSIX" = "yes"; then echo $ac_n "checking for Makefile.in in c/src/tests/psxtests""... $ac_c" 1>&6 -echo "configure:1644: checking for Makefile.in in c/src/tests/psxtests" >&5 +echo "configure:1643: checking for Makefile.in in c/src/tests/psxtests" >&5 if test -d $srcdir/c/src/tests/psxtests; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -1658,7 +1657,7 @@ fi # If the HWAPI is enabled, the find the HWAPI Makefiles echo $ac_n "checking Is the HWAPI enabled? ""... $ac_c" 1>&6 -echo "configure:1662: checking Is the HWAPI enabled? " >&5 +echo "configure:1661: checking Is the HWAPI enabled? " >&5 # Check whether --enable-hwapi or --disable-hwapi was given. if test "${enable_hwapi+set}" = set; then enableval="$enable_hwapi" @@ -1669,7 +1668,7 @@ if test "${enable_hwapi+set}" = set; then makefiles="$makefiles c/src/lib/libhwapi/Makefile" echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi/analog""... $ac_c" 1>&6 -echo "configure:1673: checking for Makefile.in in c/src/lib/libhwapi/analog" >&5 +echo "configure:1672: checking for Makefile.in in c/src/lib/libhwapi/analog" >&5 if test -d $srcdir/c/src/lib/libhwapi/analog; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -1684,7 +1683,7 @@ fi echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi/discrete""... $ac_c" 1>&6 -echo "configure:1688: checking for Makefile.in in c/src/lib/libhwapi/discrete" >&5 +echo "configure:1687: checking for Makefile.in in c/src/lib/libhwapi/discrete" >&5 if test -d $srcdir/c/src/lib/libhwapi/discrete; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -1699,7 +1698,7 @@ fi echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi/drivers""... $ac_c" 1>&6 -echo "configure:1703: checking for Makefile.in in c/src/lib/libhwapi/drivers" >&5 +echo "configure:1702: checking for Makefile.in in c/src/lib/libhwapi/drivers" >&5 if test -d $srcdir/c/src/lib/libhwapi/drivers; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -1714,7 +1713,7 @@ fi echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi/eeprom""... $ac_c" 1>&6 -echo "configure:1718: checking for Makefile.in in c/src/lib/libhwapi/eeprom" >&5 +echo "configure:1717: checking for Makefile.in in c/src/lib/libhwapi/eeprom" >&5 if test -d $srcdir/c/src/lib/libhwapi/eeprom; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -1729,7 +1728,7 @@ fi echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi/serial""... $ac_c" 1>&6 -echo "configure:1733: checking for Makefile.in in c/src/lib/libhwapi/serial" >&5 +echo "configure:1732: checking for Makefile.in in c/src/lib/libhwapi/serial" >&5 if test -d $srcdir/c/src/lib/libhwapi/serial; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -1744,7 +1743,7 @@ fi echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi/support""... $ac_c" 1>&6 -echo "configure:1748: checking for Makefile.in in c/src/lib/libhwapi/support" >&5 +echo "configure:1747: checking for Makefile.in in c/src/lib/libhwapi/support" >&5 if test -d $srcdir/c/src/lib/libhwapi/support; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -1759,7 +1758,7 @@ fi echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi/wrapup""... $ac_c" 1>&6 -echo "configure:1763: checking for Makefile.in in c/src/lib/libhwapi/wrapup" >&5 +echo "configure:1762: checking for Makefile.in in c/src/lib/libhwapi/wrapup" >&5 if test -d $srcdir/c/src/lib/libhwapi/wrapup; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -1802,7 +1801,7 @@ fi # pick up all the Makefiles in required parts of the tree echo $ac_n "checking for Makefile.in in c/build-tools""... $ac_c" 1>&6 -echo "configure:1806: checking for Makefile.in in c/build-tools" >&5 +echo "configure:1805: checking for Makefile.in in c/build-tools" >&5 if test -d $srcdir/c/build-tools; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -1817,7 +1816,7 @@ fi echo $ac_n "checking for Makefile.in in c/make""... $ac_c" 1>&6 -echo "configure:1821: checking for Makefile.in in c/make" >&5 +echo "configure:1820: checking for Makefile.in in c/make" >&5 if test -d $srcdir/c/make; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -1832,7 +1831,7 @@ fi echo $ac_n "checking for Makefile.in in c/src/lib/libmisc""... $ac_c" 1>&6 -echo "configure:1836: checking for Makefile.in in c/src/lib/libmisc" >&5 +echo "configure:1835: checking for Makefile.in in c/src/lib/libmisc" >&5 if test -d $srcdir/c/src/lib/libmisc; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -1847,7 +1846,7 @@ fi echo $ac_n "checking for Makefile.in in c/src/tests/samples""... $ac_c" 1>&6 -echo "configure:1851: checking for Makefile.in in c/src/tests/samples" >&5 +echo "configure:1850: checking for Makefile.in in c/src/tests/samples" >&5 if test -d $srcdir/c/src/tests/samples; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -2066,7 +2065,7 @@ s%@CMP@%$CMP%g s%@SED@%$SED%g s%@M4@%$M4%g s%@KSH@%$KSH%g -s%@RTEMS_BSP@%$RTEMS_BSP%g +s%@RTEMS_BSP_LIST@%$RTEMS_BSP_LIST%g s%@RTEMS_HOST@%$RTEMS_HOST%g s%@RTEMS_LIBC_DIR@%$RTEMS_LIBC_DIR%g s%@RTEMS_ROOT@%$RTEMS_ROOT%g @@ -2221,6 +2220,6 @@ test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 echo echo target architecture: $target_cpu. echo available BSPs: $rtems_bsp. -echo \'make all\' will build the following BSPs: $RTEMS_BSP. -echo other BSPs can be built with \'make RTEMSBSP=\"bsp1 bsp2 ...\"\' +echo \'make all\' will build the following BSPs: $RTEMS_BSP_LIST. +echo other BSPs can be built with \'make RTEMS_BSP=\"bsp1 bsp2 ...\"\' echo diff --git a/configure.in b/configure.in index 4f0bb25067..23898498d8 100644 --- a/configure.in +++ b/configure.in @@ -226,7 +226,7 @@ if test -d "$srcdir/c/src/lib/libbsp/$target_cpu"; then # Is there code where there should be for this BSP? if test -d "$srcdir/c/src/lib/libbsp/$target_cpu/$bspdir"; then - RTEMS_BSP="$RTEMS_BSP $i" + RTEMS_BSP_LIST="$RTEMS_BSP_LIST $i" # make sure the Makefiles in a bsp directory are only done once echo $bspdirs | grep $bspdir >/dev/null 2>&1 if test $? -ne 0 ; then @@ -265,11 +265,6 @@ if [[ "${program_prefix}" = "NONE" ]] ; then fi fi -dnl AC_PROG_CC -dnl AC_PROG_CXX - -dnl RTEMS_BSP=$rtems_bsp -dnl RTEMS_HOST=$host_os RTEMS_ROOT=`cd $srcdir/c; pwd` PROJECT_ROOT=`pwd;` @@ -332,7 +327,7 @@ AC_ARG_ENABLE(hwapi, \ AC_MSG_RESULT(no) ) -AC_SUBST(RTEMS_BSP) +AC_SUBST(RTEMS_BSP_LIST) AC_SUBST(RTEMS_HOST) AC_SUBST(RTEMS_LIBC_DIR) AC_SUBST(RTEMS_ROOT) @@ -391,6 +386,6 @@ c/update-tools/Makefile) echo echo target architecture: $target_cpu. echo available BSPs: $rtems_bsp. -echo \'make all\' will build the following BSPs: $RTEMS_BSP. -echo other BSPs can be built with \'make RTEMSBSP=\"bsp1 bsp2 ...\"\' +echo \'make all\' will build the following BSPs: $RTEMS_BSP_LIST. +echo other BSPs can be built with \'make RTEMS_BSP=\"bsp1 bsp2 ...\"\' echo -- cgit v1.2.3