Changeset 1e030c49 in rtems for cpukit/aclocal


Ignore:
Timestamp:
May 2, 2003, 8:29:10 PM (17 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, 4.8, 4.9, master
Children:
caebcb5b
Parents:
401ae9c
Message:

2003-05-02 Ralf Corsepius <corsepiu@…>

  • aclocal/env-rtemscpu.m4: Merge-in env-rtemsbsp.m4.
  • aclocal/env-rtemsbsp.m4: Remove.
  • aclocal/enable-rtemsbsp.m4: Remove.

2003-05-02 Ralf Corsepius <corsepiu@…>

  • aclocal/env-rtemscpu.m4: Remove stray '/' in setting up project_libdir.
Location:
cpukit/aclocal
Files:
2 deleted
1 edited

Legend:

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

    r401ae9c r1e030c49  
    22
    33AC_DEFUN(RTEMS_ENV_RTEMSCPU,
    4 [AC_REQUIRE([RTEMS_ENABLE_MULTILIB])
     4[
     5  AC_REQUIRE([RTEMS_ENABLE_MULTILIB])
    56
    6 if test x"$multilib" = x"yes"; then
    7   AS_IF([test -n "$with_multisubdir"],
    8     [MULTIBUILDTOP=`echo "/$with_multisubdir" | sed 's,/[[^\\/]]*,../,g'`])
    9   AC_SUBST(MULTIBUILDTOP)
     7  AS_IF([test x"$multilib" = x"yes"],
     8  [
     9    AS_IF([test -n "$with_multisubdir"],
     10      [MULTIBUILDTOP=`echo "/$with_multisubdir" | sed 's,/[[^\\/]]*,../,g'`])
     11    AC_SUBST(MULTIBUILDTOP)
     12 
     13    AS_IF([test -n "$with_multisubdir"],
     14      [MULTISUBDIR="/$with_multisubdir"])
     15    AC_SUBST(MULTISUBDIR)
     16 
     17    PROJECT_INCLUDE="\$(PROJECT_ROOT)/lib/include"
     18    project_libdir="\$(PROJECT_ROOT)/lib\$(MULTISUBDIR)"
     19 
     20    includedir="\${exec_prefix}/lib/include"
     21    libdir="${libdir}\$(MULTISUBDIR)"
     22  ],
     23  [
     24    AC_ARG_VAR([CPU_CFLAGS],[])
     25    AC_ARG_VAR([CFLAGS_OPTIMIZE_V],
     26      [CFLAGS for building the optimized variant])
     27    AC_ARG_VAR([CFLAGS_DEBUG_V],
     28      [CFLAGS for building the debugging variant])
     29    AC_ARG_VAR([CFLAGS_PROFILE_V],
     30      [CFLAGS for building the profiled variant])
     31 
     32    AC_ARG_VAR([RTEMS_BSP],[RTEMS_BSP to build])
     33    AC_MSG_CHECKING([for RTEMS_BSP])
     34    AC_CACHE_VAL(rtems_cv_RTEMS_BSP,[
     35      test -n "${RTEMS_BSP}" && rtems_cv_RTEMS_BSP="$RTEMS_BSP"
     36    ])
     37    AS_IF([test -z "$rtems_cv_RTEMS_BSP"],[
     38      AC_MSG_ERROR([Missing RTEMS_BSP])
     39    ])
     40    RTEMS_BSP="$rtems_cv_RTEMS_BSP"
     41    AC_MSG_RESULT(${RTEMS_BSP})
     42    AC_SUBST(RTEMS_BSP)
     43 
     44    PROJECT_INCLUDE="\$(PROJECT_ROOT)/$RTEMS_BSP/lib/include"
     45    project_libdir="${PROJECT_ROOT}/$RTEMS_BSP/lib"   
    1046
    11   AS_IF([test -n "$with_multisubdir"],
    12     [MULTISUBDIR="/$with_multisubdir"])
    13   AC_SUBST(MULTISUBDIR)
     47    includedir="\${exec_prefix}/${RTEMS_BSP}/lib/include"
     48    libdir="\${exec_prefix}/${RTEMS_BSP}/lib"
    1449
    15   PROJECT_INCLUDE="\$(PROJECT_ROOT)/lib/include"
     50    RTEMS_ENABLE_BARE
     51    AC_SUBST(BARE_CPU_MODEL)
     52    AC_SUBST(BARE_CPU_CFLAGS)
     53  ])
     54
     55  AC_SUBST(project_libdir)
    1656  AC_SUBST(PROJECT_INCLUDE)
    17 
    18   project_libdir="\$(PROJECT_ROOT)/lib/\$(MULTISUBDIR)"
    19   AC_SUBST(project_libdir)
    20 
    21   includedir="\${exec_prefix}/lib/include"
    22   libdir="${libdir}\$(MULTISUBDIR)"
    23 else
    24   RTEMS_ENV_RTEMSBSP
    25 fi
     57 
     58  AM_CONDITIONAL([MULTILIB],[test x"$multilib" = x"yes"])
    2659])
Note: See TracChangeset for help on using the changeset viewer.