diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2001-12-20 17:33:23 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2001-12-20 17:33:23 +0000 |
| commit | ba748523d172d32b4c7d6207f6c2c5444c8f93a3 (patch) | |
| tree | 7fe6e24d8b195b0dec0138a29712948e81aa8b25 /aclocal/env-rtemsbsp.m4 | |
| parent | 2001-12-20 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-ba748523d172d32b4c7d6207f6c2c5444c8f93a3.tar.bz2 | |
2001-12-20 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* 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.
Diffstat (limited to 'aclocal/env-rtemsbsp.m4')
| -rw-r--r-- | aclocal/env-rtemsbsp.m4 | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/aclocal/env-rtemsbsp.m4 b/aclocal/env-rtemsbsp.m4 index 43fb2a6b43..ae84ca53a6 100644 --- a/aclocal/env-rtemsbsp.m4 +++ b/aclocal/env-rtemsbsp.m4 @@ -24,9 +24,15 @@ AC_SUBST(RTEMS_BSP) RTEMS_BSP_SPECS="-specs bsp_specs -qrtems" AC_SUBST(RTEMS_BSP_SPECS) -GCC_SPECS="-B\$(PROJECT_ROOT)/ -B\$(PROJECT_ROOT)/$RTEMS_BSP/lib/" +GCC_SPECS="-B\$(PROJECT_ROOT)/lib/ -B\$(PROJECT_ROOT)/$RTEMS_BSP/lib/" AC_SUBST(GCC_SPECS) +PROJECT_INCLUDE="\$(PROJECT_ROOT)/$RTEMS_BSP/lib/include" +AC_SUBST(PROJECT_INCLUDE) + +PROJECT_RELEASE="\$(PROJECT_ROOT)/$RTEMS_BSP" +AC_SUBST(PROJECT_RELEASE) + RTEMS_ROOT=$PROJECT_ROOT/c/$RTEMS_BSP AC_SUBST(RTEMS_ROOT) @@ -34,7 +40,8 @@ RTEMS_ENABLE_BARE AC_SUBST(BARE_CPU_MODEL) AC_SUBST(BARE_CPU_CFLAGS) -AM_CONDITIONAL(RTEMS_CONFIG_PER_BSP, true); +AM_CONDITIONAL([RTEMS_CONFIG_PER_BSP],[true]) +AM_CONDITIONAL([MULTILIB],[false]) includedir="\${exec_prefix}/\$(RTEMS_BSP)/lib/include" ]) |