2000-09-04 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

* ampolish: Add rules to add compile.am
This commit is contained in:
Joel Sherrill
2000-09-05 15:30:48 +00:00
parent 7294718f81
commit 75d1f0fbe4
2 changed files with 21 additions and 0 deletions

View File

@@ -1,3 +1,7 @@
2000-09-04 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* ampolish: Add rules to add compile.am
2000-08-10 Joel Sherrill <joel@OARcorp.com> 2000-08-10 Joel Sherrill <joel@OARcorp.com>
* ChangeLog: New file. * ChangeLog: New file.

View File

@@ -134,6 +134,10 @@ else { $rtems_top .= "/" ; }
{ {
push @ibuf, "include \$(top_srcdir)/${rtems_top}automake/lib.am\n" ; push @ibuf, "include \$(top_srcdir)/${rtems_top}automake/lib.am\n" ;
} }
elsif ( /^[\s]*include[\s\t]*.*compile.am[\s]*$/o )
{
# remove the line
}
elsif ( /^(.*[^\s])[\s]*$/o ) elsif ( /^(.*[^\s])[\s]*$/o )
{ # remove trailing spaces { # remove trailing spaces
push @ibuf, "$1\n" ; push @ibuf, "$1\n" ;
@@ -220,6 +224,7 @@ else { $rtems_top .= "/" ; }
{ {
if ( "$1" eq "lib" ) if ( "$1" eq "lib" )
{ {
push @ibuf, "include \$(top_srcdir)/${rtems_top}automake/compile.am\n" ;
push @ibuf, "include \$(top_srcdir)/${rtems_top}automake/$1.am\n" ; push @ibuf, "include \$(top_srcdir)/${rtems_top}automake/$1.am\n" ;
} }
elsif ( "$1" eq "local" ) elsif ( "$1" eq "local" )
@@ -231,6 +236,18 @@ else { $rtems_top .= "/" ; }
$main::seen_host = 1 ; $main::seen_host = 1 ;
} }
} }
elsif ( /^[\s]*include[\s\t]*\$\(RTEMS_ROOT\)\/make\/(.*)\.cfg$/o )
{
if ( "$1" eq "leaf" )
{
push @ibuf, "include \$(top_srcdir)/${rtems_top}automake/compile.am\n" ;
push @ibuf, "include \$(RTEMS_ROOT)/make/$1.cfg\n" ;
}
else
{
push @ibuf, "include \$(RTEMS_ROOT)/make/$1.cfg\n" ;
}
}
elsif ( /^[\s]*include[\s\t]*(.*)$/o ) elsif ( /^[\s]*include[\s\t]*(.*)$/o )
{ {
push @ibuf, "include $1\n" ; push @ibuf, "include $1\n" ;