diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2001-10-17 13:15:11 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2001-10-17 13:15:11 +0000 |
| commit | 080afecb64218725773fe76353cab709412c9ce0 (patch) | |
| tree | 959820f8554f6ed74692e33e197fd7022aa8ac47 | |
| parent | 2001-10-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-080afecb64218725773fe76353cab709412c9ce0.tar.bz2 | |
2001-10-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* aclocal/rtems-cpu-subdirs.m4: Add PREFIX arg to RTEMS_CPU_SUBDIRS,
add 2nd arg to _RTEMS_CPU_SUBDIR.
* aclocal/target.m4: Replace ac_configure_args with
rtems_configure_args, add rtems_configure_args to INIT-CMDS.
* Makefile.am: Require automake-1.5.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | aclocal/rtems-cpu-subdirs.m4 | 39 | ||||
| -rw-r--r-- | aclocal/target.m4 | 3 |
4 files changed, 31 insertions, 21 deletions
@@ -1,3 +1,11 @@ +2001-10-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * aclocal/rtems-cpu-subdirs.m4: Add PREFIX arg to RTEMS_CPU_SUBDIRS, + add 2nd arg to _RTEMS_CPU_SUBDIR. + * aclocal/target.m4: Replace ac_configure_args with + rtems_configure_args, add rtems_configure_args to INIT-CMDS. + * Makefile.am: Require automake-1.5. + 2001-10-11 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * .cvsignore: Add autom4te.cache for autoconf > 2.52. diff --git a/Makefile.am b/Makefile.am index b780da4d46..424bec2fba 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,7 +6,7 @@ ## $Id$ ## -AUTOMAKE_OPTIONS = foreign 1.4 +AUTOMAKE_OPTIONS = foreign 1.5 ACLOCAL_AMFLAGS = -I aclocal SUBDIRS = doc make tools $(BUILD_SUBDIRS) $(TARGET_SUBDIRS) diff --git a/aclocal/rtems-cpu-subdirs.m4 b/aclocal/rtems-cpu-subdirs.m4 index 8fe74be50e..1ecdea4d2f 100644 --- a/aclocal/rtems-cpu-subdirs.m4 +++ b/aclocal/rtems-cpu-subdirs.m4 @@ -1,31 +1,32 @@ AC_DEFUN([_RTEMS_CPU_SUBDIR], [ -$1 ) if test -d ${srcdir}/$1 ; then - AC_CONFIG_SUBDIRS([$1]) +$1 ) if test -d ${srcdir}/ifelse([$2],,[$1],[$2/$1]) ; then + AC_CONFIG_SUBDIRS(ifelse([$2],,[$1],[$2/$1])) fi ]) +## RTEMS_CPU_SUBDIRS([PREFIX]) AC_DEFUN([RTEMS_CPU_SUBDIRS], [ ## EDIT: If adding a new cpu to RTEMS, add it to the case block below. case $RTEMS_CPU in -_RTEMS_CPU_SUBDIR([a29k]);; -_RTEMS_CPU_SUBDIR([arm]);; -_RTEMS_CPU_SUBDIR([c4x]);; -_RTEMS_CPU_SUBDIR([h8300]);; -_RTEMS_CPU_SUBDIR([hppa1.1]);; -_RTEMS_CPU_SUBDIR([i386]);; -_RTEMS_CPU_SUBDIR([i960]);; -_RTEMS_CPU_SUBDIR([m68k]);; -_RTEMS_CPU_SUBDIR([mips]);; -_RTEMS_CPU_SUBDIR([mips64orion]);; -_RTEMS_CPU_SUBDIR([no_cpu]);; -_RTEMS_CPU_SUBDIR([or16]);; -_RTEMS_CPU_SUBDIR([or32]);; -_RTEMS_CPU_SUBDIR([powerpc]);; -_RTEMS_CPU_SUBDIR([sh]);; -_RTEMS_CPU_SUBDIR([sparc]);; -_RTEMS_CPU_SUBDIR([unix]);; +_RTEMS_CPU_SUBDIR([a29k],[$1]);; +_RTEMS_CPU_SUBDIR([arm],[$1]);; +_RTEMS_CPU_SUBDIR([c4x],[$1]);; +_RTEMS_CPU_SUBDIR([h8300],[$1]);; +_RTEMS_CPU_SUBDIR([hppa1.1],[$1]);; +_RTEMS_CPU_SUBDIR([i386],[$1]);; +_RTEMS_CPU_SUBDIR([i960],[$1]);; +_RTEMS_CPU_SUBDIR([m68k],[$1]);; +_RTEMS_CPU_SUBDIR([mips],[$1]);; +_RTEMS_CPU_SUBDIR([mips64orion],[$1]);; +_RTEMS_CPU_SUBDIR([no_cpu],[$1]);; +_RTEMS_CPU_SUBDIR([or16],[$1]);; +_RTEMS_CPU_SUBDIR([or32],[$1]);; +_RTEMS_CPU_SUBDIR([powerpc],[$1]);; +_RTEMS_CPU_SUBDIR([sh],[$1]);; +_RTEMS_CPU_SUBDIR([sparc],[$1]);; +_RTEMS_CPU_SUBDIR([unix],[$1]);; *) AC_MSG_ERROR([Invalid RTEMS_CPU]) esac ]) diff --git a/aclocal/target.m4 b/aclocal/target.m4 index b79698439a..5c0d67d0ea 100644 --- a/aclocal/target.m4 +++ b/aclocal/target.m4 @@ -23,7 +23,7 @@ if test "$no_recursion" != yes; then # Remove --cache-file and --srcdir arguments so they do not pile up. ac_sub_configure_args= rtems_prev= - for rtems_arg in $ac_configure_args; do + for rtems_arg in $rtems_configure_args; do if test -n "$rtems_prev"; then rtems_prev= continue @@ -82,6 +82,7 @@ if test "$no_recursion" != yes; then fi], [ RTEMS_BUILD_SUBDIRS="$RTEMS_BUILD_SUBDIRS" +rtems_configure_args="$ac_configure_args" ]) ]) |