Changeset 14620166 in rtems for cpukit/aclocal


Ignore:
Timestamp:
Jul 22, 2002, 9:17:11 AM (18 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, 4.8, 4.9, master
Children:
35b2275
Parents:
be3e0f7
Message:

2002-07-22 Ralf Corsepius <corsepiu@…>

  • aclocal/env-rtemsbsp.m4: Remove RTEMS_BSP_SPECS, PROJECT_RELEASE. Add project_libdir, libdir. New GCC_SPECS. Various cleanups.
  • aclocal/env-rtemscpu.m4: Remove RTEMS_BSP_SPECS, PROJECT_RELEASE. Add project_libdir, libdir. New GCC_SPECS. Various cleanups.
  • aclocal/rtems-top.m4: New PROJECT_ROOT handling.
  • automake/compile.am: Remove RTEMS_BSP_SPECS, LD* flags, LINK, references to bsp_specs. Use project_libdir instead of $(PROJECT_RELEASE)/lib.
Location:
cpukit/aclocal
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • cpukit/aclocal/env-rtemsbsp.m4

    rbe3e0f7 r14620166  
    2222AC_SUBST(RTEMS_BSP)
    2323
    24 RTEMS_BSP_SPECS="-specs bsp_specs -qrtems"
    25 AC_SUBST(RTEMS_BSP_SPECS)
    26 
    27 GCC_SPECS="-B\$(PROJECT_ROOT)/lib/ -B\$(PROJECT_ROOT)/$RTEMS_BSP/lib/"
    28 AC_SUBST(GCC_SPECS)
    29 
    3024PROJECT_INCLUDE="\$(PROJECT_ROOT)/$RTEMS_BSP/lib/include"
    3125AC_SUBST(PROJECT_INCLUDE)
    3226
    33 PROJECT_RELEASE="\$(PROJECT_ROOT)/$RTEMS_BSP"   
    34 AC_SUBST(PROJECT_RELEASE)
     27project_libdir="${PROJECT_ROOT}/$RTEMS_BSP/lib"   
     28AC_SUBST(project_libdir)
    3529
    36 RTEMS_ROOT=$PROJECT_ROOT/c/$RTEMS_BSP
     30RTEMS_ROOT="$PROJECT_ROOT/c/$RTEMS_BSP"
    3731AC_SUBST(RTEMS_ROOT)
     32
     33GCC_SPECS="-isystem \$(PROJECT_INCLUDE)"
     34AC_SUBST(GCC_SPECS)
    3835
    3936RTEMS_ENABLE_BARE
     
    4542
    4643includedir="\${exec_prefix}/${RTEMS_BSP}/lib/include"
     44libdir="\${exec_prefix}/${RTEMS_BSP}/lib"
    4745])
  • cpukit/aclocal/env-rtemscpu.m4

    rbe3e0f7 r14620166  
    66if test x"$multilib" = x"yes"; then
    77## FIXME: There is no multilib BSP
    8   RTEMS_BSP_SPECS=""
    9   AC_SUBST(RTEMS_BSP_SPECS)
    10 
    118  if test -n "$with_multisubdir"; then
    129    MULTIBUILDTOP=`echo "/$with_multisubdir" | sed 's,/[[^\\/]]*,../,g'`
     
    1916  AC_SUBST(MULTISUBDIR)
    2017
    21   PROJECT_ROOT="../../${RTEMS_TOPdir}/\$(MULTIBUILDTOP)\$(top_builddir)"
    22   GCC_SPECS="-isystem \$(PROJECT_ROOT)/lib/include"
     18  GCC_SPECS="-isystem \$(PROJECT_INCLUDE)"
    2319  AC_SUBST(GCC_SPECS)
    2420
     
    2622  AC_SUBST(PROJECT_INCLUDE)
    2723
    28   PROJECT_RELEASE="\$(PROJECT_ROOT)"
    29   AC_SUBST(PROJECT_RELEASE)
     24  project_libdir="\$(PROJECT_ROOT)/lib"
     25  AC_SUBST(project_libdir)
    3026
    31   RTEMS_ROOT=${PROJECT_ROOT}
     27  RTEMS_ROOT="${PROJECT_ROOT}"
    3228  AC_SUBST(RTEMS_ROOT)
    3329
  • cpukit/aclocal/rtems-top.m4

    rbe3e0f7 r14620166  
    3636AC_SUBST(PROJECT_TOPdir)
    3737
    38 AS_IF([test "${with_project_root+set}" = set],
    39   [PROJECT_ROOT="${with_project_root}${RTEMS_TOPdir}/\$(top_builddir)"],
    40   [PROJECT_ROOT="${RTEMS_TOPdir}/\$(top_builddir)"])
     38PROJECT_ROOT="${with_project_root}${RTEMS_TOPdir}/\$(MULTIBUILDTOP)\$(top_builddir)"
    4139AC_SUBST(PROJECT_ROOT)
    4240
Note: See TracChangeset for help on using the changeset viewer.