[Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.12.2-538-g747774e

[Stefano Lattarini]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=747774e04541f340524910146ebf450d2c8610e0

The branch, ng/master has been updated
       via  747774e04541f340524910146ebf450d2c8610e0 (commit)
       via  0d5b52a96cf22911c8d271da9acdef8b4618304e (commit)
      from  5ce110a94aabb52b6756f4ff29c00414b56697f6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 747774e04541f340524910146ebf450d2c8610e0
Author: Stefano Lattarini <address@hidden>
Date:   Sat Jul 21 15:52:07 2012 +0200

    [ng] automake: inline '&handle_install'
    
    * automake.in (handle_install): Delete, inlined ...
    (generate_makefile): ... in here, as it had become a
    trivial one-liner.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit 0d5b52a96cf22911c8d271da9acdef8b4618304e
Author: Stefano Lattarini <address@hidden>
Date:   Sat Jul 21 15:49:25 2012 +0200

    [ng] automake: new function &almost_verbatim (small refactoring)
    
    * automake.in (almost_verbatim): New function, thin wrapper around
    '&preprocess_file'.  It requires just the name of the fragment to
    preprocess (assuming it is one provided by automake, and thus taking
    care to prepend the "$libdir/am/" path and append the ".am" extension
    automatically), and then automatically append the processed content
    to the '$output_verbatim' global variable.
    (handle_all_and_check, handle_install, handle_texinfo): Adjust to use
    '&almost_verbatim' instead of '&preprocess_file'.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 automake.in |   36 ++++++++++++++++++++----------------
 1 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/automake.in b/automake.in
index 6e7da4b..e52a67a 100644
--- a/automake.in
+++ b/automake.in
@@ -3013,7 +3013,7 @@ sub handle_texinfo ()
   if ($info_texinfos)
     {
       define_verbose_texinfo;
-      $output_verbatim .= preprocess_file ("$libdir/am/texibuild.am");
+      almost_verbatim ('texibuild');
       ($mostlyclean, $clean, $maintclean) = handle_texinfo_helper 
($info_texinfos);
       chomp $mostlyclean;
       chomp $clean;
@@ -3926,13 +3926,6 @@ sub handle_footer
   $output_trailer .= file_contents ('footer', new Automake::Location);
 }
 
-
-# Generate 'make install' rules.
-sub handle_install ()
-{
-  $output_verbatim .= preprocess_file ("$libdir/am/install.am");
-}
-
 # Generate "make all" and "make check" rules.
 sub handle_all_and_check ()
 {
@@ -3944,13 +3937,13 @@ sub handle_all_and_check ()
         if dirname ($out) eq $relative_dir;
     }
 
-  $output_verbatim .= preprocess_file ("$libdir/am/all-target.am",
-                                       'ALL-DEPS' => "@all",
-                                       'LOCAL-HEADERS' => "@local_headers");
+  almost_verbatim ('all-target',
+                   'ALL-DEPS' => "@all",
+                   'LOCAL-HEADERS' => "@local_headers");
 
-  $output_verbatim .= preprocess_file ("$libdir/am/check-target.am",
-                                       'CHECK-DEPS' => "@check",
-                                       'CHECK-TESTS' => "@check_tests");
+  almost_verbatim ('check-target',
+                   'CHECK-DEPS' => "@check",
+                   'CHECK-TESTS' => "@check_tests");
 }
 
 # Generate helper targets for user recursion, where needed.
@@ -5882,6 +5875,17 @@ sub preprocess_file ($%)
   return $_;
 }
 
+# almost_verbatim ($NAME, [%TRANSFORM])
+# -------------------------------------
+# Load a "$libdir/am/$NAME.am", apply the %TRANSFORM, and append the
+# result to the '$output_verbatim'.  No extra parsing or post-processing
+# is done (i.e., recognition of rules declaration or of make variables
+# definitions).
+sub almost_verbatim ($%)
+{
+  my $name = shift;
+  $output_verbatim .= preprocess_file ("$libdir/am/$name.am", @_);
+}
 
 # @PARAGRAPHS
 # &make_paragraphs ($MAKEFILE, [%TRANSFORM])
@@ -6910,7 +6914,7 @@ sub generate_makefile ($$)
   check_gnu_standards;
   check_gnits_standards;
 
-  $output_verbatim .= preprocess_file ("$libdir/am/am-dir.am");
+  almost_verbatim ('am-dir');
 
   handle_configure ($makefile_am, $makefile_in, $makefile, @inputs);
   handle_gettext;
@@ -6970,7 +6974,7 @@ sub generate_makefile ($$)
       $output_rules .= "install-binPROGRAMS: 
install-nobase_libLTLIBRARIES\n\n";
     }
 
-  handle_install;
+  almost_verbatim ('install');
   handle_clean ($makefile);
   handle_factored_dependencies;
 


hooks/post-receive
-- 
GNU Automake