Changeset faf45cc in rtems


Ignore:
Timestamp:
Jan 21, 2004, 5:56:37 PM (16 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, 4.8, 4.9, master
Children:
ba4eefd
Parents:
7ea55607
Message:

2004-01-21 Ralf Corsepius <corsepiu@…>

  • aclocal/rtems-top.m4: Remove PROJECT_ROOT. Prepend ../ to $1.
  • aclocal/env-rtemscpu.m4: Reworked.
  • configure.ac: RTEMS_TOP(.).
Location:
cpukit
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • cpukit/ChangeLog

    r7ea55607 rfaf45cc  
     12004-01-21      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
     2
     3        * aclocal/rtems-top.m4: Remove PROJECT_ROOT.
     4        Prepend ../ to $1.
     5        * aclocal/env-rtemscpu.m4: Reworked.
     6        * configure.ac: RTEMS_TOP([.]).
     7
    182004-01-19      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
    29
  • cpukit/aclocal/env-rtemscpu.m4

    r7ea55607 rfaf45cc  
    11dnl $Id$
    22
     3# PROJECT_ROOT .. Directory to put the temporary installed files into
     4
     5# FIXME: to be revisited - featureladden, bloated
    36AC_DEFUN([RTEMS_ENV_RTEMSCPU],
    47[
    58  AC_REQUIRE([RTEMS_ENABLE_MULTILIB])
    69
    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     AC_SUBST([PROJECT_INCLUDE],["${PROJECT_ROOT}/lib/include"])
    18     AC_SUBST([PROJECT_LIB],["${PROJECT_ROOT}/lib\$(MULTISUBDIR)"])
     10  # RTEMS_TOPdir points to the top of RTEMS source tree
     11  # cpukit_topdir points to the top of the cpukit source tree
     12  cpukit_topdir="/${RTEMS_TOPdir}/"
    1913
    20     includedir="\${exec_prefix}/include"
    21     libdir="${libdir}\$(MULTISUBDIR)"
    22   ],
    23   [
     14  AS_IF([test -n "$enable_rtemsbsp"],
     15  [ # Per BSP
    2416    AC_ARG_VAR([CPU_CFLAGS],[])
    2517    AC_ARG_VAR([CFLAGS_OPTIMIZE_V],
     
    2820      [CFLAGS for building the debugging variant])
    2921 
    30     AC_ARG_VAR([RTEMS_BSP],[RTEMS_BSP to build])
    3122    AC_MSG_CHECKING([for RTEMS_BSP])
    3223    AC_CACHE_VAL(rtems_cv_RTEMS_BSP,[
    33       test -n "${RTEMS_BSP}" && rtems_cv_RTEMS_BSP="$RTEMS_BSP"
     24      test -n "${RTEMS_BSP}" && rtems_cv_RTEMS_BSP="$enable_rtemsbsp"
    3425    ])
    3526    AS_IF([test -z "$rtems_cv_RTEMS_BSP"],[
     
    3829    RTEMS_BSP="$rtems_cv_RTEMS_BSP"
    3930    AC_MSG_RESULT(${RTEMS_BSP})
    40  
     31
     32    test x"${with_project_root}" = x && with_project_root=".";
     33    case x${with_project_root} in
     34    x[[\\/]]* | x?:[[\\/]]* ) # absolute dir
     35      PROJECT_ROOT="${with_project_root}"
     36      ;;
     37    x* ) # relative dir
     38      PROJECT_ROOT="\$(top_builddir)${cpukit_topdir}${with_project_root}"
     39      ;;
     40    esac
     41
     42    PROJECT_ROOT="${PROJECT_ROOT}/$RTEMS_BSP"
     43    AC_SUBST([PROJECT_INCLUDE],["${PROJECT_ROOT}/lib/include"])
     44    AC_SUBST([PROJECT_LIB],["${PROJECT_ROOT}/lib"])
     45
    4146    includedir="\${exec_prefix}/${RTEMS_BSP}/lib/include"
    4247    libdir="\${exec_prefix}/${RTEMS_BSP}/lib"
     48  ],[
     49    AS_IF([test x"$multilib" = x"yes"],
     50    [
     51      AS_IF([test -n "$with_multisubdir"],
     52        [MULTIBUILDTOP=`echo "/$with_multisubdir" | sed 's,/[[^\\/]]*,../,g'`])
     53      AC_SUBST(MULTIBUILDTOP)
     54 
     55      AS_IF([test -n "$with_multisubdir"],
     56        [MULTISUBDIR="/$with_multisubdir"])
     57      AC_SUBST(MULTISUBDIR)
    4358
    44     AC_SUBST([PROJECT_INCLUDE],["${PROJECT_ROOT}/$RTEMS_BSP/lib/include"])
    45     AC_SUBST([PROJECT_LIB],["${PROJECT_ROOT}/$RTEMS_BSP/lib"])
     59      PROJECT_ROOT="\$(top_builddir)${cpukit_topdir}../\$(MULTIBUILDTOP)"
     60
     61      AC_SUBST([PROJECT_INCLUDE],["${PROJECT_ROOT}lib/include"])
     62      AC_SUBST([PROJECT_LIB],["${PROJECT_ROOT}lib\$(MULTISUBDIR)"])
     63
     64      includedir="\${exec_prefix}/include"
     65      libdir="${libdir}\$(MULTISUBDIR)"
     66    ],[
     67      PROJECT_ROOT="\$(top_builddir)${cpukit_topdir}"
     68
     69      AC_SUBST([PROJECT_INCLUDE],["${PROJECT_ROOT}lib/include"])
     70      AC_SUBST([PROJECT_LIB],["${PROJECT_ROOT}lib\$(MULTISUBDIR)"])
     71
     72      includedir="\${exec_prefix}/include"
     73      libdir="${libdir}\$(MULTISUBDIR)"
     74    ])
    4675  ])
    4776
     
    4978  AC_SUBST([project_includedir],["\$(includedir)"])
    5079
     80  AC_SUBST(PROJECT_ROOT)
     81
    5182  AM_CONDITIONAL([MULTILIB],[test x"$multilib" = x"yes"])
    5283])
  • cpukit/aclocal/rtems-top.m4

    r7ea55607 rfaf45cc  
    66dnl RTEMS_TOP($1)
    77dnl
    8 dnl $1 .. relative path from this configure.in to the toplevel configure.in
     8dnl $1 .. relative path from this configure.ac to the toplevel configure.ac
    99dnl
    1010AC_DEFUN([RTEMS_TOP],
     
    1212AC_REQUIRE([RTEMS_VERSIONING])
    1313AC_REQUIRE([AM_SET_LEADING_DOT])
    14 AC_CONFIG_AUX_DIR([$1])
     14AC_CONFIG_AUX_DIR([../$1])
    1515AC_CHECK_PROGS(MAKE, gmake make)
    1616AC_BEFORE([$0], [AM_INIT_AUTOMAKE])dnl
     
    2424test -n "$with_target_subdir" || with_target_subdir="."
    2525
    26 PROJECT_ROOT="${with_project_root}${RTEMS_TOPdir}/\$(MULTIBUILDTOP)\$(top_builddir)"
    27 
    2826AC_MSG_CHECKING([for RTEMS Version])
    2927AC_MSG_RESULT([_RTEMS_VERSION])
  • cpukit/configure.ac

    r7ea55607 rfaf45cc  
    66AC_INIT([rtems-cpukit],[_RTEMS_VERSION],[rtems-bugs@rtems.com])
    77AC_CONFIG_SRCDIR([score])
    8 RTEMS_TOP(..)
     8RTEMS_TOP([.])
    99
    1010RTEMS_CANONICAL_TARGET_CPU
Note: See TracChangeset for help on using the changeset viewer.