diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-03-24 10:23:16 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-03-24 10:23:16 +0000 |
| commit | dbe9b0ca1cc2ff7376cdf564b49928c5173c41d9 (patch) | |
| tree | 8f2d8f9ec6702e24a1f909e789a483058a22edb0 /cpukit/aclocal | |
| parent | Merger from rtems-4-6-branch. (diff) | |
| download | rtems-dbe9b0ca1cc2ff7376cdf564b49928c5173c41d9.tar.bz2 | |
Merger from rtems-4-6-branch.
Diffstat (limited to 'cpukit/aclocal')
| -rw-r--r-- | cpukit/aclocal/env-rtemsbsp.m4 | 4 | ||||
| -rw-r--r-- | cpukit/aclocal/env-rtemscpu.m4 | 6 | ||||
| -rw-r--r-- | cpukit/aclocal/tool-paths.m4 | 23 |
3 files changed, 1 insertions, 32 deletions
diff --git a/cpukit/aclocal/env-rtemsbsp.m4 b/cpukit/aclocal/env-rtemsbsp.m4 index ae1a6f72d3..531af6e881 100644 --- a/cpukit/aclocal/env-rtemsbsp.m4 +++ b/cpukit/aclocal/env-rtemsbsp.m4 @@ -5,7 +5,6 @@ dnl used by per BSP configure scripts AC_DEFUN(RTEMS_ENV_RTEMSBSP, [dnl AC_BEFORE([$0], [RTEMS_ENABLE_RTEMSBSP])dnl -AC_BEFORE([$0], [RTEMS_PROJECT_ROOT])dnl AC_ARG_VAR([CPU_CFLAGS],[]) AC_ARG_VAR([CFLAGS_OPTIMIZE_V],[]) @@ -31,9 +30,6 @@ AC_SUBST(PROJECT_INCLUDE) project_libdir="${PROJECT_ROOT}/$RTEMS_BSP/lib" AC_SUBST(project_libdir) -RTEMS_ROOT="$PROJECT_ROOT/c/$RTEMS_BSP" -AC_SUBST(RTEMS_ROOT) - RTEMS_ENABLE_BARE AC_SUBST(BARE_CPU_MODEL) AC_SUBST(BARE_CPU_CFLAGS) diff --git a/cpukit/aclocal/env-rtemscpu.m4 b/cpukit/aclocal/env-rtemscpu.m4 index 0ea77438b6..c6635aa611 100644 --- a/cpukit/aclocal/env-rtemscpu.m4 +++ b/cpukit/aclocal/env-rtemscpu.m4 @@ -4,7 +4,6 @@ AC_DEFUN(RTEMS_ENV_RTEMSCPU, [AC_REQUIRE([RTEMS_ENABLE_MULTILIB]) if test x"$multilib" = x"yes"; then -## FIXME: There is no multilib BSP AS_IF([test -n "$with_multisubdir"], [MULTIBUILDTOP=`echo "/$with_multisubdir" | sed 's,/[[^\\/]]*,../,g'`]) AC_SUBST(MULTIBUILDTOP) @@ -16,12 +15,9 @@ if test x"$multilib" = x"yes"; then PROJECT_INCLUDE="\$(PROJECT_ROOT)/lib/include" AC_SUBST(PROJECT_INCLUDE) - project_libdir="\$(PROJECT_ROOT)/lib" + project_libdir="\$(PROJECT_ROOT)/lib/\$(MULTISUBDIR)" AC_SUBST(project_libdir) - RTEMS_ROOT="${PROJECT_ROOT}" - AC_SUBST(RTEMS_ROOT) - includedir="\${exec_prefix}/lib/include" libdir="${libdir}\$(MULTISUBDIR)" else diff --git a/cpukit/aclocal/tool-paths.m4 b/cpukit/aclocal/tool-paths.m4 deleted file mode 100644 index cb61747afd..0000000000 --- a/cpukit/aclocal/tool-paths.m4 +++ /dev/null @@ -1,23 +0,0 @@ -AC_DEFUN(RTEMS_TOOLPATHS, -[ -# tooldir='$(exec_prefix)/'$target_alias -# Temporary work-around until building in source tree is supported -AC_REQUIRE([RTEMS_PROJECT_ROOT]) - -tooldir='$(PROJECT_ROOT)' -AC_SUBST(tooldir) - -project_includedir='$(tooldir)'/include -AC_SUBST(project_includedir) - -project_libdir='$(tooldir)/lib$(MULTISUBDIR)' -AC_SUBST(project_libdir) - -project_bindir='$(tooldir)/bin' -AC_SUBST(project_bindir) - -rtems_bspdir='$(prefix)/${RTEMS_BSP}' -AC_SUBST(rtems_bspdir) -rtems_makedir='$(prefix)/make' -AC_SUBST(rtems_makedir) -]) |