Changeset ba74852 in rtems for configure.ac


Ignore:
Timestamp:
Dec 20, 2001, 5:33:23 PM (18 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, master
Children:
8fec915
Parents:
f92cc34
Message:

2001-12-20 Ralf Corsepius <corsepiu@…>

  • configure.ac: Reworked for multilibs, reflect changes to aclocal/*.m4.
  • aclocal/subdirs.m4: New file.
  • aclocal/multi.m4: New file, adopted from autoconf-2.52 w/ modifications.
  • aclocal/check-posix.m4: Apply AS_IF.
  • aclocal/config-subdirs.m4: Reflect changes to other m4-macros.
  • aclocal/env-rtemsbsp.m4: Add PROJECT_INCLUDE, PROJECT_RELEASE. Add AM_CONDITIONAL(MULTILIB). Adapt GCC_SPECS to multilibs.
  • aclocal/env-rtemscpu.m4: Remove RTEMS_BSP. Add support for MULTIBUILDTOP, MULTISUBDIR. Adapt GCC_SPECS to multilibs. Add PROJECT_INCLUDE, PROJECT_RELEASE, includedir, libdir.
  • aclocal/multilib.m4: Fix m4-quoting, adopt automake-1.5's OUTPUT_COMMANDS.
  • aclocal/project-root.m4: Remove PROJECT_INCLUDE, PROJECT_RELEASE.
  • aclocal/rtems-debug.m4: Minor cleanups.
  • aclocal/rtems-top.m4: Minor cleanups.
  • automake/compile.am: Further steps towards automake's rules.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • configure.ac

    rf92cc34 rba74852  
    66AC_INIT
    77AC_CONFIG_SRCDIR([c])
    8 RTEMS_TOP(.)
     8RTEMS_TOP([.])
    99
    1010# Abort if trying to build inside of the source tree.
     
    3434RTEMS_ENABLE_RTEMS_DEBUG
    3535RTEMS_ENABLE_RTEMSBSP(dummy)
     36RTEMS_ENABLE_MULTILIB
    3637
    3738if test $host != $build; then
     
    5455# these tools are built for the build environment
    5556#
    56 build_tools="tools/update"
     57RTEMS_BUILD_CONFIG_SUBDIRS([tools/update])
    5758
    58 # these libraries are built for the host environment
    59 #
    60 host_libs=""
     59RTEMS_HOST_CONFIG_SUBDIRS([tools/build])
     60RTEMS_HOST_CONFIG_SUBDIRS([tools/cpu])
    6161
    62 # these tools are built for the host environment
    63 #
    64 host_tools="tools/build tools/cpu"
    65 
    66 # these libraries are built for the target environment, and are built after
    67 # the host libraries and the host tools (which may be a cross compiler)
    68 #
    69 target_libs="c"
    70 
    71 # these tools are built using the target libs, and are intended to run only
    72 # in the target environment
    73 #
    74 target_tools=""
    75 
    76 ## All tools belong in one of the five categories, and are assigned above.
    77 ## ${host_configdirs} is directories we build using the host tools.
    78 ## ${target_configdirs} is directories we build using the target tools.
    79 #
    80 host_configdirs="${host_libs} ${host_tools}"
    81 AC_SUBST(host_configdirs)
    82 
    83 target_configdirs="${target_libs} ${target_tools}"
    84 AC_SUBST(target_configdirs)
    85 
    86 RTEMS_TARGET_CONFIG_PREPARE
    87 target_subdir=${target_alias}
    88 
    89 RTEMS_HOST_CONFIG_PREPARE
    90 host_subdir=${host_alias}
    91 
    92 if test $build = $host;
    93 then
    94   BUILD_SUBDIRS="$build_tools $host_configdirs"
    95 
    96   if test $build = $target;
    97   then
    98     BUILD_SUBDIRS="$BUILD_SUBDIRS $target_configdirs";
    99   else
    100     TARGET_SUBDIRS=`echo "$target_configdirs" | \
    101       sed -e "s%\([[^ ]][[^ ]]*\)%$target_alias/\1%g"`
    102   fi
    103 else
    104 ## If building Canadian cross, disable the target directories
    105   target_configdirs=""
    106   BUILD_SUBDIRS="$build_tools"
    107   TARGET_SUBDIRS=`echo "$host_configdirs" | \
    108     sed -e "s%\([[^ ]][[^ ]]*\)%$host_alias/\1%g"`
     62RTEMS_TARGET_CONFIG_SUBDIRS([c/make])
     63if test x"$enable_multilib" = x"yes"; then
     64RTEMS_TARGET_CONFIG_SUBDIRS([c/src/exec])
     65# FIXME: Not yet
     66# RTEMS_TARGET_CONFIG_SUBDIRS([c/src/lib])
    10967fi
    110 
    111 AC_CONFIG_SUBDIRS($BUILD_SUBDIRS)
    112 AC_SUBST(TARGET_SUBDIRS)
    113 AC_SUBST(BUILD_SUBDIRS)
     68RTEMS_TARGET_CONFIG_SUBDIRS([c])
    11469
    11570AC_CONFIG_FILES([Makefile
     
    12075make/compilers/Makefile
    12176doc/Makefile])
     77
    12278AC_OUTPUT
    123 
    124 RTEMS_TARGET_CONFIG_SUBDIRS
    125 RTEMS_HOST_CONFIG_SUBDIRS
Note: See TracChangeset for help on using the changeset viewer.