summaryrefslogtreecommitdiffstats
path: root/tools/update
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2000-09-05 15:30:48 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2000-09-05 15:30:48 +0000
commit75d1f0fbe4994ac02f30ea68f43396a7879af808 (patch)
tree3e2018631cfea3ab8fae43b0da50711608f8c78a /tools/update
parent7294718f81d1d3db9bad400b2fd60ba5c13ce2af (diff)
downloadrtems-75d1f0fbe4994ac02f30ea68f43396a7879af808.tar.bz2
2000-09-04 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* ampolish: Add rules to add compile.am
Diffstat (limited to 'tools/update')
-rw-r--r--tools/update/ChangeLog4
-rwxr-xr-xtools/update/ampolish17
2 files changed, 21 insertions, 0 deletions
diff --git a/tools/update/ChangeLog b/tools/update/ChangeLog
index 101734ce64..9b1649a449 100644
--- a/tools/update/ChangeLog
+++ b/tools/update/ChangeLog
@@ -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>
* ChangeLog: New file.
diff --git a/tools/update/ampolish b/tools/update/ampolish
index aeec1ba050..af267e8bb9 100755
--- a/tools/update/ampolish
+++ b/tools/update/ampolish
@@ -134,6 +134,10 @@ else { $rtems_top .= "/" ; }
{
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 )
{ # remove trailing spaces
push @ibuf, "$1\n" ;
@@ -220,6 +224,7 @@ else { $rtems_top .= "/" ; }
{
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" ;
}
elsif ( "$1" eq "local" )
@@ -231,6 +236,18 @@ else { $rtems_top .= "/" ; }
$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 )
{
push @ibuf, "include $1\n" ;