Changeset 894b7f97 in rtems


Ignore:
Timestamp:
Mar 29, 2004, 12:35:15 PM (16 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, 4.8, 4.9, master
Children:
2f4c86f
Parents:
c50e978
Message:

2004-03-29 Ralf Corsepius <ralf_corsepius@…>

  • aclocal/rtems-top.m4: Add MULTISUBDIR. Add MULTIBUILDTOP. Add rtems_updir. Remove version.m4 check. Add PROJECT_ROOT/with_project_root processing. Add PROJECT_INCLUDE. Add PROJECT_LIB.
  • aclocal/env-rtemscpu.a4: Remove cpukit_topdir. Remove with_project_root processing. Remove PROJECT_INCLUDE, PROJECT_LIB.
Location:
cpukit
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • cpukit/ChangeLog

    rc50e978 r894b7f97  
     12004-03-29      Ralf Corsepius <ralf_corsepius@rtems.org>
     2
     3        * aclocal/rtems-top.m4: Add MULTISUBDIR. Add MULTIBUILDTOP.
     4        Add rtems_updir. Remove version.m4 check.
     5        Add PROJECT_ROOT/with_project_root processing.
     6        Add PROJECT_INCLUDE. Add PROJECT_LIB.
     7        * aclocal/env-rtemscpu.a4: Remove cpukit_topdir.
     8        Remove with_project_root processing. Remove PROJECT_INCLUDE,
     9        PROJECT_LIB.
     10
    1112004-03-26      Ralf Corsepius <ralf_corsepius@rtems.org>
    212
  • cpukit/aclocal/env-rtemscpu.m4

    rc50e978 r894b7f97  
    77[
    88  AC_REQUIRE([RTEMS_ENABLE_MULTILIB])
    9 
    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}/"
    139
    1410  AS_IF([test -n "$enable_rtemsbsp"],
     
    3026    AC_MSG_RESULT(${RTEMS_BSP})
    3127
    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 
    4628    includedir="\${exec_prefix}/${RTEMS_BSP}/lib/include"
    4729    libdir="\${exec_prefix}/${RTEMS_BSP}/lib"
    4830  ],[
    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)
    58 
    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     ])
     31    includedir="\${exec_prefix}/include"
     32    libdir="${libdir}\$(MULTISUBDIR)"
    7533  ])
    7634
     
    7836  AC_SUBST([project_includedir],["\$(includedir)"])
    7937
    80   AC_SUBST(PROJECT_ROOT)
    81 
    8238  AM_CONDITIONAL([MULTILIB],[test x"$multilib" = x"yes"])
    8339])
  • cpukit/aclocal/rtems-top.m4

    rc50e978 r894b7f97  
    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
     
    1818AC_PREFIX_DEFAULT([/opt/rtems-][RTEMS_API])
    1919
    20 RTEMS_TOPdir="$1";
    21 AC_SUBST(RTEMS_TOPdir)
     20AC_SUBST([RTEMS_TOPdir],["$1"])
    2221
    23 ## with_target_subdirs is handled implicitly by autoconf
    24 test -n "$with_target_subdir" || with_target_subdir="."
     22# HACK: The sed pattern below strips of "../", corresponding to "cpukit/"
     23rtems_updir="/"m4_if([$2],[],[`echo "$1/" | sed s,^\.\.\/,,`],[$2/])
    2524
    26 AC_MSG_CHECKING([for RTEMS Version])
    27 AC_MSG_RESULT([_RTEMS_VERSION])
     25AS_IF([test -n "$with_multisubdir"],
     26  [MULTIBUILDTOP=`echo "/$with_multisubdir" | sed 's,/[[^\\/]]*,../,g'`])
     27AC_SUBST(MULTIBUILDTOP)
     28 
     29AS_IF([test -n "$with_multisubdir"],
     30  [MULTISUBDIR="/$with_multisubdir"])
     31AC_SUBST(MULTISUBDIR)
     32
     33AC_ARG_WITH([project-root],[
     34AS_HELP_STRING(--with-project-root,directory to pre-install files into)],[
     35## Make sure to have a terminating '/'
     36case "${with_project_root}" in
     37*/) ;;
     38*) with_project_root="${with_project_root}/" ;;
     39esac
     40
     41case "${with_project_root}" in
     42  [[\\/$]]* | ?:[[\\/]]* ) # absolute directory
     43   PROJECT_ROOT=${with_project_root}
     44   ;;
     45  *) # relative directory
     46   sav0dir=`pwd` && cd ./${rtems_updir}
     47   sav1dir=`pwd` && cd ../${MULTIBUILDTOP}
     48   sav2dir=`pwd` && cd $sav0dir
     49   mydir=`echo $sav1dir | sed s,^$sav2dir${MULTISUBDIR}/,,`
     50   PROJECT_ROOT='$(top_builddir)'${rtems_updir}'../$(MULTIBUILDTOP)'${mydir}/${with_project_root}
     51   ;;
     52esac],[
     53## Defaults: Note: Two different defaults!
     54## ../ for multilib
     55## '.' for non-multilib
     56AS_IF([test "$enable_multilib" = "yes"],[
     57  PROJECT_ROOT='$(top_builddir)'${rtems_updir}'../$(MULTIBUILDTOP)'],[
     58  PROJECT_ROOT='$(top_builddir)'${rtems_updir}])
     59])
     60AC_SUBST([PROJECT_ROOT])
     61
     62AC_SUBST([PROJECT_INCLUDE],["${PROJECT_ROOT}lib/include"])
     63AC_SUBST([PROJECT_LIB],["${PROJECT_ROOT}lib\$(MULTISUBDIR)"])
    2864
    2965AC_SUBST([dirstamp],[\${am__leading_dot}dirstamp])
Note: See TracChangeset for help on using the changeset viewer.