Changeset 19c69fa1 in rtems


Ignore:
Timestamp:
Mar 13, 2003, 1:31:53 AM (17 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Children:
7d9818c
Parents:
58dccb1
Message:

2003-03-12 Ralf Corsepius <corsepiu@…>

  • tools/Makefile.am: Remove.
  • configure.ac: Remove tools/Makefile.am
  • acinclude.m4: Fix build_subdir handling.
  • Makefile.am: Remove tools from SUBDIRS. Rename HOST|BUILD|TARGET_SUBDIRS into host|build|target_SUBDIRS.
Files:
1 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • ChangeLog

    r58dccb1 r19c69fa1  
     12003-03-12      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
     2
     3        * tools/Makefile.am: Remove.
     4        * configure.ac: Remove tools.
     5        * acinclude.m4: Fix build_subdir handling.
     6        * Makefile.am: Remove tools from SUBDIRS.
     7        Rename HOST|BUILD|TARGET_SUBDIRS into host|build|target_SUBDIRS.
     8
    192003-03-06      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
    210
  • Makefile.am

    r58dccb1 r19c69fa1  
    99ACLOCAL_AMFLAGS = -I aclocal
    1010
    11 SUBDIRS = tools make $(BUILD_SUBDIRS) $(HOST_SUBDIRS) $(TARGET_SUBDIRS)
     11SUBDIRS = make $(build_SUBDIRS) $(host_SUBDIRS) $(target_SUBDIRS)
    1212
    1313AUTOMAKE_FILES = automake/compile.am automake/host.am automake/lib.am \
  • acinclude.m4

    r58dccb1 r19c69fa1  
    2424])
    2525
     26AC_DEFUN([_RTEMS_TOOLS],
     27[
     28m4_ifdef([_RTEMS_$2_CONFIGDIRS_LIST],
     29[
     30_RTEMS_ARG_VAR([CC_FOR_$2],
     31  [c-compiler to be used for $1 subdirs (default: auto-detected)])
     32_RTEMS_ARG_VAR([CFLAGS_FOR_$2],
     33  [c-flags to be used for $1 subdirs (default: provided by autoconf)])
     34_RTEMS_ARG_VAR([CXX_FOR_$2],
     35  [c++-compiler to be used for $1 subdirs (default: auto-detected)])
     36_RTEMS_ARG_VAR([CXXFLAGS_FOR_$2],
     37  [c++-flags to be used for $1 subdirs (default: provided by autoconf)])
     38])
     39])
     40
    2641AC_DEFUN([_RTEMS_COMMANDS_POST_CONFIG_SUBDIRS],
    2742[
     
    3247
    3348AS_IF([test $build = $host],
    34 [
     49[dnl
    3550  AS_IF([test $host = $target],
    3651  [dnl b=h, h=t, t=b
    37     BUILD_SUBDIRS="${build_configdirs}"
     52    build_SUBDIRS="${build_configdirs}"
    3853    build_configdirs="${build_configdirs}"
    39     HOST_SUBDIRS=""
    40     host_configdirs=""
    41     TARGET_SUBDIRS=""
    42     target_configdirs=""],
     54    host_SUBDIRS="${host_configdirs}"
     55    host_configdirs="${host_configdirs}"
     56    target_SUBDIRS="${target_configdirs}"
     57    target_configdirs="${target_configdirs}"],
    4358  [dnl b=h, h!=t, t!=b
    44     BUILD_SUBDIRS="${build_configdirs}"
     59    build_SUBDIRS="${build_configdirs}"
    4560    build_configdirs="${build_configdirs}"
    46     HOST_SUBDIRS=""
    47     host_configdirs=""
    48     TARGET_SUBDIRS=`echo "${target_configdirs}" | \
     61    host_SUBDIRS="${host_configdirs}"
     62    host_configdirs="${host_configdirs}"
     63    target_SUBDIRS=`echo "${target_configdirs}" | \
    4964      sed -e "s%\([[^ ]][[^ ]]*\)%$target_alias/\1%g"`
    5065    target_configdirs="${target_configdirs}"
    5166  ])
    52 ],[
     67],[dnl
    5368  AS_IF([test $host = $target],
    5469  [ dnl b!=h, h=t, b!=t
    55     BUILD_SUBDIRS="${build_configdirs}"
     70    build_SUBDIRS="${build_configdirs}"
    5671    build_configdirs="${build_configdirs}"
    57     HOST_SUBDIRS=`echo "${host_configdirs}" | \
     72    host_SUBDIRS=`echo "${host_configdirs}" | \
    5873      sed -e "s%\([[^ ]][[^ ]]*\)%$host_alias/\1%g"`
    5974    host_configdirs="${host_configdirs}"
    60     TARGET_SUBDIRS=""
    61     target_configdirs=""],
    62   [
     75#    target_SUBDIRS=`echo "${target_configdirs}" | \
     76#      sed -e "s%\([[^ ]][[^ ]]*\)%$target_alias/\1%g"`
     77#    target_configdirs="${target_configdirs}"],
     78  [dnl
    6379    AS_IF([test $build = $target],
    6480    [dnl b!=h, h!=t, b=t
    65       BUILD_SUBDIRS="${build_configdirs}"
     81      build_SUBDIRS="${build_configdirs}"
    6682      build_configdirs="${build_configdirs}"
    67       HOST_SUBDIRS=`echo "${host_configdirs}" | \
     83      host_SUBDIRS=`echo "${host_configdirs}" | \
    6884        sed -e "s%\([[^ ]][[^ ]]*\)%$host_alias/\1%g"`
    6985      host_configdirs="${host_configdirs}"
    70       TARGET_SUBDIRS=""
    71       target_configdirs=""],
     86#      target_SUBDIRS="${target_configdirs}"
     87#      target_configdirs="${target_configdirs}"],
    7288    [dnl b!=h, h!=t, b!=t
    73       BUILD_SUBDIRS="${build_configdirs}"
     89      build_SUBDIRS="${build_configdirs}"
    7490      build_configdirs="${build_configdirs}"
    75       HOST_SUBDIRS=`echo "${host_configdirs}" | \
     91      host_SUBDIRS=`echo "${host_configdirs}" | \
    7692        sed -e "s%\([[^ ]][[^ ]]*\)%$host_alias/\1%g"`
    7793      host_configdirs="${host_configdirs}"
    78       TARGET_SUBDIRS=`echo "${target_configdirs}" | \
    79         sed -e "s%\([[^ ]][[^ ]]*\)%$target_alias/\1%g"`
    80       target_configdirs="${target_configdirs}"
     94#      target_SUBDIRS=`echo "${target_configdirs}" | \
     95#        sed -e "s%\([[^ ]][[^ ]]*\)%$target_alias/\1%g"`
     96#      target_configdirs="${target_configdirs}"
    8197    ])
    8298  ])
    8399])
    84100
    85 AC_SUBST(HOST_SUBDIRS)
    86 AC_SUBST(TARGET_SUBDIRS)
    87 AC_SUBST(BUILD_SUBDIRS)
     101AC_SUBST(host_SUBDIRS)
     102AC_SUBST(target_SUBDIRS)
     103AC_SUBST(build_SUBDIRS)
    88104])
    89105
     
    161177m4_ifdef([_RTEMS_$2_CONFIGDIRS_LIST],
    162178[
    163 _RTEMS_ARG_VAR([CC_FOR_$2],
    164   [c-compiler to be used for $1 subdirs (default: auto-detected)])
    165 _RTEMS_ARG_VAR([CFLAGS_FOR_$2],
    166   [c-flags to be used for $1 subdirs (default: provided by autoconf)])
    167 _RTEMS_ARG_VAR([CXX_FOR_$2],
    168   [c++-compiler to be used for $1 subdirs (default: auto-detected)])
    169 _RTEMS_ARG_VAR([CXXFLAGS_FOR_$2],
    170   [c++-flags to be used for $1 subdirs (default: provided by autoconf)])
    171179if test "$no_recursion" != yes; then
    172180
    173  if test -n "${$2_SUBDIRS}"; then
     181 if test -n "${$1_SUBDIRS}"; then
    174182   ac_sub_configure_args="[$]$1args"
    175183
     
    177185  # in subdir configurations.
    178186  ac_sub_configure_args="'--prefix=$prefix' $ac_sub_configure_args"
     187
     188  # make sure that $1_subdir is not empty
     189  test -n "$$1_subdir" || $1_subdir="."
    179190
    180191  case "$$1_subdir" in
     
    184195    ;;
    185196  esac
    186 
    187   # make sure that $1_subdir is not empty
    188   test -n "$$1_subdir" || $1_subdir="."
    189197
    190198  ac_popdir=`pwd`
     
    246254fi
    247255])
    248 ])
    249 
    250 ## PUBLIC: RTEMS_BUILD_CONFIG_SUBDIRS(build_subdir)
    251 # subdirs to be built for the build environment
    252 AC_DEFUN([RTEMS_BUILD_CONFIG_SUBDIRS],[
    253 m4_append([_RTEMS_BUILD_CONFIGDIRS_LIST],[ $1])
    254 dnl Always append to build_configdirs
    255 AC_SUBST(build_configdirs,"$build_configdirs $1")
    256 
    257 m4_divert_text([DEFAULTS],
    258                [ac_subdirs_all="$ac_subdirs_all m4_normalize([$1])"])
    259 m4_expand_once([_RTEMS_COMMANDS_POST_CONFIG_SUBDIRS])
    260256])
    261257
     
    312308])
    313309
     310## PUBLIC: RTEMS_BUILD_CONFIG_SUBDIRS(build_subdir)
     311# subdirs to be built for the build environment
     312AC_DEFUN([RTEMS_BUILD_CONFIG_SUBDIRS],[
     313m4_append([_RTEMS_BUILD_CONFIGDIRS_LIST],[ $1])
     314dnl Always append to build_configdirs
     315AC_SUBST(build_configdirs,"$build_configdirs $1")
     316
     317m4_divert_text([DEFAULTS],
     318               [ac_subdirs_all="$ac_subdirs_all m4_normalize([$1])"])
     319m4_expand_once([_RTEMS_COMMANDS_POST_CONFIG_SUBDIRS])
     320])
     321
    314322AC_DEFUN(_RTEMS_BUILD_CONFIG_PREPARE,[
    315323## # Record the configure arguments in Makefile.
    316324m4_ifdef([_RTEMS_BUILD_CONFIGDIRS_LIST],
    317325[
     326m4_expand_once([_RTEMS_TOOLS([build],[BUILD])])
    318327m4_expand_once([_RTEMS_CONFIGURE_ARGS_PRUNE([buildargs])])
    319328eval buildargs_prune $ac_configure_args
     
    321330test -n "${target_alias}" && \
    322331buildargs="${buildargs} --target='${target_alias}'"
    323 
    324 ## AC_SUBST(buildargs)
    325 
    326332build_subdir="."
    327333],[])
     
    333339m4_append([_RTEMS_HOST_CONFIGDIRS_LIST],[ $1])dnl
    334340
    335 if test $build = $host;
    336 then
    337   AS_IF([test $host = $target],
    338     [_RTEMS_SUBST_IFNOT([build_configdirs],[$1])],
    339     [_RTEMS_SUBST_IFNOT([build_configdirs],[$1])]
    340   )
    341 else
    342   AS_IF([test $host = $target],
    343     [_RTEMS_SUBST_IFNOT([host_configdirs],[$1])],
    344     [AS_IF([test $build = $target],
    345       [_RTEMS_SUBST_IFNOT([host_configdirs],[$1])],
    346       [_RTEMS_SUBST_IFNOT([host_configdirs],[$1])]
    347     )]
    348   )
    349 fi
     341_RTEMS_SUBST_IFNOT([host_configdirs],[$1])
    350342
    351343m4_divert_text([DEFAULTS],
     
    357349m4_ifdef([_RTEMS_HOST_CONFIGDIRS_LIST],
    358350[
    359 ## Record configure arguments in Makefile.
     351m4_expand_once([_RTEMS_TOOLS([host],[HOST])])
    360352m4_expand_once([_RTEMS_CONFIGURE_ARGS_PRUNE([hostargs])])
    361353eval hostargs_prune $ac_configure_args
    362354hostargs="'--host=${host_alias}' '--build=${build}' '--target=${target_alias}' ${hostargs}"
    363 ## AC_SUBST(hostargs)
    364 
    365355host_subdir="${host_alias}"
    366356],[])
     
    372362m4_append([_RTEMS_TARGET_CONFIGDIRS_LIST],[ $1])
    373363
    374 if test $build = $host;
    375 then
    376   AS_IF([test $host = $target],
    377     [_RTEMS_SUBST_IFNOT([build_configdirs],[$1])],
    378     [_RTEMS_SUBST_IFNOT([target_configdirs],[$1])]
    379   )
    380 else
    381   AS_IF([test $host = $target],
    382     [_RTEMS_SUBST_IFNOT([host_configdirs],[$1])],
    383     [AS_IF([test $build = $target],
    384       [_RTEMS_SUBST_IFNOT([build_configdirs],[$1])],
    385       [_RTEMS_SUBST_IFNOT([target_configdirs],[$1])]
    386     )]
    387   )
    388 fi
     364_RTEMS_SUBST_IFNOT([target_configdirs],[$1])
    389365
    390366m4_divert_text([DEFAULTS],
     
    396372m4_ifdef([_RTEMS_TARGET_CONFIGDIRS_LIST],
    397373[
    398 ## Record the configure arguments in Makefile.
     374m4_expand_once([_RTEMS_TOOLS([target],[TARGET])])
    399375m4_expand_once([_RTEMS_CONFIGURE_ARGS_PRUNE([targetargs])])
    400376eval targetargs_prune $ac_configure_args
    401377targetargs="'--host=${target_alias}' '--build=${build}' '--target=${target_alias}' ${targetargs}"
    402 ## AC_SUBST(targetargs)
    403 
    404378target_subdir="${target_alias}"
    405379],[])
  • configure.ac

    r58dccb1 r19c69fa1  
    5050
    5151## NOTES:
    52 ## The tools/*-directories situation is unclear
    5352## * tools/build are host-native tools to be installed on the host.
    5453## * tools/cpu are host-native or host-cross-target-tools
    55 ## * tools/update are build-host-native tools
    56 
    57 # these tools are built for the build environment
    58 #
    59 RTEMS_BUILD_CONFIG_SUBDIRS([tools/update])
    6054
    6155RTEMS_HOST_CONFIG_SUBDIRS([tools/build])
     
    7165
    7266AC_CONFIG_FILES([Makefile
    73 tools/Makefile
    7467make/Makefile
    7568make/custom/Makefile
Note: See TracChangeset for help on using the changeset viewer.