Adaptations to automake-1.10.

cpukit/aclocal/multi.m4

@@ -32,12 +32,10 @@ else
   multilib_arg=
 fi
 
-AC_OUTPUT_COMMANDS(
+AC_CONFIG_COMMANDS([default-1],[case " $CONFIG_FILES " in
-[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}"
-)
+])
 ])

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)
 ])

cpukit/aclocal/prog-ccas.m4

@@ -3,6 +3,6 @@
 AC_DEFUN([RTEMS_PROG_CCAS],
 [
 AC_REQUIRE([RTEMS_PROG_CC])
-AC_SUBST(CCAS,["$CC"])
+AM_PROG_AS
-AC_SUBST(CCASFLAGS,["-DASM \$(CFLAGS) \$(INCLUDES)"])
+AC_SUBST(RTEMS_CCASFLAGS,["-DASM \$(CFLAGS)"])
 ])

cpukit/automake/compile.am

@@ -2,6 +2,6 @@
 ## $Id$
 ##
 
-AM_CPPFLAGS = -I$(top_builddir) -I$(PROJECT_INCLUDE)
+AM_CPPFLAGS = @RTEMS_CPPFLAGS@
-AM_CFLAGS = $(RTEMS_CFLAGS)
+AM_CFLAGS = @RTEMS_CFLAGS@
-AM_CCASFLAGS = -I$(top_builddir) -I$(PROJECT_INCLUDE) $(RTEMS_ASFLAGS)
+AM_CCASFLAGS = @RTEMS_CCASFLAGS@

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