summaryrefslogtreecommitdiffstats
path: root/tools/update
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>1999-11-23 13:57:02 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>1999-11-23 13:57:02 +0000
commit9f4868cea9c37ff42c0c01dd217c6710a6dda2aa (patch)
treeccafc2587352f57c5db8ba8fd924ca1240dfd416 /tools/update
parentd5b004b6e3293e8758d42b3205a94a8590196882 (diff)
downloadrtems-9f4868cea9c37ff42c0c01dd217c6710a6dda2aa.tar.bz2
Miscellaneous patches from Ralf Corsepius <corsepiu@faw.uni-ulm.de>
that are part of the Makefile.am conversion effort but were missed in the previous commits.
Diffstat (limited to 'tools/update')
-rwxr-xr-xtools/update/acpolish4
-rwxr-xr-xtools/update/ampolish9
2 files changed, 12 insertions, 1 deletions
diff --git a/tools/update/acpolish b/tools/update/acpolish
index 1fe933cfec..5de711f60c 100755
--- a/tools/update/acpolish
+++ b/tools/update/acpolish
@@ -191,6 +191,10 @@ sub subst_line
print STDERR "WARNING: Replacing RTEMS_HAS_$2 with HAS_$2\n" ;
$_ = "$1HAS_$2$3\n" ;
}
+ if ( /^[\s]*\$[({]PGM[)}]:[\s]*(.*)\$([({]SRCS[)}])(.*)$/o )
+ {
+ $_ = "\$(PGM):$1$3\n" ;
+ }
if ( /^.*\$\(make\-exe\).*$/o )
{
$make_exe_seen = 1 ;
diff --git a/tools/update/ampolish b/tools/update/ampolish
index 1fb5c3341f..265a3bc76c 100755
--- a/tools/update/ampolish
+++ b/tools/update/ampolish
@@ -84,7 +84,14 @@ while( <> )
}
elsif ( /^[\s\t]*include[\s\t]*\$\(top_srcdir\)[\.\/]*automake\/(.*)\.am$/o )
{
- # remove the line
+ if ( "$1" eq "lib" )
+ {
+ print "include \$(top_srcdir)/${rtems_top}automake/$1.am\n" ;
+ }
+ }
+ elsif ( /^[\s\t]*include[\s\t]*\$\(RTEMS_ROOT\)\/make\/lib.cfg$/o )
+ {
+ print "include \$(top_srcdir)/${rtems_top}automake/lib.am\n" ;
}
elsif ( /^[\s\t]*SUBDIRS.*$/o )
{