diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2009-10-17 15:15:54 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2009-10-17 15:15:54 +0000 |
| commit | d8bbc3e64d546271237e9fa9a713915e7c66b1aa (patch) | |
| tree | 32ad75c7c54e54dbccd4dd08cd9d1c04360bcc2e /c | |
| parent | binutils-2.20. (diff) | |
| download | rtems-d8bbc3e64d546271237e9fa9a713915e7c66b1aa.tar.bz2 | |
2009-10-17 Ralf Corsepius <ralf.corsepius@rtems.org>
* configure.ac: Pick up make/custom/*.
* aclocal/check-custom-bsp.m4: Adapt to changes to configure.ac.
Diffstat (limited to 'c')
| -rw-r--r-- | c/src/aclocal/check-custom-bsp.m4 | 14 | ||||
| -rw-r--r-- | c/src/configure.ac | 13 |
2 files changed, 11 insertions, 16 deletions
diff --git a/c/src/aclocal/check-custom-bsp.m4 b/c/src/aclocal/check-custom-bsp.m4 index 850ba2237e..d686e6e526 100644 --- a/c/src/aclocal/check-custom-bsp.m4 +++ b/c/src/aclocal/check-custom-bsp.m4 @@ -1,25 +1,21 @@ dnl $Id$ AC_DEFUN([_RTEMS_CHECK_CUSTOM_BSP],[ +AC_REQUIRE([RTEMS_CANONICAL_TARGET_CPU])dnl sets RTEMS_CPU, target +AC_REQUIRE([RTEMS_TOP])dnl sets RTEMS_TOPdir $2= for i in \ - "${srcdir}/${RTEMS_TOPdir}/c/src/lib/libbsp/${RTEMS_CPU}"/*/make/custom/$1.cfg \ - "${srcdir}/${RTEMS_TOPdir}/make/custom/"$1.cfg; + `ls "${srcdir}/${RTEMS_TOPdir}/c/src/lib/libbsp/${RTEMS_CPU}"/*/make/custom/$1 2>/dev/null`; do - AC_MSG_CHECKING([for $i]) AS_IF([test -r $i],[ $2="$i" - AC_MSG_RESULT([yes]) - break; - ],[ - AC_MSG_RESULT([no]) + break ]) done ]) AC_DEFUN([RTEMS_CHECK_CUSTOM_BSP],[ - AC_REQUIRE([RTEMS_TOP]) - _RTEMS_CHECK_CUSTOM_BSP([[$]$1],[BSP_FOUND]) + _RTEMS_CHECK_CUSTOM_BSP([[$]$1.cfg],[BSP_FOUND]) AS_IF([test -z "$BSP_FOUND"],[ AC_MSG_ERROR([missing [$]$1.cfg]) ]) diff --git a/c/src/configure.ac b/c/src/configure.ac index 2513d1e643..ccbe4b4dc2 100644 --- a/c/src/configure.ac +++ b/c/src/configure.ac @@ -42,22 +42,21 @@ EOF # Collect and copy the BSP's make/custom/*.cfg files from the toplevel make # directory into the build tree's <bsp>/make/custom subdirectories CUSTOM_CFG_FILES= -f="${RTEMS_BSP}" +f="${RTEMS_BSP}.cfg" while test -n "$f"; do cfg_file= _RTEMS_CHECK_CUSTOM_BSP([$f],cfg_file) if test -n "${cfg_file}"; then - cp ${cfg_file} make/custom/$f.cfg + cp ${cfg_file} make/custom/$f cat << EOF >> ${DEPDIR}/cfg.P -make/custom/$f.cfg: ${cfg_file} make/custom/default.cfg - cp ${cfg_file} make/custom/$f.cfg +make/custom/$f: ${cfg_file} make/custom/default.cfg + cp ${cfg_file} make/custom/$f EOF - CUSTOM_CFG_FILES="$CUSTOM_CFG_FILES make/custom/$f.cfg" + CUSTOM_CFG_FILES="$CUSTOM_CFG_FILES make/custom/$f" f=`grep "^include.*make/custom" ${cfg_file} \ | sed \ -e 's%^.*custom\/%%' \ - -e 's%default\.cfg%%' \ - -e 's%\.cfg$%%'`; + -e 's%default\.cfg%%'`; else break; fi; done #${MAKE-make} -f ${DEPDIR}/cfg.P \ |