Changeset 6855663 in rtems for cpukit/aclocal


Ignore:
Timestamp:
Mar 30, 2004, 3:19:48 PM (16 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, 4.8, 4.9, master
Children:
6cd05d2
Parents:
ddeb7693
Message:

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

  • aclocal/rtems-top.m4: Don't AC_SUBST(PROJECT_ROOT). Add project_libdir, project_include and libdir.
  • aclocal/env-rtemscpu.m4: Remove all references to RTEMS_BSP. Remove project_libdir, project_include and libdir. Unconditionally use CPU_CFLAGS, CFLAGS_OPTIMIZE_V, CFLAGS_DEBUG_V.
Location:
cpukit/aclocal
Files:
2 edited

Legend:

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

    rddeb7693 r6855663  
    11dnl $Id$
    22
    3 # PROJECT_ROOT .. Directory to put the temporary installed files into
    4 
    5 # FIXME: to be revisited - featureladden, bloated
    63AC_DEFUN([RTEMS_ENV_RTEMSCPU],
    74[
    85  AC_REQUIRE([RTEMS_ENABLE_MULTILIB])
    96
    10   AS_IF([test -n "$enable_rtemsbsp"],
    11   [ # Per BSP
    12     AC_ARG_VAR([CPU_CFLAGS],[])
    13     AC_ARG_VAR([CFLAGS_OPTIMIZE_V],
    14       [CFLAGS for building the optimized variant])
    15     AC_ARG_VAR([CFLAGS_DEBUG_V],
    16       [CFLAGS for building the debugging variant])
    17  
    18     AC_MSG_CHECKING([for RTEMS_BSP])
    19     AC_CACHE_VAL(rtems_cv_RTEMS_BSP,[
    20       test -n "${RTEMS_BSP}" && rtems_cv_RTEMS_BSP="$enable_rtemsbsp"
    21     ])
    22     AS_IF([test -z "$rtems_cv_RTEMS_BSP"],[
    23       AC_MSG_ERROR([Missing RTEMS_BSP])
    24     ])
    25     RTEMS_BSP="$rtems_cv_RTEMS_BSP"
    26     AC_MSG_RESULT(${RTEMS_BSP})
    27 
    28     includedir="\${exec_prefix}/${RTEMS_BSP}/lib/include"
    29     libdir="\${exec_prefix}/${RTEMS_BSP}/lib"
    30   ],[
    31     includedir="\${exec_prefix}/include"
    32     libdir="${libdir}\$(MULTISUBDIR)"
    33   ])
    34 
    35   AC_SUBST([project_libdir],["\$(libdir)"])
    36   AC_SUBST([project_includedir],["\$(includedir)"])
     7  AC_ARG_VAR([CPU_CFLAGS],[])
     8  AC_ARG_VAR([CFLAGS_OPTIMIZE_V],
     9    [CFLAGS for building the optimized variant])
     10  AC_ARG_VAR([CFLAGS_DEBUG_V],
     11    [CFLAGS for building the debugging variant])
    3712
    3813  AM_CONDITIONAL([MULTILIB],[test x"$multilib" = x"yes"])
  • cpukit/aclocal/rtems-top.m4

    rddeb7693 r6855663  
    5858  PROJECT_ROOT='$(top_builddir)'${rtems_updir}])
    5959])
    60 AC_SUBST([PROJECT_ROOT])
    6160
    6261AC_SUBST([PROJECT_INCLUDE],["${PROJECT_ROOT}lib/include"])
    6362AC_SUBST([PROJECT_LIB],["${PROJECT_ROOT}lib\$(MULTISUBDIR)"])
    6463
     64libdir="${libdir}\$(MULTISUBDIR)"
     65
     66AC_SUBST([project_libdir],["\$(libdir)"])
     67AC_SUBST([project_includedir],["\$(includedir)"])
     68
    6569AC_SUBST([dirstamp],[\${am__leading_dot}dirstamp])
    6670])dnl
Note: See TracChangeset for help on using the changeset viewer.