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.

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