Changeset ba748523 in rtems for aclocal/env-rtemscpu.m4


Ignore:
Timestamp:
Dec 20, 2001, 5:33:23 PM (19 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
8fec915
Parents:
f92cc34
Message:

2001-12-20 Ralf Corsepius <corsepiu@…>

  • configure.ac: Reworked for multilibs, reflect changes to aclocal/*.m4.
  • aclocal/subdirs.m4: New file.
  • aclocal/multi.m4: New file, adopted from autoconf-2.52 w/ modifications.
  • aclocal/check-posix.m4: Apply AS_IF.
  • aclocal/config-subdirs.m4: Reflect changes to other m4-macros.
  • aclocal/env-rtemsbsp.m4: Add PROJECT_INCLUDE, PROJECT_RELEASE. Add AM_CONDITIONAL(MULTILIB). Adapt GCC_SPECS to multilibs.
  • aclocal/env-rtemscpu.m4: Remove RTEMS_BSP. Add support for MULTIBUILDTOP, MULTISUBDIR. Adapt GCC_SPECS to multilibs. Add PROJECT_INCLUDE, PROJECT_RELEASE, includedir, libdir.
  • aclocal/multilib.m4: Fix m4-quoting, adopt automake-1.5's OUTPUT_COMMANDS.
  • aclocal/project-root.m4: Remove PROJECT_INCLUDE, PROJECT_RELEASE.
  • aclocal/rtems-debug.m4: Minor cleanups.
  • aclocal/rtems-top.m4: Minor cleanups.
  • automake/compile.am: Further steps towards automake's rules.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • aclocal/env-rtemscpu.m4

    rf92cc34 rba748523  
    44[AC_REQUIRE([RTEMS_ENABLE_MULTILIB])
    55
    6 if test x"$multilib" = x"no"; then
    7   RTEMS_ENV_RTEMSBSP
    8   RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
    9 else
     6if test x"$multilib" = x"yes"; then
    107## FIXME: There is no multilib BSP
    11   rtems_cv_RTEMS_BSP="multilib"
    12   RTEMS_BSP="$rtems_cv_RTEMS_BSP"
    13   AC_SUBST(RTEMS_BSP)
    14 
    158  RTEMS_BSP_SPECS=""
    169  AC_SUBST(RTEMS_BSP_SPECS)
    1710
    18   GCC_SPECS="-B\$(PROJECT_ROOT)/ -B\$(PROJECT_ROOT)/lib/"
     11  if test -n "$with_multisubdir"; then
     12    MULTIBUILDTOP=`echo "/$with_multisubdir" | sed 's,/[[^\\/]]*,../,g'`
     13  fi
     14  AC_SUBST(MULTIBUILDTOP)
     15
     16  if test -n "$with_multisubdir"; then
     17    MULTISUBDIR="/$with_multisubdir"
     18  fi
     19  AC_SUBST(MULTISUBDIR)
     20
     21  PROJECT_ROOT="${RTEMS_TOPdir}/\$(MULTIBUILDTOP)\$(top_builddir)"
     22  GCC_SPECS="-isystem \$(PROJECT_ROOT)/lib/include"
    1923  AC_SUBST(GCC_SPECS)
    2024
    21   RTEMS_ROOT=$PROJECT_ROOT/c
     25  PROJECT_INCLUDE="\$(PROJECT_ROOT)/lib/include"
     26  AC_SUBST(PROJECT_INCLUDE)
     27
     28  PROJECT_RELEASE="\$(PROJECT_ROOT)"
     29  AC_SUBST(PROJECT_RELEASE)
     30
     31  RTEMS_ROOT=${PROJECT_ROOT}
    2232  AC_SUBST(RTEMS_ROOT)
     33
     34  includedir="\${exec_prefix}/lib/include"
     35  libdir="${libdir}\$(MULTISUBDIR)"
     36else
     37  RTEMS_ENV_RTEMSBSP
     38  RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
    2339fi
    2440])
Note: See TracChangeset for help on using the changeset viewer.