Automake II patch from Ralf Corsepius <corsepiu@faw.uni-ulm.de>. Email

description follows:

Description:

    * automake for *all* tool subdirectories (Makefile.am, configure.in etc.)
    * autogen now also considers CONFIG_HEADER (generates stamp-h.ins and
      config.h.ins)
    * c/src/tests/tools/generic/difftest and
      c/src/tests/tools/generic/sorttimes generated by configure scripts
    * c/update-tools/ampolish, beautifier for Makefile.ams, similar to
      acpolish
    * rtems-polish.sh added to c/update-tools/ + ampolish support
    * New subdirectory ./automake, contains automake -Makefile fragments to
      support RTEMS make "debug, debug_install, profile, profile_install" for
      native Makefile.ams (== ignore these make targets).
    * aclocal/rtems-top.m4's RTEMS_TOP now reads the automake makefile
      variable VERSION from RTEMS ./VERSION file.
    * ./configure.in uses the macros from aclocal + support for the tools'
      configure scripts

  Remarks:
    * To run rtems-polish.sh, "cd <rtems-source-tree>;
      ./c/update-tools/rtems-polish.sh"
    * AFAIS, now all native subdirectories are converted to automake (Please
      drop me a note, if I forgot something).
    * Unless you notice something fatal, IMO the time has come for a public
      try (== snapshot). I do not intend to send more automake related patches
      within, say 2 weeks, to give these patches time to settle and to give me
      some time to think on how to continue.
    * The patch assumes installation to the new main installation directory
      [$(prefix)].

c/update-tools/ampolish

@@ -0,0 +1,105 @@
+#!/usr/bin/perl
+
+#
+# Perl script to beautify and enhance RTEMS automake Makefile.ams
+#
+# Reads from stdin and writes to stdout
+#
+# usage: 
+# <path-to>/ampolish <Makefile.am >Makefile.am~
+# mv Makefile.am~ Makefile.am
+#
+# ATTENTION: This file contains embedded tabs
+
+my $subdirs_seen = "" ;
+
+# find a relative up-path to a file $file, starting at directory $pre
+sub find_file
+{
+  my $pre = $_[0] ;
+  my $file= $_[1] ;
+
+  my $top = "." ;
+  if (not "$pre") { $pre = "." ; }
+
+  for ( $str = "$pre" . "/" . "$top" ;
+    ( -d "$str" ) ;
+    $str = "$pre" . "/" . "$top" )
+  {
+    if ( -f "${str}/${file}" )  
+    {
+      return $top ; 
+    }
+    if ( "$top" eq "." )
+    {
+      $top = ".." ;
+    }
+    else
+    {
+      $top .= "/.." ;
+    }
+  } ;
+  die "Can't find file ${file}\n" ;
+}
+
+# find relative up-path to configure.in
+my $rtems_cfg = find_file(".","configure.in");
+
+# find relative up-path from configure.in to VERSION
+my $rtems_top = find_file("$rtems_cfg","VERSION");
+
+my $nl_seen = 0 ;
+
+while( <> )
+{ # consume header
+  last if ( /^[^#].*$/ ) ;
+  print "$_" ;
+}
+
+print "\nAUTOMAKE_OPTIONS = foreign\n";
+if ( "$rtems_cfg" eq "." )
+{
+  print "ACLOCAL = \@ACLOCAL\@ -I \$(RTEMS_TOPdir)/aclocal\n" 
+}
+
+while( <> )
+{ 
+  if ( /^[ 	]*$/o )
+  {
+    $nl_seen = $nl_seen+1;
+  }
+
+  if ( /^[ 	]*AUTOMAKE_OPTIONS.*$/o )
+  { # remove the line
+  }
+  elsif ( /^[ 	]*ACLOCAL[ 	]*=[ 	]*\@ACLOCAL\@.*$/o )
+  { # remove the line
+  }
+  elsif ( /^[ 	]*include[ 	]*\$\(top_srcdir\)[\.\/]*automake\/(.*)\.am$/o )
+  {
+    # remove the line 
+  }
+  elsif ( /^[ 	]*SUBDIRS.*$/o )
+  {
+    $subdirs_seen = "yes" ;
+    print "$_" ;
+    $nl_seen = 0 ;
+  }
+  elsif ( /^[   ]*$/o )
+  {
+    print "$_" if $nl_seen < 2 ;
+  }
+  else
+  {
+    print "$_" ;
+    $nl_seen = 0;
+  }
+} # while
+
+if ( "$subdirs_seen" )
+{
+  print "include \$(top_srcdir)/${rtems_top}/automake/subdirs.am\n" ;
+}
+print "include \$(top_srcdir)/${rtems_top}/automake/local.am\n" ;
+
+;1

c/update-tools/rtems-polish.sh

@@ -0,0 +1,30 @@
+#!/bin/sh
+
+pwd=`pwd`;
+
+ac_files=`find . -name Makefile.in`;
+for f in $ac_files; do
+  i=`dirname $f`
+  dest="$i"
+  if test ! -f $dest/Makefile.am; then
+    echo "polishing : $dest/Makefile.in"
+    ( cd $dest; 
+      mv Makefile.in Makefile.in~;
+      $pwd/c/update-tools/acpolish <Makefile.in~ >Makefile.in
+      rm Makefile.in~
+    )
+  fi
+done
+
+am_files=`find . -name Makefile.am`;
+for f in $am_files; do
+  i=`dirname $f`
+  dest="$i"
+    echo "polishing : $dest/Makefile.am"
+    ( cd $dest; 
+      mv Makefile.am Makefile.am~;
+      $pwd/c/update-tools/ampolish <Makefile.am~ >Makefile.am
+      rm Makefile.am~
+    )
+done
+