[Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.12-205-g4b8c770

[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=4b8c7705ccca9e8bf0cef0a6a4cfa0e6dc24bf9a

The branch, ng/master has been updated
       via  4b8c7705ccca9e8bf0cef0a6a4cfa0e6dc24bf9a (commit)
       via  465d3486f83f4893a7599fcd9e988a768d824018 (commit)
      from  9f4c5f0e6491446e57a4d2f24bed39692ef13361 (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 4b8c7705ccca9e8bf0cef0a6a4cfa0e6dc24bf9a
Author: Stefano Lattarini <address@hidden>
Date:   Wed May 9 11:55:38 2012 +0200

    [ng] cleanup: use .DEFAULT_GOAL to set the default rule
    
    This change should introduce no semantic change, but allows
    a minor simplification in automake.in.
    
    * automake.in ($output_all): Don't define nor use anymore,
    its role and function merged with '$output_rules'.
    * lib/am/header-vars.am (.DEFAULT_GOAL): Define to 'all'.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit 465d3486f83f4893a7599fcd9e988a768d824018
Author: Stefano Lattarini <address@hidden>
Date:   Wed May 9 11:38:20 2012 +0200

    [ng] news: resync with changes in Automake master
    
    * NG-NEWS: Don't list the fact that "support for silent rules is now
    always active in Makefiles generated by Automake-NG" as a news entry.
    That is now true also for the development version of Automake (since
    commit 'v1.12-34-g14141f2' of 2012-05-01, "silent rules: support for
    them is always active now".
    
    Signed-off-by: Stefano Lattarini <address@hidden>

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

Summary of changes:
 NG-NEWS               |    5 -----
 automake.in           |   16 +++++++---------
 lib/am/header-vars.am |    4 ++++
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/NG-NEWS b/NG-NEWS
index 99cb0bc..11d66d9 100644
--- a/NG-NEWS
+++ b/NG-NEWS
@@ -23,11 +23,6 @@ Automatic dependency tracking support
 Silent rules
 ============
 
-* Support for silent rules is now always active in Makefiles generated
-  by Automake-NG; so, although the verbose output is still the default,
-  the user can now always use "./configure --enable-silent-rules" or
-  "make V=0" to enable quieter output in the package he's building.
-
 * The silent-rules support unconditionally assumes that nested variables
   expansion are supported.  Accordingly, the AC_SUBST'd variables '@AM_V@'
   and'@AM_DEFAULT_V@' have been removed, so that instead of using
diff --git a/automake.in b/automake.in
index 483bb79..a47aedc 100644
--- a/automake.in
+++ b/automake.in
@@ -496,7 +496,6 @@ my $output_deps_greatest_timestamp;
 # These variables are used when generating each Makefile.in.
 # They hold the Makefile.in until it is ready to be printed.
 my $output_vars;
-my $output_all;
 my $output_header;
 my $output_rules;
 my $output_trailer;
@@ -647,7 +646,6 @@ sub initialize_per_input ()
     $output_deps_greatest_timestamp = 0;
 
     $output_vars = '';
-    $output_all = '';
     $output_header = '';
     $output_rules = '';
     $output_trailer = '';
@@ -4476,15 +4474,15 @@ sub handle_all ($)
        # by changing the order of dependencies to the "all" because
        # that breaks when using parallel makes.  Instead we handle
        # things explicitly.
-       $output_all .= ("all: @local_headers"
-                       . "\n\t\$(MAKE) "
-                       . (var ('SUBDIRS') ? 'all-recursive' : 'all-am')
-                       . "\n\n");
+        $output_rules .= ("all: @local_headers"
+                          . "\n\t\$(MAKE) "
+                          . (var ('SUBDIRS') ? 'all-recursive' : 'all-am')
+                          . "\n\n");
       }
     else
       {
-       $output_all .= "all: " . (var ('SUBDIRS')
-                                 ? 'all-recursive' : 'all-am') . "\n\n";
+        $output_rules .= "all: " . (var ('SUBDIRS')
+                                    ? 'all-recursive' : 'all-am') . "\n\n";
       }
 }
 
@@ -7988,7 +7986,7 @@ sub generate_makefile ($$)
 
   # We make sure that 'all:' is the first target.
   my $output =
-    "$output_vars$output_all$output_header$output_rules$output_trailer";
+    "$output_vars$output_header$output_rules$output_trailer";
 
   # Decide whether we must update the output file or not.
   # We have to update in the following situations.
diff --git a/lib/am/header-vars.am b/lib/am/header-vars.am
index a081639..0d73850 100644
--- a/lib/am/header-vars.am
+++ b/lib/am/header-vars.am
@@ -16,6 +16,10 @@
 
 VPATH = @srcdir@
 
+## The 'all' target must be the default one, independently from the
+## position it is declared in the output Makefile.
+.DEFAULT_GOAL := all
+
 ## Emulate VPATH rewrites.  This uses only GNU make primitives, which
 ## allows us to avoid extra forks.
 am__vpath_rewrite = \


hooks/post-receive
-- 
GNU Automake