[Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.11b-117-gb30e38c

[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=b30e38cb5d07cc6a4d5545e1f42ac717c0992a85

The branch, ng/master has been updated
       via  b30e38cb5d07cc6a4d5545e1f42ac717c0992a85 (commit)
      from  3992692e8a505a4600dab66c4c0e5ce0dba30e57 (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 b30e38cb5d07cc6a4d5545e1f42ac717c0992a85
Author: Stefano Lattarini <address@hidden>
Date:   Sun Apr 15 01:33:48 2012 +0200

    [ng] opts: new 'ng' option, to better differentiate from mainstream Automake
    
    We add a new no-op option 'ng', that will be recognized by Automake-NG but
    not by mainstream Automake.  It can be used by developers to declare that
    their build system requires Automake-NG, and in a way that will ensure a
    clear error if mainstream Automake is used by mistake.
    
    * lib/Automake/Options.pm (_is_valid_easy_option): Recognize 'ng'.
    * doc/automake.texi: Document the new option and its purpose.
    * t/option-ng.sh: New test.
    * t/list-of-tests.mk: Add it.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

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

Summary of changes:
 doc/automake.texi             |    9 +++++++++
 lib/Automake/Options.pm       |    1 +
 t/list-of-tests.mk            |    1 +
 t/{output.sh => option-ng.sh} |   13 +++++--------
 4 files changed, 16 insertions(+), 8 deletions(-)
 copy t/{output.sh => option-ng.sh} (77%)

diff --git a/doc/automake.texi b/doc/automake.texi
index 8e5b0d2..263b907 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -10071,6 +10071,15 @@ options below.  This option should be used in the 
top-level
 @file{configure.ac}, it will be ignored otherwise.  It will also be
 ignored in sub-packages of nested packages (@pxref{Subpackages}).
 
address@hidden @option{ng}
address@hidden Option, @option{ng}
address@hidden ng
+This is a no-op option, whose only purpose it to be recognized by
+Automake-NG but @emph{not} by mainstream Automake.  It can be
+used by developers to declare that their build system requires
+Automake-NG, and in a way that will ensure a clear error if
+mainstream Automake is used by mistake.
+
 @item @option{no-define}
 @cindex Option, @option{no-define}
 @opindex no-define
diff --git a/lib/Automake/Options.pm b/lib/Automake/Options.pm
index 702d428..e8c5289 100644
--- a/lib/Automake/Options.pm
+++ b/lib/Automake/Options.pm
@@ -277,6 +277,7 @@ sub _is_valid_easy_option ($)
     dist-tarZ
     dist-xz
     dist-zip
+    ng
     no-define
     no-dependencies
     no-dist
diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk
index e97140e..5c67db5 100644
--- a/t/list-of-tests.mk
+++ b/t/list-of-tests.mk
@@ -705,6 +705,7 @@ t/objdir.sh \
 t/objext-pr10128.sh \
 t/obsolete.sh \
 t/oldvars.sh \
+t/option-ng.sh \
 t/order.sh \
 t/output.sh \
 t/output2.sh \
diff --git a/t/output.sh b/t/option-ng.sh
similarity index 77%
copy from t/output.sh
copy to t/option-ng.sh
index faf877b..3ad9fa7 100755
--- a/t/output.sh
+++ b/t/option-ng.sh
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+# Copyright (C) 2012 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -14,20 +14,17 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Test to make sure files listed in AC_OUTPUT are found.
+# Automake-NG should recognize the (no-op) 'ng' option.
 
 . ./defs || Exit 1
 
 cat > configure.ac <<END
 AC_INIT([$me], [1.0])
-AM_INIT_AUTOMAKE
-AC_OUTPUT([Makefile frob/zardoz])
+AM_INIT_AUTOMAKE([ng])
+AC_CONFIG_FILES([Makefile])
 END
 
-: > Makefile.am
-
-mkdir frob
-: > frob/zardoz.in
+echo AUTOMAKE_OPTIONS = ng > Makefile.am
 
 $ACLOCAL
 $AUTOMAKE


hooks/post-receive
-- 
GNU Automake