Changeset d8bbc3e in rtems


Ignore:
Timestamp:
Oct 17, 2009, 3:15:54 PM (11 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, 5, master
Children:
848c996
Parents:
532add7
Message:

2009-10-17 Ralf Corsepius <ralf.corsepius@…>

  • configure.ac: Pick up make/custom/*.
  • aclocal/check-custom-bsp.m4: Adapt to changes to configure.ac.
Location:
c/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • c/src/aclocal/check-custom-bsp.m4

    r532add7 rd8bbc3e  
    22
    33AC_DEFUN([_RTEMS_CHECK_CUSTOM_BSP],[
     4AC_REQUIRE([RTEMS_CANONICAL_TARGET_CPU])dnl sets RTEMS_CPU, target
     5AC_REQUIRE([RTEMS_TOP])dnl sets RTEMS_TOPdir
    46  $2=
    57  for i in \
    6     "${srcdir}/${RTEMS_TOPdir}/c/src/lib/libbsp/${RTEMS_CPU}"/*/make/custom/$1.cfg \
    7     "${srcdir}/${RTEMS_TOPdir}/make/custom/"$1.cfg;
     8    `ls "${srcdir}/${RTEMS_TOPdir}/c/src/lib/libbsp/${RTEMS_CPU}"/*/make/custom/$1 2>/dev/null`;
    89  do
    9     AC_MSG_CHECKING([for $i])
    1010    AS_IF([test -r $i],[
    1111      $2="$i"
    12       AC_MSG_RESULT([yes])
    13       break;
    14     ],[
    15       AC_MSG_RESULT([no])
     12      break
    1613    ])
    1714  done
     
    1916
    2017AC_DEFUN([RTEMS_CHECK_CUSTOM_BSP],[
    21   AC_REQUIRE([RTEMS_TOP])
    22   _RTEMS_CHECK_CUSTOM_BSP([[$]$1],[BSP_FOUND])
     18  _RTEMS_CHECK_CUSTOM_BSP([[$]$1.cfg],[BSP_FOUND])
    2319  AS_IF([test -z "$BSP_FOUND"],[
    2420    AC_MSG_ERROR([missing [$]$1.cfg])
  • c/src/configure.ac

    r532add7 rd8bbc3e  
    4343# directory into the build tree's <bsp>/make/custom subdirectories
    4444CUSTOM_CFG_FILES=
    45 f="${RTEMS_BSP}"
     45f="${RTEMS_BSP}.cfg"
    4646while test -n "$f"; do
    4747  cfg_file=
    4848  _RTEMS_CHECK_CUSTOM_BSP([$f],cfg_file)
    4949  if test -n "${cfg_file}"; then
    50     cp ${cfg_file} make/custom/$f.cfg
     50    cp ${cfg_file} make/custom/$f
    5151cat << EOF >> ${DEPDIR}/cfg.P
    52 make/custom/$f.cfg: ${cfg_file} make/custom/default.cfg
    53         cp ${cfg_file} make/custom/$f.cfg
     52make/custom/$f: ${cfg_file} make/custom/default.cfg
     53        cp ${cfg_file} make/custom/$f
    5454EOF
    55     CUSTOM_CFG_FILES="$CUSTOM_CFG_FILES make/custom/$f.cfg"
     55    CUSTOM_CFG_FILES="$CUSTOM_CFG_FILES make/custom/$f"
    5656    f=`grep "^include.*make/custom" ${cfg_file} \
    5757    | sed \
    5858      -e 's%^.*custom\/%%' \
    59       -e 's%default\.cfg%%' \
    60       -e 's%\.cfg$%%'`;
     59      -e 's%default\.cfg%%'`;
    6160  else break; fi;
    6261done
Note: See TracChangeset for help on using the changeset viewer.