Changeset 37b5d78 in rtems


Ignore:
Timestamp:
Sep 14, 2001, 5:30:22 PM (19 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
130291f
Parents:
0f466f7e
Message:

2001-09-14 Ralf Corsepius <corsepiu@…>

  • aclocal/canonical-target-name.m4: Use AC_CANONICAL_TARGET instead of AC_CANONICAL_SYSTEM.
  • aclocal/config-subdirs.m4: Use AS_MKDIR_P instead of mkinstalldirs and mkdir.
  • aclocal/target.m4: Obsolete RTEMS_OUTPUT_BUILD_SUBDIRS, hack RTEMS_CONFIG_BUILD_SUBDIRS, introduce _RTEMS_OUTPUT_BUILD_SUBDIRS.
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • ChangeLog

    r0f466f7e r37b5d78  
     12001-09-14      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
     2
     3        * aclocal/canonical-target-name.m4: Use AC_CANONICAL_TARGET instead
     4        of AC_CANONICAL_SYSTEM.
     5        * aclocal/config-subdirs.m4: Use AS_MKDIR_P instead of
     6        mkinstalldirs and mkdir.
     7        * aclocal/target.m4: Obsolete RTEMS_OUTPUT_BUILD_SUBDIRS,
     8        hack RTEMS_CONFIG_BUILD_SUBDIRS, introduce
     9        _RTEMS_OUTPUT_BUILD_SUBDIRS.
     10       
    1112001-09-13      Joel Sherrill <joel@OARcorp.com>
    212
  • aclocal/canonical-target-name.m4

    r0f466f7e r37b5d78  
    1111AC_DEFUN(RTEMS_CANONICAL_TARGET_CPU,
    1212[
    13 AC_CANONICAL_SYSTEM
     13AC_CANONICAL_TARGET
    1414AC_MSG_CHECKING(rtems target cpu)
    1515case "${target}" in
  • aclocal/config-subdirs.m4

    r0f466f7e r37b5d78  
    1616# _RTEMS_PUSH_BUILDDIR
    1717    echo configuring in $1
    18 ## We use mkinstalldirs below as a workaround to mkdir -p not being
    19 ## available everywhere, but us wanting to support deep directories.
    2018    case "$srcdir" in
    2119    .) ;;
    22     *)
    23       if ${ac_aux_dir}/mkinstalldirs $1;
    24       then :;
    25       else
    26         AC_MSG_ERROR([can not create `pwd`/$1])
    27       fi
     20    *) AS_MKDIR_P([$1])
    2821      ;;
    2922    esac
     
    131124  done
    132125
    133   test -n "$target_configdirs" && test -d $target_subdir || mkdir $target_subdir
     126  if test -n "$target_configdirs" && test -d $target_subdir;
     127  then :;
     128  else
     129    AS_MKDIR_P(["$target_subdir"])
     130  fi
    134131
    135132  for ac_config_dir in $target_configdirs; do
     
    208205  done
    209206
    210   test -n "$host_configdirs" && test -d $host_subdir || mkdir $host_subdir
     207  if test -n "$host_configdirs" && test -d $host_subdir;
     208  then :;
     209  else
     210    AS_MKDIR_P(["$host_subdir"])
     211  fi
    211212
    212213  for ac_config_dir in $host_configdirs; do
  • aclocal/target.m4

    r0f466f7e r37b5d78  
    44## The macros below violate most autoconf and canonicalization standards
    55AC_DEFUN(RTEMS_CONFIG_BUILD_SUBDIRS,
    6 [
    7 define([RTEMS_BUILD_SUBDIRS],
    8 ifdef([RTEMS_BUILD_SUBDIRS], [RTEMS_BUILD_SUBDIRS ],)[$1])dnl
    9 build_subdirs="RTEMS_BUILD_SUBDIRS"
    10 AC_SUBST(build_subdirs)
     6[AC_REQUIRE([_RTEMS_OUTPUT_BUILD_SUBDIRS])
     7RTEMS_BUILD_SUBDIRS="$RTEMS_BUILD_SUBDIRS [$1]"
    118])
    129
    1310dnl Derived from automake-1.4's AC_OUTPUT_SUBDIRS
    14 AC_DEFUN(RTEMS_OUTPUT_BUILD_SUBDIRS,
     11AC_DEFUN([_RTEMS_OUTPUT_BUILD_SUBDIRS],
     12[AC_CONFIG_COMMANDS([bsp-tools],
    1513[
     14# HACK: This is a blantant hack and breaks Canadian crosses
     15build_alias="$build_alias"
     16host_alias="$build_alias"
    1617if test "$no_recursion" != yes; then
    17   if test $build_alias != $host_alias; then
     18  if test x"$build_alias" != x"$host_alias"; then
    1819    target_subdir="$host_alias"
    1920  else
     
    2223  # Remove --cache-file and --srcdir arguments so they do not pile up.
    2324  ac_sub_configure_args=
    24   ac_prev=
    25   for ac_arg in $ac_configure_args; do
    26     if test -n "$ac_prev"; then
    27       ac_prev=
     25  rtems_prev=
     26  for rtems_arg in $ac_configure_args; do
     27    if test -n "$rtems_prev"; then
     28      rtems_prev=
    2829      continue
    2930    fi
    30     case "$ac_arg" in
     31    case "$rtems_arg" in
    3132    -cache-file | --cache-file | --cache-fil | --cache-fi \
    3233    | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
    33       ac_prev=cache_file ;;
     34      rtems_prev=cache_file ;;
    3435    -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
    3536    | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
    3637      ;;
    3738    -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
    38       ac_prev=srcdir ;;
     39      rtems_prev=srcdir ;;
    3940    -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
    4041      ;;
     
    4243    --build*) ;;
    4344    --host*) ;;
    44     *) ac_sub_configure_args="$ac_sub_configure_args $ac_arg" ;;
     45    *_alias* ) ;; # HACK: Workaround to autoconf passing *_alias
     46    *) ac_sub_configure_args="$ac_sub_configure_args $rtems_arg" ;;
    4547    esac
    4648  done
    4749
    48   for ac_config_dir in $1; do
    49 
     50  for rtems_config_dir in $RTEMS_BUILD_SUBDIRS; do
    5051    # Do not complain, so a configure script can configure whichever
    5152    # parts of a large source tree are present.
    52     if test ! -d $srcdir/$ac_config_dir; then
     53    if test ! -d $srcdir/$rtems_config_dir; then
    5354      continue
    5455    fi
    5556
    56     _RTEMS_PUSH_BUILDDIR([$ac_config_dir])
     57    _RTEMS_PUSH_BUILDDIR([$rtems_config_dir])
    5758
    58     _RTEMS_SUB_SRCDIR([$ac_config_dir])
     59    _RTEMS_SUB_SRCDIR([$rtems_config_dir])
    5960
    6061    # The recursion is here.
    6162    if test -n "$ac_sub_configure"; then
    62       ac_sub_cache_file=./config.cache
     63#      ac_sub_cache_file=./config.cache
     64      ac_sub_cache_file=/dev/null
    6365      _RTEMS_GIVEN_INSTALL
    6466
     
    7274      then :
    7375      else
    74         AC_MSG_ERROR([$ac_sub_configure failed for $ac_config_dir])
     76        AC_MSG_ERROR([$ac_sub_configure failed for $rtems_config_dir])
    7577      fi
    7678    fi
     
    7880    _RTEMS_POP_BUILDDIR
    7981  done
    80 fi
     82fi],
     83[
     84RTEMS_BUILD_SUBDIRS="$RTEMS_BUILD_SUBDIRS"
    8185])
     86])
     87
     88## FIXME: This is obsolete. Only kept for backward compatibility
     89AU_DEFUN([RTEMS_OUTPUT_BUILD_SUBDIRS],[])
  • make/custom/mbx8xx.cfg

    r0f466f7e r37b5d78  
    193193            $(START_FILE) $(LINK_OBJS) --start-group $(LINK_LIBS) --end-group
    194194        $(NM) -g -n $(basename $@)_sym.exe> $(basename $@).nm
    195         $(STRIP) -o $(basename $@).exe $(basename $@)_sym-exe
     195        $(STRIP) -O $(basename $@).exe $(basename $@)_sym-exe
    196196        $(SIZE) $(basename $@)_sym.exe
    197197endef
Note: See TracChangeset for help on using the changeset viewer.