diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-03-29 12:35:15 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-03-29 12:35:15 +0000 |
| commit | 894b7f9712b59384d25da2adaf9093ae4328b8a1 (patch) | |
| tree | a4b5aec71aea61145dd5a8809ef636acfed5dd00 /cpukit/aclocal/env-rtemscpu.m4 | |
| parent | 2004-03-28 Ralf Corsepius <ralf_corsepius@rtems.org> (diff) | |
| download | rtems-894b7f9712b59384d25da2adaf9093ae4328b8a1.tar.bz2 | |
2004-03-29 Ralf Corsepius <ralf_corsepius@rtems.org>
* aclocal/rtems-top.m4: Add MULTISUBDIR. Add MULTIBUILDTOP.
Add rtems_updir. Remove version.m4 check.
Add PROJECT_ROOT/with_project_root processing.
Add PROJECT_INCLUDE. Add PROJECT_LIB.
* aclocal/env-rtemscpu.a4: Remove cpukit_topdir.
Remove with_project_root processing. Remove PROJECT_INCLUDE,
PROJECT_LIB.
Diffstat (limited to 'cpukit/aclocal/env-rtemscpu.m4')
| -rw-r--r-- | cpukit/aclocal/env-rtemscpu.m4 | 48 |
1 files changed, 2 insertions, 46 deletions
diff --git a/cpukit/aclocal/env-rtemscpu.m4 b/cpukit/aclocal/env-rtemscpu.m4 index d5e27bf8b9..2607e78514 100644 --- a/cpukit/aclocal/env-rtemscpu.m4 +++ b/cpukit/aclocal/env-rtemscpu.m4 @@ -7,10 +7,6 @@ AC_DEFUN([RTEMS_ENV_RTEMSCPU], [ AC_REQUIRE([RTEMS_ENABLE_MULTILIB]) - # RTEMS_TOPdir points to the top of RTEMS source tree - # cpukit_topdir points to the top of the cpukit source tree - cpukit_topdir="/${RTEMS_TOPdir}/" - AS_IF([test -n "$enable_rtemsbsp"], [ # Per BSP AC_ARG_VAR([CPU_CFLAGS],[]) @@ -29,55 +25,15 @@ AC_DEFUN([RTEMS_ENV_RTEMSCPU], RTEMS_BSP="$rtems_cv_RTEMS_BSP" AC_MSG_RESULT(${RTEMS_BSP}) - test x"${with_project_root}" = x && with_project_root="."; - case x${with_project_root} in - x[[\\/]]* | x?:[[\\/]]* ) # absolute dir - PROJECT_ROOT="${with_project_root}" - ;; - x* ) # relative dir - PROJECT_ROOT="\$(top_builddir)${cpukit_topdir}${with_project_root}" - ;; - esac - - PROJECT_ROOT="${PROJECT_ROOT}/$RTEMS_BSP" - AC_SUBST([PROJECT_INCLUDE],["${PROJECT_ROOT}/lib/include"]) - AC_SUBST([PROJECT_LIB],["${PROJECT_ROOT}/lib"]) - includedir="\${exec_prefix}/${RTEMS_BSP}/lib/include" libdir="\${exec_prefix}/${RTEMS_BSP}/lib" ],[ - AS_IF([test x"$multilib" = x"yes"], - [ - AS_IF([test -n "$with_multisubdir"], - [MULTIBUILDTOP=`echo "/$with_multisubdir" | sed 's,/[[^\\/]]*,../,g'`]) - AC_SUBST(MULTIBUILDTOP) - - AS_IF([test -n "$with_multisubdir"], - [MULTISUBDIR="/$with_multisubdir"]) - AC_SUBST(MULTISUBDIR) - - PROJECT_ROOT="\$(top_builddir)${cpukit_topdir}../\$(MULTIBUILDTOP)" - - AC_SUBST([PROJECT_INCLUDE],["${PROJECT_ROOT}lib/include"]) - AC_SUBST([PROJECT_LIB],["${PROJECT_ROOT}lib\$(MULTISUBDIR)"]) - - includedir="\${exec_prefix}/include" - libdir="${libdir}\$(MULTISUBDIR)" - ],[ - PROJECT_ROOT="\$(top_builddir)${cpukit_topdir}" - - AC_SUBST([PROJECT_INCLUDE],["${PROJECT_ROOT}lib/include"]) - AC_SUBST([PROJECT_LIB],["${PROJECT_ROOT}lib\$(MULTISUBDIR)"]) - - includedir="\${exec_prefix}/include" - libdir="${libdir}\$(MULTISUBDIR)" - ]) + includedir="\${exec_prefix}/include" + libdir="${libdir}\$(MULTISUBDIR)" ]) AC_SUBST([project_libdir],["\$(libdir)"]) AC_SUBST([project_includedir],["\$(includedir)"]) - AC_SUBST(PROJECT_ROOT) - AM_CONDITIONAL([MULTILIB],[test x"$multilib" = x"yes"]) ]) |