Changeset 6d6f1b34 in rtems


Ignore:
Timestamp:
Jan 20, 1998, 7:30:48 PM (23 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
cb5bfe4
Parents:
bffb938
Message:

Fixed libhwapi to reflect eeprom to non volatile memory rename.

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • configure

    rbffb938 r6d6f1b34  
    14351435  for i in $rtems_bsp; do
    14361436    # make sure there is a make/custom file for the bsp
    1437     if test ! -r "$srcdir/c/make/custom/${i}.cfg"; then
     1437    if test ! -r "$srcdir/make/custom/${i}.cfg"; then
    14381438      { echo "configure: error: no make/custom/${i}.cfg file for BSP $i" 1>&2; exit 1; }
    14391439    fi
     
    15291529fi
    15301530
    1531 RTEMS_ROOT=`cd $srcdir/c; pwd`
     1531RTEMS_ROOT=`cd $srcdir; pwd`
    15321532PROJECT_ROOT=`pwd;`
    15331533
     
    17241724
    17251725           
    1726 echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi/eeprom""... $ac_c" 1>&6
    1727 echo "configure:1728: checking for Makefile.in in c/src/lib/libhwapi/eeprom" >&5
    1728 if test -d $srcdir/c/src/lib/libhwapi/eeprom; then
    1729   rtems_av_save_dir=`pwd`;
    1730   cd $srcdir;
    1731   rtems_av_tmp=`find c/src/lib/libhwapi/eeprom -name "Makefile.in" -print | sed "s/Makefile\.in/%/" | sort | sed "s/%/Makefile/"`
     1726echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi/non_volatile_memory""... $ac_c" 1>&6
     1727echo "configure:1728: checking for Makefile.in in c/src/lib/libhwapi/non_volatile_memory" >&5
     1728if test -d $srcdir/c/src/lib/libhwapi/non_volatile_memory; then
     1729  rtems_av_save_dir=`pwd`;
     1730  cd $srcdir;
     1731  rtems_av_tmp=`find c/src/lib/libhwapi/non_volatile_memory -name "Makefile.in" -print | sed "s/Makefile\.in/%/" | sort | sed "s/%/Makefile/"`
    17321732  makefiles="$makefiles $rtems_av_tmp";
    17331733  cd $rtems_av_save_dir;
     
    18271827
    18281828
    1829 echo $ac_n "checking for Makefile.in in c/make""... $ac_c" 1>&6
    1830 echo "configure:1831: checking for Makefile.in in c/make" >&5
    1831 if test -d $srcdir/c/make; then
    1832   rtems_av_save_dir=`pwd`;
    1833   cd $srcdir;
    1834   rtems_av_tmp=`find c/make -name "Makefile.in" -print | sed "s/Makefile\.in/%/" | sort | sed "s/%/Makefile/"`
     1829echo $ac_n "checking for Makefile.in in make""... $ac_c" 1>&6
     1830echo "configure:1831: checking for Makefile.in in make" >&5
     1831if test -d $srcdir/make; then
     1832  rtems_av_save_dir=`pwd`;
     1833  cd $srcdir;
     1834  rtems_av_tmp=`find make -name "Makefile.in" -print | sed "s/Makefile\.in/%/" | sort | sed "s/%/Makefile/"`
    18351835  makefiles="$makefiles $rtems_av_tmp";
    18361836  cd $rtems_av_save_dir;
     
    20152015c/src/tests/tools/generic/Makefile
    20162016$makefiles
    2017 c/make/host.cfg
    2018 c/make/target.cfg
    2019 c/make/Templates/Makefile.inc
     2017make/host.cfg
     2018make/target.cfg
     2019make/Templates/Makefile.inc
    20202020c/update-tools/Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
    20212021EOF
     
    21612161c/src/tests/tools/generic/Makefile
    21622162$makefiles
    2163 c/make/host.cfg
    2164 c/make/target.cfg
    2165 c/make/Templates/Makefile.inc
     2163make/host.cfg
     2164make/target.cfg
     2165make/Templates/Makefile.inc
    21662166c/update-tools/Makefile"}
    21672167EOF
  • configure.in

    rbffb938 r6d6f1b34  
    214214  for i in $rtems_bsp; do
    215215    # make sure there is a make/custom file for the bsp
    216     if test ! -r "$srcdir/c/make/custom/${i}.cfg"; then
     216    if test ! -r "$srcdir/make/custom/${i}.cfg"; then
    217217      AC_MSG_ERROR([no make/custom/${i}.cfg file for BSP $i])
    218218    fi
     
    269269fi
    270270
    271 RTEMS_ROOT=`cd $srcdir/c; pwd`
     271RTEMS_ROOT=`cd $srcdir; pwd`
    272272PROJECT_ROOT=`pwd;`
    273273
     
    328328            RTEMS_CHECK_MAKEFILE(c/src/lib/libhwapi/discrete)
    329329            RTEMS_CHECK_MAKEFILE(c/src/lib/libhwapi/drivers)
    330             RTEMS_CHECK_MAKEFILE(c/src/lib/libhwapi/eeprom)
     330            RTEMS_CHECK_MAKEFILE(c/src/lib/libhwapi/non_volatile_memory)
    331331            RTEMS_CHECK_MAKEFILE(c/src/lib/libhwapi/serial)
    332332            RTEMS_CHECK_MAKEFILE(c/src/lib/libhwapi/support)
     
    358358# pick up all the Makefiles in required parts of the tree
    359359RTEMS_CHECK_MAKEFILE(c/build-tools)
    360 RTEMS_CHECK_MAKEFILE(c/make)
     360RTEMS_CHECK_MAKEFILE(make)
    361361RTEMS_CHECK_MAKEFILE(c/src/lib/libmisc)
    362362RTEMS_CHECK_MAKEFILE(c/src/tests/samples)
     
    394394c/src/tests/tools/generic/Makefile
    395395$makefiles
    396 c/make/host.cfg
    397 c/make/target.cfg
    398 c/make/Templates/Makefile.inc
     396make/host.cfg
     397make/target.cfg
     398make/Templates/Makefile.inc
    399399c/update-tools/Makefile)
    400400
Note: See TracChangeset for help on using the changeset viewer.