Changeset 0667e1b in rtems


Ignore:
Timestamp:
10/16/06 16:17:07 (17 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Children:
0679782
Parents:
fb3b398
Message:

Adaptations to automake-1.10.

Location:
cpukit
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • cpukit/aclocal/multi.m4

    rfb3b398 r0667e1b  
    3333fi
    3434
    35 AC_OUTPUT_COMMANDS(
    36 [case " $CONFIG_FILES " in
     35AC_CONFIG_COMMANDS([default-1],[case " $CONFIG_FILES " in
    3736 *" ]m4_if([$1],,Makefile,[$1])[ "*)
    3837    ac_file=]m4_if([$1],,Makefile,[$1])[ . ${multilib_basedir}/config-ml.in
    39 esac],
    40 [
     38esac],[
    4139  srcdir=${srcdir}
    4240  host=${host}
    … …  
    4846  CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
    4947  multilib_basedir=${multilib_basedir}
    50   CC="${CC}"]
    51 )
     48  CC="${CC}"
    5249])
     50])

  • cpukit/aclocal/prog-cc.m4

    rfb3b398 r0667e1b  
    3232AC_SUBST(RTEMS_CFLAGS)
    3333
    34 RTEMS_CPPFLAGS="-I\$(PROJECT_INCLUDE)"
     34RTEMS_CPPFLAGS="-I\$(top_builddir) -I\$(PROJECT_INCLUDE)"
    3535AC_SUBST(RTEMS_CPPFLAGS)
    3636])

  • cpukit/aclocal/prog-ccas.m4

    rfb3b398 r0667e1b  
    44[
    55AC_REQUIRE([RTEMS_PROG_CC])
    6 AC_SUBST(CCAS,["$CC"])
    7 AC_SUBST(CCASFLAGS,["-DASM \$(CFLAGS) \$(INCLUDES)"])
     6AM_PROG_AS
     7AC_SUBST(RTEMS_CCASFLAGS,["-DASM \$(CFLAGS)"])
    88])

  • cpukit/automake/compile.am

    rfb3b398 r0667e1b  
    33##
    44
    5 AM_CPPFLAGS = -I$(top_builddir) -I$(PROJECT_INCLUDE)
    6 AM_CFLAGS = $(RTEMS_CFLAGS)
    7 AM_CCASFLAGS = -I$(top_builddir) -I$(PROJECT_INCLUDE) $(RTEMS_ASFLAGS)
     5AM_CPPFLAGS = @RTEMS_CPPFLAGS@
     6AM_CFLAGS = @RTEMS_CFLAGS@
     7AM_CCASFLAGS = @RTEMS_CCASFLAGS@
Note: See TracChangeset for help on using the changeset viewer.