diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2006-10-16 15:58:13 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2006-10-16 15:58:13 +0000 |
| commit | ed908735b018f2d8ac723f57145b73abc7ebcd57 (patch) | |
| tree | d3fe6149dd3f416a5b1a982f01565e03ee973f5f /cpukit | |
| parent | 2006-10-16 Ralf Corsépius <ralf.corsepius@rtems.org> (diff) | |
| download | rtems-ed908735b018f2d8ac723f57145b73abc7ebcd57.tar.bz2 | |
Adaptations to automake-1.10.
Diffstat (limited to 'cpukit')
| -rw-r--r-- | cpukit/aclocal/multi.m4 | 10 | ||||
| -rw-r--r-- | cpukit/aclocal/prog-cc.m4 | 2 | ||||
| -rw-r--r-- | cpukit/aclocal/prog-ccas.m4 | 4 | ||||
| -rw-r--r-- | cpukit/automake/compile.am | 6 | ||||
| -rw-r--r-- | cpukit/configure.ac | 2 |
5 files changed, 11 insertions, 13 deletions
diff --git a/cpukit/aclocal/multi.m4 b/cpukit/aclocal/multi.m4 index d629840d25..7cdc3cb023 100644 --- a/cpukit/aclocal/multi.m4 +++ b/cpukit/aclocal/multi.m4 @@ -32,12 +32,10 @@ else multilib_arg= fi -AC_OUTPUT_COMMANDS( -[case " $CONFIG_FILES " in +AC_CONFIG_COMMANDS([default-1],[case " $CONFIG_FILES " in *" ]m4_if([$1],,Makefile,[$1])[ "*) ac_file=]m4_if([$1],,Makefile,[$1])[ . ${multilib_basedir}/config-ml.in -esac], -[ +esac],[ srcdir=${srcdir} host=${host} target=${target} @@ -47,6 +45,6 @@ esac], ac_configure_args="${multilib_arg} ${ac_configure_args}" CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} multilib_basedir=${multilib_basedir} - CC="${CC}"] -) + CC="${CC}" +]) ]) diff --git a/cpukit/aclocal/prog-cc.m4 b/cpukit/aclocal/prog-cc.m4 index a62dae198e..834b0b55c0 100644 --- a/cpukit/aclocal/prog-cc.m4 +++ b/cpukit/aclocal/prog-cc.m4 @@ -31,6 +31,6 @@ m4_if([$1],,[],[RTEMS_CFLAGS="$RTEMS_CFLAGS $1"]) fi AC_SUBST(RTEMS_CFLAGS) -RTEMS_CPPFLAGS="-I\$(PROJECT_INCLUDE)" +RTEMS_CPPFLAGS="-I\$(top_builddir) -I\$(PROJECT_INCLUDE)" AC_SUBST(RTEMS_CPPFLAGS) ]) diff --git a/cpukit/aclocal/prog-ccas.m4 b/cpukit/aclocal/prog-ccas.m4 index c5b64f561f..15b1a2c9b8 100644 --- a/cpukit/aclocal/prog-ccas.m4 +++ b/cpukit/aclocal/prog-ccas.m4 @@ -3,6 +3,6 @@ AC_DEFUN([RTEMS_PROG_CCAS], [ AC_REQUIRE([RTEMS_PROG_CC]) -AC_SUBST(CCAS,["$CC"]) -AC_SUBST(CCASFLAGS,["-DASM \$(CFLAGS) \$(INCLUDES)"]) +AM_PROG_AS +AC_SUBST(RTEMS_CCASFLAGS,["-DASM \$(CFLAGS)"]) ]) diff --git a/cpukit/automake/compile.am b/cpukit/automake/compile.am index 0d0f579674..1997003d84 100644 --- a/cpukit/automake/compile.am +++ b/cpukit/automake/compile.am @@ -2,6 +2,6 @@ ## $Id$ ## -AM_CPPFLAGS = -I$(top_builddir) -I$(PROJECT_INCLUDE) -AM_CFLAGS = $(RTEMS_CFLAGS) -AM_CCASFLAGS = -I$(top_builddir) -I$(PROJECT_INCLUDE) $(RTEMS_ASFLAGS) +AM_CPPFLAGS = @RTEMS_CPPFLAGS@ +AM_CFLAGS = @RTEMS_CFLAGS@ +AM_CCASFLAGS = @RTEMS_CCASFLAGS@ diff --git a/cpukit/configure.ac b/cpukit/configure.ac index c80bbf5263..43eab313e4 100644 --- a/cpukit/configure.ac +++ b/cpukit/configure.ac @@ -9,7 +9,7 @@ RTEMS_TOP([..],[]) RTEMS_CANONICAL_TARGET_CPU -AM_INIT_AUTOMAKE([no-define nostdinc subdir-objects foreign 1.9]) +AM_INIT_AUTOMAKE([no-define nostdinc subdir-objects foreign 1.10]) AM_MAINTAINER_MODE RTEMS_ENABLE_MULTILIB |