Changeset 3174a7ed in rtems


Ignore:
Timestamp:
Oct 31, 2000, 9:20:00 PM (19 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, master
Children:
6fd829a
Parents:
846027b
Message:

2000-10-30 Ralf Corsepius <corsepiu@…>

  • configure.in: New, Cygnus/GNU style configuration.
  • Makefile.am: Add macros/, reflect new configure.in, ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/macros
  • automake/compile.am: BSP_SPECS, remove RTEMS_CANONICALIZATION.
  • automake/lib.am: Remove RTEMS_CANONICALIZATION.
  • macros/tool-prefix.m4: Remove.
  • macros/target.m4: Remove RTEMS_CONFIG_SUBDIRS, RTEMS_OUTPUT_SUBDIRS.
  • macros/enable-rtemsbsp.m4: Add RTEMS_CONFIG_PER_BSP, add setting RTEMS_ROOT.
  • macros/i386-gas-code16.m4: Define NEW_GAS only for 16bit mode-
  • macros/multilib.m4: Various minor fixes.
  • macros/project-root.m4: Remove setting PROJECT_TOPdir, PROJECT_ROOT, RTEMS_ROOT.
  • macros/rtems-top.m4: Remove RTEMS_CANONICALIZATION, TARGET_SUBDIRS; Add with_target_subdirs, PROJECT_TOPdir, PROJECT_ROOT.
Files:
1 deleted
13 edited

Legend:

Unmodified
Added
Removed
  • ChangeLog

    r846027b r3174a7ed  
     12000-10-30      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
     2
     3        * configure.in: New, Cygnus/GNU style configuration.
     4        * Makefile.am: Add macros/, reflect new configure.in,
     5        ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/macros
     6        * automake/compile.am: BSP_SPECS, remove RTEMS_CANONICALIZATION.
     7        * automake/lib.am: Remove RTEMS_CANONICALIZATION.
     8        * macros/tool-prefix.m4: Remove.
     9        * macros/target.m4: Remove RTEMS_CONFIG_SUBDIRS, RTEMS_OUTPUT_SUBDIRS.
     10        * macros/enable-rtemsbsp.m4: Add RTEMS_CONFIG_PER_BSP, add setting
     11        RTEMS_ROOT.
     12        * macros/i386-gas-code16.m4: Define NEW_GAS only for 16bit mode-
     13        * macros/multilib.m4: Various minor fixes.
     14        * macros/project-root.m4: Remove setting PROJECT_TOPdir,
     15        PROJECT_ROOT, RTEMS_ROOT.
     16        * macros/rtems-top.m4: Remove RTEMS_CANONICALIZATION, TARGET_SUBDIRS;
     17        Add with_target_subdirs, PROJECT_TOPdir, PROJECT_ROOT.
     18
    1192000-10-27      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
    220
  • Makefile.am

    r846027b r3174a7ed  
    88
    99AUTOMAKE_OPTIONS = foreign 1.4
    10 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
     10ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/macros
    1111
    12 SUBDIRS = doc make tools @TARGET_SUBDIRS@
     12SUBDIRS = doc make tools $(HOST_SUBDIRS) $(TARGET_SUBDIRS)
    1313
    1414AUTOMAKE_FILES = automake/compile.am automake/host.am automake/lib.am \
    15    automake/local.am automake/multilib.am automake/subdirs.am
     15    automake/local.am automake/multilib.am automake/subdirs.am
    1616
    17 ACLOCAL_FILES += aclocal/ar-s.m4 aclocal/bsp-alias.m4 \
    18     aclocal/canonical-host.m4 aclocal/canonical-target-name.m4 \
    19     aclocal/canonicalize-tools.m4 aclocal/check-bsps.m4 \
    20     aclocal/check-bsp-cache.m4 aclocal/check-cpu.m4 aclocal/check-cxx.m4 \
    21     aclocal/check-itron.m4 aclocal/check-multiprocessing.m4 \
    22     aclocal/check-networking.m4 aclocal/check-newlib.m4 \
    23     aclocal/check-posix.m4 aclocal/check-rdbg.m4 aclocal/enable-bare.m4 \
    24     aclocal/enable-cxx.m4 aclocal/enable-gcc28.m4 \
    25     aclocal/enable-inlines.m4 aclocal/enable-itron.m4 \
    26     aclocal/enable-libcdir.m4 aclocal/enable-multiprocessing.m4 \
    27     aclocal/enable-networking.m4 aclocal/enable-posix.m4 \
    28     aclocal/enable-rdbg.m4 aclocal/enable-rtemsbsp.m4 \
    29     aclocal/enable-tests.m4 aclocal/gcc-pipe.m4 aclocal/gcc-specs.m4 \
    30     aclocal/i386-gas-code16.m4 aclocal/path-ksh.m4 aclocal/path-perl.m4 \
    31     aclocal/prog-cc.m4 aclocal/prog-cxx.m4 aclocal/project-root.m4 \
    32     aclocal/rtems-top.m4 aclocal/sysv-ipc.m4 aclocal/target.m4 \
    33     aclocal/tool-paths.m4 aclocal/tool-prefix.m4 aclocal/multilib.m4 \
    34     aclocal/rtems-debug.m4 aclocal/rtems-test-no-pause.m4
     17ACLOCAL_FILES += macros/bsp-alias.m4 macros/canonical-host.m4 \
     18    macros/canonical-target-name.m4 macros/canonicalize-tools.m4 \
     19    macros/check-bsp-cache.m4 macros/check-bsps.m4 macros/check-cpu.m4 \
     20    macros/check-cxx.m4 macros/check-itron.m4 \
     21    macros/check-multiprocessing.m4 macros/check-networking.m4 \
     22    macros/check-newlib.m4 macros/check-posix.m4 macros/check-rdbg.m4 \
     23    macros/enable-bare.m4 macros/enable-cxx.m4 macros/enable-gcc28.m4 \
     24    macros/enable-inlines.m4 macros/enable-itron.m4 macros/enable-libcdir.m4 \
     25    macros/enable-multiprocessing.m4 macros/enable-networking.m4 \
     26    macros/enable-posix.m4 macros/enable-rdbg.m4 macros/enable-rtemsbsp.m4 \
     27    macros/enable-tests.m4 macros/gcc-pipe.m4 macros/gcc-specs.m4 \
     28    macros/i386-gas-code16.m4 macros/multilib.m4 macros/path-ksh.m4 \
     29    macros/path-perl.m4 macros/prog-cc.m4 macros/prog-cxx.m4 \
     30    macros/project-root.m4 macros/rtems-debug.m4 \
     31    macros/rtems-test-no-pause.m4 macros/rtems-top.m4 macros/sysv-ipc.m4 \
     32    macros/target.m4 macros/tool-paths.m4
    3533
    3634noinst_SCRIPTS = bootstrap
  • automake/compile.am

    r846027b r3174a7ed  
    6565else
    6666## gcc >= 2.8.x
    67 ## FIXME: This is BSP-specific and will fail for BSP-independent directories
    68 GCCSPECS = -B$(PROJECT_RELEASE)/lib/ -specs bsp_specs -qrtems
     67if RTEMS_CONFIG_PER_BSP
     68BSP_SPECS = -specs bsp_specs -qrtems
     69endif
     70
     71GCCSPECS = -B$(PROJECT_RELEASE)/lib/ $(BSP_SPECS)
    6972endif
    7073else
     
    274277## -------------------------------------------------------------------------
    275278
    276 ## FIXME: This will probably vanish, when GNU canonicalization will be
    277 ## introduced
    278 if RTEMS_CANONICALIZATION
    279 
    280 CC = $(CC_FOR_TARGET) $(GCCSPECS)
    281 CXX = $(CXX_FOR_TARGET) $(GCCSPECS)
    282 AR_FOR_TARGET = @AR_FOR_TARGET@
    283 AR = $(AR_FOR_TARGET)
    284 AS_FOR_TARGET = @AS_FOR_TARGET@
    285 AS = $(AS_FOR_TARGET)
    286 RANLIB_FOR_TARGET = @RANLIB_FOR_TARGET@
    287 RANLIB = $(RANLIB_FOR_TARGET)
    288 LD_FOR_TARGET = @LD_FOR_TARGET@
    289 LD = $(LD_FOR_TARGET)
    290 NM_FOR_TARGET = @NM_FOR_TARGET@
    291 NM = $(NM_FOR_TARGET)
    292 OBJCOPY_FOR_TARGET = @OBJCOPY_FOR_TARGET@
    293 OBJCOPY = $(OBJCOPY_FOR_TARGET)
    294 SIZE_FOR_TARGET = @SIZE_FOR_TARGET@
    295 SIZE = $(SIZE_FOR_TARGET)
    296 STRIP_FOR_TARGET = @STRIP_FOR_TARGET@
    297 STRIP = $(STRIP_FOR_TARGET)
    298 else
    299279CC = @CC@ $(GCCSPECS)
    300280CXX = @CXX@ $(GCCSPECS)
     
    303283SIZE = @SIZE@
    304284STRIP = @STRIP@
    305 endif
    306285
    307286##
  • automake/lib.am

    r846027b r3174a7ed  
    33##
    44
    5 if RTEMS_CANONICALIZATION
    6 else
    75AR = @AR@
    86RANLIB = @RANLIB@
    9 endif
    107
    118define make-library
  • configure.in

    r846027b r3174a7ed  
    1515fi
    1616
    17 RTEMS_CANONICAL_TARGET_CPU
    18 AM_INIT_AUTOMAKE(rtems,$RTEMS_VERSION,no)
     17AC_CANONICAL_SYSTEM
     18AM_INIT_AUTOMAKE(cross,0,no)
    1919AM_MAINTAINER_MODE
    20 
    21 dnl RTEMS_ENABLE_BARE
    22 dnl RTEMS_ENABLE_RTEMSBSP(rtems_bsp)
    2320
    2421dnl These option are only in here to let --help report all supported
     
    3330RTEMS_ENABLE_GCC28
    3431RTEMS_ENABLE_LIBCDIR
    35 RTEMS_ENABLE_TESTS
     32RTEMS_ENABLE_TESTS 
    3633RTEMS_ENABLE_RTEMS_DEBUG
    3734
    38 RTEMS_CHECK_CPU
    39 RTEMS_CANONICAL_HOST
    40 
    41 AC_CONFIG_SUBDIRS(tools/build)
    42 AC_CONFIG_SUBDIRS(tools/update)
    43 AC_CONFIG_SUBDIRS(tools/cpu)
    44 
    45 # List all subdirectories to be compiled for the target here
    46 RTEMS_CONFIG_SUBDIRS(c)
    47 
    48 if test "$target_alias" != "$host_alias"; then
     35# these tools are built for the build environment
     36#
     37build_tools="tools/build tools/update tools/cpu"
     38
     39# these libraries are used for the host environment
     40#
     41host_libs=""
     42
     43# these tools are built for the host environment
     44#
     45host_tools=""
     46
     47# these libraries are built for the target environment, and are built after
     48# the host libraries and the host tools (which may be a cross compiler)
     49#
     50target_libs="c"
     51
     52# these tools are built using the target libs, and are intended to run only
     53# in the target environment
     54#
     55target_tools=""
     56
     57## All tools belong in one of the four categories, and are assigned above
     58## We assign ${configdirs} this way to remove all embedded newlines.  This
     59## is important because configure will choke if they ever get through.
     60## ${configdirs} is directories we build using the host tools.
     61## ${target_configdirs} is directories we build using the target tools.
     62#
     63configdirs="${host_libs} ${host_tools}"
     64AC_SUBST(configdirs)
     65
     66target_configdirs="${target_libs} ${target_tools}"
     67AC_SUBST(target_configdirs)
     68
     69# Record target_configdirs and the configure arguments in Makefile.
     70targargs=`echo "${ac_configure_args}" | \
     71        sed -e 's/--no[^        ]*//' \
     72            -e 's/--cache[a-z-]*=[^     ]*//' \
     73            -e 's/--ho[a-z-]*=[^        ]*//' \
     74            -e 's/--bu[a-z-]*=[^        ]*//' \
     75            -e 's/--ta[a-z-]*=[^        ]*//'`;
     76
     77targargs="--host=${target_alias} --build=${build_alias} ${targargs}"
     78AC_SUBST(targargs)
     79
     80target_subdir=${target_alias}
     81
    4982changequote(,)dnl
    50 TARGET_SUBDIRS=`echo "$target_subdirs" | \
    51  sed -e "s%\([a-zA-Z0-9][a-zA-Z0-9]*\)%${target_alias}/\1%g"`
     83if test $target_alias = $host_alias;
     84then
     85  HOST_SUBDIRS="$configdirs $target_configdirs"
     86  TARGET_SUBDIRS=""
     87else
     88  HOST_SUBDIRS="$configdirs"
     89  TARGET_SUBDIRS=`echo "$target_configdirs" | \
     90    sed -e "s%\([^ ]\+\)%$target_alias/\1%g"`
     91fi
    5292changequote([,])dnl
     93
     94if test $host_alias = $build_alias;
     95then
     96  HOST_SUBDIRS="$build_tools $HOST_SUBDIRS"
    5397else
    54 TARGET_SUBDIRS="$target_subdirs"
     98  build_configdirs="$build_tools"
    5599fi
     100
     101AC_CONFIG_SUBDIRS($HOST_SUBDIRS)
    56102AC_SUBST(TARGET_SUBDIRS)
    57 
    58 # Explicitly list all Makefiles here
    59 AC_OUTPUT( 
     103AC_SUBST(HOST_SUBDIRS)
     104
     105AC_OUTPUT(
    60106Makefile
    61107tools/Makefile
     
    63109make/custom/Makefile
    64110make/Templates/Makefile
    65 make/compilers/Makefile
     111make/compilers/Makefile 
    66112doc/Makefile)
    67113
    68 RTEMS_OUTPUT_SUBDIRS(RTEMS_TGT_SUBDIRS)
     114if test "$no_recursion" != yes; then
     115
     116 if test $target_alias != $host_alias; then
     117  # Remove --srcdir arguments so they do not pile up.
     118  ac_sub_configure_args=
     119  ac_prev=
     120  for ac_arg in $targargs; do
     121    if test -n "$ac_prev"; then
     122      ac_prev=
     123      continue
     124    fi
     125    case "$ac_arg" in
     126    -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     127      ac_prev=srcdir ;;
     128    -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
     129      ;;
     130    *) ac_sub_configure_args="$ac_sub_configure_args $ac_arg" ;;
     131    esac
     132  done
     133
     134  test -d $target_subdir || mkdir $target_subdir
     135  for ac_config_dir in $target_configdirs; do
     136    # Do not complain, so a configure script can configure whichever
     137    # parts of a large source tree are present.
     138    if test ! -d $srcdir/$ac_config_dir; then
     139      continue
     140    fi
     141
     142    echo configuring in $target_subdir/$ac_config_dir
     143
     144    case "$srcdir" in
     145    .) ;;
     146    *)
     147      if test -d $target_subdir/$ac_config_dir || mkdir $target_subdir/$ac_config_dir; then :;
     148      else
     149        AC_MSG_ERROR(can not create `pwd`/$target_subdir/$ac_config_dir)
     150      fi
     151      ;;
     152    esac
     153
     154    ac_popdir=`pwd`
     155    cd $target_subdir/$ac_config_dir
     156
     157changequote(, )dnl
     158      # A "../" for each directory in /$ac_config_dir.
     159      ac_dots=`echo $target_subdir/$ac_config_dir|sed -e 's%^\./%%' -e 's%[^/]$%&/%' -e 's%[^/]*/%../%g'`
     160changequote([, ])dnl
     161
     162    case "$srcdir" in
     163    .) # No --srcdir option.  We are building in place.
     164      ac_sub_srcdir=$srcdir ;;
     165    /*) # Absolute path.
     166      ac_sub_srcdir=$srcdir/$ac_config_dir ;;
     167    *) # Relative path.
     168      ac_sub_srcdir=$ac_dots$srcdir/$ac_config_dir ;;
     169    esac
     170
     171    # Check for configure
     172    if test -f $ac_sub_srcdir/configure; then
     173      ac_sub_configure=$ac_sub_srcdir/configure
     174    else
     175      AC_MSG_WARN(no configuration information is in $ac_config_dir)
     176      ac_sub_configure=
     177    fi
     178
     179    # The recursion is here.
     180    if test -n "$ac_sub_configure"; then
     181
     182      # Make the cache file name correct relative to the subdirectory.
     183      ac_sub_cache_file=$cache_file
     184ifdef([AC_PROVIDE_AC_PROG_INSTALL],
     185      [  case "$ac_given_INSTALL" in
     186changequote(, )dnl
     187        [/$]*) INSTALL="$ac_given_INSTALL" ;;
     188changequote([, ])dnl
     189        *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
     190        esac
     191])dnl
     192
     193      echo "[running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file] --srcdir=$ac_sub_srcdir"
     194      # The eval makes quoting arguments work.
     195      if eval ${CONFIG_SHELL-/bin/sh} $ac_sub_configure \
     196        $ac_sub_configure_args --srcdir=$ac_sub_srcdir \
     197        --with-target-subdir=$target_subdir \
     198        --cache-file=$ac_sub_cache_file \
     199        --libdir='${exec_prefix}'/$target_alias/lib
     200      then :
     201      else
     202        AC_MSG_ERROR($ac_sub_configure failed for $ac_config_dir)
     203      fi
     204    fi
     205
     206    cd $ac_popdir
     207  done
     208 fi
     209
     210 if test $build_alias != $host_alias; then
     211  # Remove --srcdir arguments so they do not pile up.
     212  ac_sub_configure_args=
     213  ac_prev=
     214  for ac_arg in $targargs; do
     215    if test -n "$ac_prev"; then
     216      ac_prev=
     217      continue
     218    fi
     219    case "$ac_arg" in
     220    -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     221      ac_prev=srcdir ;;
     222    -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
     223      ;;
     224    *) ac_sub_configure_args="$ac_sub_configure_args $ac_arg" ;;
     225    esac
     226  done
     227
     228#  test -d $target_subdir || mkdir $target_subdir
     229  for ac_config_dir in $build_configdirs; do
     230    # Do not complain, so a configure script can configure whichever
     231    # parts of a large source tree are present.
     232    if test ! -d $srcdir/$ac_config_dir; then
     233      continue
     234    fi
     235
     236    echo configuring in $ac_config_dir
     237
     238    case "$srcdir" in
     239    .) ;;
     240    *)
     241      if test -d $ac_config_dir || mkdir $ac_config_dir; then :;
     242      else
     243        AC_MSG_ERROR(can not create `pwd`/$ac_config_dir)
     244      fi
     245      ;;
     246    esac
     247
     248    ac_popdir=`pwd`
     249    cd $ac_config_dir
     250
     251changequote(, )dnl
     252      # A "../" for each directory in /$ac_config_dir.
     253      ac_dots=`echo $ac_config_dir|sed -e 's%^\./%%' -e 's%[^/]$%&/%' -e 's%[^/]*/%../%g'`
     254changequote([, ])dnl
     255
     256    case "$srcdir" in
     257    .) # No --srcdir option.  We are building in place.
     258      ac_sub_srcdir=$srcdir ;;
     259    /*) # Absolute path.
     260      ac_sub_srcdir=$srcdir/$ac_config_dir ;;
     261    *) # Relative path.
     262      ac_sub_srcdir=$ac_dots$srcdir/$ac_config_dir ;;
     263    esac
     264
     265    # Check for guested configure; otherwise get Cygnus style configure.
     266    if test -f $ac_sub_srcdir/configure; then
     267      ac_sub_configure=$ac_sub_srcdir/configure
     268    else
     269      AC_MSG_WARN(no configuration information is in $ac_config_dir)
     270      ac_sub_configure=
     271    fi
     272
     273    # The recursion is here.
     274    if test -n "$ac_sub_configure"; then
     275
     276      # Make the cache file name correct relative to the subdirectory.
     277      ac_sub_cache_file=$cache_file
     278ifdef([AC_PROVIDE_AC_PROG_INSTALL],
     279      [  case "$ac_given_INSTALL" in
     280changequote(, )dnl
     281        [/$]*) INSTALL="$ac_given_INSTALL" ;;
     282changequote([, ])dnl
     283        *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
     284        esac
     285])dnl
     286
     287      echo "[running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file] --srcdir=$ac_sub_srcdir"
     288      # The eval makes quoting arguments work.
     289      if eval ${CONFIG_SHELL-/bin/sh} $ac_sub_configure \
     290        $ac_sub_configure_args --srcdir=$ac_sub_srcdir \
     291        --cache-file=$ac_sub_cache_file \
     292        --build=$build_alias --host=$build_alias
     293      then :
     294      else
     295        AC_MSG_ERROR($ac_sub_configure failed for $ac_config_dir)
     296      fi
     297    fi
     298
     299    cd $ac_popdir
     300  done
     301 fi
     302fi
  • macros/enable-rtemsbsp.m4

    r846027b r3174a7ed  
    3939AC_SUBST(BARE_CPU_CFLAGS)
    4040
    41 ## RTEMS_ROOT=$RTEMS_TOPdir/'$(top_builddir)'/c/$RTEMS_BSP
    42 ## AC_SUBST(RTEMS_ROOT)
     41RTEMS_ROOT=$PROJECT_ROOT/c/$RTEMS_BSP
     42AC_SUBST(RTEMS_ROOT)
     43AM_CONDITIONAL(RTEMS_CONFIG_PER_BSP, test x = x);
    4344])
    4445
     
    5354  RTEMS_BSP="$rtems_cv_RTEMS_BSP"
    5455  AC_SUBST(RTEMS_BSP)
    55 ## RTEMS_ROOT=$RTEMS_TOPdir/'$(top_builddir)'/c
    56 ## AC_SUBST(RTEMS_ROOT)
     56  RTEMS_ROOT=$PROJECT_ROOT/c
     57  AC_SUBST(RTEMS_ROOT)
    5758fi
    5859])
  • macros/i386-gas-code16.m4

    r846027b r3174a7ed  
    2424  fi
    2525  AC_SUBST(RTEMS_GAS_CODE16)
    26   AC_DEFINE_UNQUOTED(NEW_GAS,1,[if using 16 bit mode assembler support])
     26  if test x"${RTEMS_GAS_CODE16}" = x"yes";
     27  then
     28    AC_DEFINE_UNQUOTED(NEW_GAS,1,[if using 16 bit mode assembler support])
     29  fi
    2730])
    2831
  • macros/multilib.m4

    r846027b r3174a7ed  
    2323dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
    2424
    25 test -z "[$]{with_target_subdir}" && with_target_subdir=.
    26 
    2725if test "[$]{srcdir}" = "."; then
    2826  if test "[$]{with_target_subdir}" != "."; then
     
    4341
    4442AC_OUTPUT_COMMANDS(
    45   if test -n "$CONFIG_FILES"; do
    46     $ac_file" = ifelse([$1],,Makefile,[$1]) \
     43  if test -n "$CONFIG_FILES"; then
     44    ac_file=[]ifelse([$1],,Makefile,[$1]) \
    4745    . ${multilib_basedir}/../config-ml.in
    48   fi,
     46  fi,[
    4947  srcdir=${srcdir}
    5048  host=${host}
    5149  target=${target}
    52 #  with_multisrctop="${with_multisrctop}"
    53 #  with_target_subdir="${with_target_subdir}"
     50  with_multisrctop="${with_multisrctop}"
     51  with_target_subdir="${with_target_subdir}"
    5452  with_multisubdir="${with_multisubdir}"
    5553  ac_configure_args="${multilib_arg} ${ac_configure_args}"
    5654  CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
    5755  multilib_basedir=${multilib_basedir}
    58   CC="${CC}")
     56  CC="${CC}"])
    5957])
  • macros/prog-cc.m4

    r846027b r3174a7ed  
    1010AC_BEFORE([$0], [AC_PROG_CC])dnl
    1111AC_BEFORE([$0], [RTEMS_CANONICALIZE_TOOLS])dnl
    12 AC_REQUIRE([RTEMS_TOOL_PREFIX])dnl
    1312AC_REQUIRE([RTEMS_ENABLE_LIBCDIR])dnl
    1413AC_REQUIRE([RTEMS_ENABLE_GCC28])dnl
  • macros/prog-cxx.m4

    r846027b r3174a7ed  
    99AC_BEFORE([$0], [AC_PROG_CXXCPP])dnl
    1010AC_BEFORE([$0], [RTEMS_CANONICALIZE_TOOLS])dnl
    11 AC_REQUIRE([RTEMS_TOOL_PREFIX])dnl
    1211AC_REQUIRE([RTEMS_ENABLE_LIBCDIR])dnl
    1312
  • macros/project-root.m4

    r846027b r3174a7ed  
    1616[dnl
    1717AC_REQUIRE([RTEMS_TOP])
    18 if test "$TARGET_SUBDIR" = "." ; then
    19 # Native
    20 PROJECT_TOPdir=${RTEMS_TOPdir}/'$(top_builddir)'
    21 PROJECT_ROOT=${RTEMS_TOPdir}/'$(top_builddir)';
    22 else
    23 # FIXME: Moving the build-tree
    24 # PROJECT_TOPdir=../${RTEMS_TOPdir}/'$(top_builddir)'
    25 # PROJECT_ROOT=${RTEMS_TOPdir}/'$(top_builddir)'
    26 
    27 # FIXME: Old, per-bsp building style
    28 PROJECT_TOPdir=../${RTEMS_TOPdir}/'$(top_builddir)'
    29 PROJECT_ROOT=../${RTEMS_TOPdir}/'$(top_builddir)'
    30 fi
    31 AC_SUBST(PROJECT_ROOT)
    32 AC_SUBST(PROJECT_TOPdir)
    33 
    34 # FIXME: This should not be here
    35 RTEMS_ROOT=$RTEMS_TOPdir/'$(top_builddir)'/c/$RTEMS_BSP
    36 AC_SUBST(RTEMS_ROOT)
    3718
    3819PACKHEX="\$(PROJECT_TOPdir)/tools/build/packhex"
  • macros/rtems-top.m4

    r846027b r3174a7ed  
    1616AC_SUBST(ENDIF)
    1717
    18 ## HACK to destinguish between using GNU and RTEMS canonicalization
    19 AM_CONDITIONAL(RTEMS_CANONICALIZATION,test "x" = "y")
    20 
     18# with_target_subdir
    2119AC_ARG_WITH(target-subdir,
    2220[  --with-target-subdir=DIR],
    23 TARGET_SUBDIR="$withval",
    24 TARGET_SUBDIR=".")
     21with_target_subdir="$withval",
     22with_target_subdir=".")
    2523
    2624RTEMS_TOPdir="$1";
    2725AC_SUBST(RTEMS_TOPdir)
     26
     27if test "$with_target_subdir" = "." ; then
     28# Native
     29PROJECT_TOPdir=${RTEMS_TOPdir}/'$(top_builddir)'
     30else
     31# Cross
     32changequote(, )dnl
     33dots=`echo $with_target_subdir|\
     34sed -e 's%^\./%%' -e 's%[^/]$%&/%' -e 's%[^/]*/%../%g'`
     35changequote([, ])dnl
     36PROJECT_TOPdir=${dots}${RTEMS_TOPdir}/'$(top_builddir)'
     37fi
     38AC_SUBST(PROJECT_TOPdir)
     39
     40if test "$with_target_subdir" = "." ; then
     41# Native
     42PROJECT_ROOT=${RTEMS_TOPdir}/'$(top_builddir)';
     43else
     44# Cross
     45PROJECT_ROOT=${RTEMS_TOPdir}/'$(top_builddir)'
     46fi
     47AC_SUBST(PROJECT_ROOT)
    2848
    2949dnl Determine RTEMS Version string from the VERSION file
  • macros/target.m4

    r846027b r3174a7ed  
    1616if test "$no_recursion" != yes; then
    1717  if test $build_alias != $host_alias; then
    18     target_subdir="$target_alias"
     18    target_subdir="$host_alias"
    1919  else
    2020    target_subdir="."
     
    120120fi
    121121])
    122 dnl $Id$
    123 
    124 AC_DEFUN(RTEMS_CONFIG_SUBDIRS,
    125 [
    126 define([RTEMS_TGT_SUBDIRS],
    127 ifdef([RTEMS_TGT_SUBDIRS], [RTEMS_TGT_SUBDIRS ],)[$1])dnl
    128 target_subdirs="RTEMS_TGT_SUBDIRS"
    129 AC_SUBST(target_subdirs)
    130 ])
    131 
    132 dnl Derived from automake-1.4's AC_OUTPUT_SUBDIRS
    133 AC_DEFUN(RTEMS_OUTPUT_SUBDIRS,
    134 [
    135 if test "$no_recursion" != yes; then
    136   if test $target_alias != $host_alias; then
    137     target_subdir="$target_alias"
    138   else
    139     target_subdir="."
    140   fi
    141   # Remove --cache-file and --srcdir arguments so they do not pile up.
    142   ac_sub_configure_args=
    143   ac_prev=
    144   for ac_arg in $ac_configure_args; do
    145     if test -n "$ac_prev"; then
    146       ac_prev=
    147       continue
    148     fi
    149     case "$ac_arg" in
    150     -cache-file | --cache-file | --cache-fil | --cache-fi \
    151     | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
    152       ac_prev=cache_file ;;
    153     -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
    154     | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
    155       ;;
    156     -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
    157       ac_prev=srcdir ;;
    158     -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
    159       ;;
    160     *) ac_sub_configure_args="$ac_sub_configure_args $ac_arg" ;;
    161     esac
    162   done
    163 
    164   test -d $target_subdir || mkdir $target_subdir
    165   for ac_config_dir in $1; do
    166 
    167     # Do not complain, so a configure script can configure whichever
    168     # parts of a large source tree are present.
    169     if test ! -d $srcdir/$ac_config_dir; then
    170       continue
    171     fi
    172 
    173     echo configuring in $target_subdir/$ac_config_dir
    174 
    175     case "$srcdir" in
    176 ##    .) ;;
    177     *)
    178       if test -d $target_subdir/$ac_config_dir || mkdir $target_subdir/$ac_config_dir; then :;
    179       else
    180         AC_MSG_ERROR(can not create `pwd`/$target_subdir/$ac_config_dir)
    181       fi
    182       ;;
    183     esac
    184 
    185     ac_popdir=`pwd`
    186     cd $target_subdir/$ac_config_dir
    187 
    188 changequote(, )dnl
    189       # A "../" for each directory in /$ac_config_dir.
    190       ac_dots=`echo $target_subdir/$ac_config_dir|sed -e 's%^\./%%' -e 's%[^/]$%&/%' -e 's%[^/]*/%../%g'`
    191 changequote([, ])dnl
    192 
    193     case "$srcdir" in
    194 ##    .) # No --srcdir option.  We are building in place.
    195 ##      ac_sub_srcdir=$srcdir ;;
    196     /*) # Absolute path.
    197       ac_sub_srcdir=$srcdir/$ac_config_dir ;;
    198     *) # Relative path.
    199       ac_sub_srcdir=$ac_dots$srcdir/$ac_config_dir ;;
    200     esac
    201 
    202     # Check for guested configure; otherwise get Cygnus style configure.
    203     if test -f $ac_sub_srcdir/configure; then
    204       ac_sub_configure=$ac_sub_srcdir/configure
    205     elif test -f $ac_sub_srcdir/configure.in; then
    206       ac_sub_configure=$ac_configure
    207     else
    208       AC_MSG_WARN(no configuration information is in $ac_config_dir)
    209       ac_sub_configure=
    210     fi
    211 
    212     # The recursion is here.
    213     if test -n "$ac_sub_configure"; then
    214 
    215       # Make the cache file name correct relative to the subdirectory.
    216       if test "$target_alias" != "$host_alias"; then
    217       ac_sub_cache_file=$cache_file
    218       else
    219       case "$cache_file" in
    220       /*) ac_sub_cache_file=$cache_file ;;
    221       *) # Relative path.
    222         ac_sub_cache_file="$ac_dots$cache_file" ;;
    223       esac
    224       fi
    225 ifdef([AC_PROVIDE_AC_PROG_INSTALL],
    226       [  case "$ac_given_INSTALL" in
    227 changequote(, )dnl
    228         [/$]*) INSTALL="$ac_given_INSTALL" ;;
    229 changequote([, ])dnl
    230         *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
    231         esac
    232 ])dnl
    233 
    234       echo "[running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file] --srcdir=$ac_sub_srcdir"
    235       # The eval makes quoting arguments work.
    236       if eval ${CONFIG_SHELL-/bin/sh} $ac_sub_configure \
    237         $ac_sub_configure_args --srcdir=$ac_sub_srcdir \
    238         --with-target-subdir=$target_subdir --cache-file=$ac_sub_cache_file
    239       then :
    240       else
    241         AC_MSG_ERROR($ac_sub_configure failed for $ac_config_dir)
    242       fi
    243     fi
    244 
    245     cd $ac_popdir
    246   done
    247 fi
    248 ])
Note: See TracChangeset for help on using the changeset viewer.