[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-1960-g86e9e0e

[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=86e9e0e331e5008ab5ca9db77d74c542042dcfe8

The branch, master has been updated
       via  86e9e0e331e5008ab5ca9db77d74c542042dcfe8 (commit)
       via  0699a84a6f7a085acb76446caa81ce3133dedaf2 (commit)
       via  3614a17db7efbc5ca7929ec66dfe278e94930b68 (commit)
       via  f76cb63c8c775daa81ecad00b0a3ac6019fbebfe (commit)
      from  8817647ecd144e93b74b753ff197bb75c606640d (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 86e9e0e331e5008ab5ca9db77d74c542042dcfe8
Author: Stefano Lattarini <address@hidden>
Date:   Thu Feb 16 19:52:37 2012 +0100

    build: clearer diagnostic if "make" is invoked before "./configure"
    
    Since a GNUmakefile wrapper has been introduced in our build
    system, a "make" invocation issued before a "./configure" one
    has caused GNU make to die with the cryptic message:
    
      GNUmakefile:18: Makefile: No such file or directory
      GNUmakefile:19: /syntax-checks.mk: No such file or directory
      make: *** No rule to make target `/syntax-checks.mk'.  Stop.
    
    * GNUmakefile: Detect when we are being run from an unconfigured
    tree, and give helpful diagnostic.

commit 0699a84a6f7a085acb76446caa81ce3133dedaf2
Author: Stefano Lattarini <address@hidden>
Date:   Thu Feb 16 19:08:58 2012 +0100

    depcomp tests: put TAP plan in generated tests
    
    This avoids a spurious maintcheck failure, and also simplifies
    the 'depcomp.sh' helper script a little.
    
    * tests/gen-testsuite-part: Create and place also a proper 'plan_'
    call (to emit the TAP plan) in each generated 'depmod*.tap' test.
    * tests/depcomp.sh: Remove 'plan_' invocations, and simplify a
    little since we are at it.

commit 3614a17db7efbc5ca7929ec66dfe278e94930b68
Author: Stefano Lattarini <address@hidden>
Date:   Thu Feb 16 18:53:09 2012 +0100

    update-copyright: don't touch COPYING and INSTALL
    
    Reported by Peter Rosin.
    
    * update-copyright: Also exclude the COPYING and INSTALL files
    found in the top-level directory.
    * COPYING, INSTALL: Revert update of copyright years done in
    today's commit 'v1.11-1948-g641a5a4'.

commit f76cb63c8c775daa81ecad00b0a3ac6019fbebfe
Author: Stefano Lattarini <address@hidden>
Date:   Thu Feb 16 18:44:13 2012 +0100

    maintcheck: whitelist some false positives
    
    Instead of tweaking or dumbing down some of our sources or tests
    in order not to make them spuriously trigger few maintainer checks,
    we tweak such checks instead.
    
    * syntax-checks.mk (sc_tests_overriding_macros_on_cmdline): Also
    allow the variable 'exp' to be overridden on the make command line.
    Whitelist the test 'make-dryrun.test' where appropriate.
    (sc_mkinstalldirs): When whitelisting the 'mkinstalldirs' occurrence
    in 'lib/Makefile.am', do not look for the exact line number: it is
    obviously too fragile.

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

Summary of changes:
 COPYING                  |    2 +-
 GNUmakefile              |   13 +++++++++++--
 INSTALL                  |    3 ++-
 Makefile.am              |    2 +-
 syntax-checks.mk         |   21 ++++++++++++++++-----
 tests/depcomp.sh         |   27 +++++++++++----------------
 tests/gen-testsuite-part |    2 ++
 7 files changed, 44 insertions(+), 26 deletions(-)

diff --git a/COPYING b/COPYING
index a9a3ea0..d511905 100644
--- a/COPYING
+++ b/COPYING
@@ -1,7 +1,7 @@
                    GNU GENERAL PUBLIC LICENSE
                       Version 2, June 1991
 
- Copyright (C) 1989-2012 Free Software Foundation, Inc.,
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
diff --git a/GNUmakefile b/GNUmakefile
index 134e743..9d83dba 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -15,5 +15,14 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-include ./Makefile
-include $(srcdir)/syntax-checks.mk
+# If the user runs GNU make but has not yet run ./configure,
+# give them an helpful diagnostic instead of a cryptic error.
+am--Makefile := $(wildcard Makefile)
+ifeq ($(am--Makefile),)
+  $(warning There seems to be no Makefile in this directory.)
+  $(warning You must run ./configure before running 'make'.)
+  $(error Fatal Error)
+else
+  include ./Makefile
+  include $(srcdir)/syntax-checks.mk
+endif
diff --git a/INSTALL b/INSTALL
index 414d0e5..a1e89e1 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,7 +1,8 @@
 Installation Instructions
 *************************
 
-Copyright (C) 1994-2012 Free Software Foundation, Inc.
+Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation,
+Inc.
 
    Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright
diff --git a/Makefile.am b/Makefile.am
index 7c49ab6..b11e8fd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -379,6 +379,6 @@ update-copyright:
        $(AM_V_GEN)excluded_re=`echo $(FETCHFILES) \
          | sed -e 's|^|lib/|' -e 's| | lib/|g' -e 's, ,|,g'`; \
        $(GIT) ls-files \
-         | grep -Ev '/(COPYING|INSTALL)' \
+         | grep -Ev '^(lib/)?(COPYING|INSTALL)$$' \
          | grep -Ev "^($$excluded_re)$$" \
          | $(update_copyright_env) xargs $(srcdir)/lib/$@
diff --git a/syntax-checks.mk b/syntax-checks.mk
index 0f01114..13531bd 100644
--- a/syntax-checks.mk
+++ b/syntax-checks.mk
@@ -207,7 +207,7 @@ sc_no_for_variable_in_macro:
 sc_mkinstalldirs:
        @if grep -n 'mkinstalldirs' $(ams) \
              | grep -F -v '$$(mkinstalldirs)' \
-             | grep -v '^\./lib/Makefile.am:37:  *mkinstalldirs \\$$'; \
+             | grep -v '^\./lib/Makefile.am:[0-9][0-9]*:  *mkinstalldirs 
\\$$'; \
        then \
          echo "Found incorrect use of mkinstalldirs in the lines above" 1>&2; \
          exit 1; \
@@ -458,6 +458,8 @@ sc_tests_tap_plan:
 ## exception, POSIX says it can't come from the environment.  V, DESTDIR,
 ## DISTCHECK_CONFIGURE_FLAGS and DISABLE_HARD_ERRORS are exceptions, too,
 ## as package authors are urged not to initialize them anywhere.
+## Finally, 'exp' is used by some ad-hoc checks, where we ensure it's
+## ok to override it from the command line.
 sc_tests_overriding_macros_on_cmdline:
        @if grep -E '\$$MAKE .*(SHELL=.*=|=.*SHELL=)' $(xtests); then \
          echo 'Rewrite "$$MAKE foo=bar SHELL=$$SHELL" as "foo=bar $$MAKE -e 
SHELL=$$SHELL"' 1>&2; \
@@ -465,15 +467,24 @@ sc_tests_overriding_macros_on_cmdline:
          exit 1; \
        fi
 # The first s/// tries to account for usages like "$MAKE || st=$?".
-# DISTCHECK_CONFIGURE_FLAGS is allowed to contain whitespace in its
-# definition, hence the more complex last three substitutions below.
-       @if sed -e 's/ || .*//' -e 's/ && .*//' \
+# 'DISTCHECK_CONFIGURE_FLAGS' and 'exp' are allowed to contain whitespace in
+# their definitions, hence the more complex last three substitutions below.
+# Also, the 'make-dryrun.test' is whitelisted, since there we need to
+# override variables from the command line in order to cover the expected
+# code paths.
+       @tests=`for t in $(xtests); do \
+                 case $$t in */make-dryrun.test);; *) echo $$t;; esac; \
+               done`; \
+       if sed -e 's/ || .*//' -e 's/ && .*//' \
                -e 's/ DESTDIR=[^ ]*/ /' -e 's/ SHELL=[^ ]*/ /' \
                -e 's/ V=[^ ]*/ /' -e 's/ DISABLE_HARD_ERRORS=[^ ]*/ /' \
                -e "s/ DISTCHECK_CONFIGURE_FLAGS='[^']*'/ /" \
                -e 's/ DISTCHECK_CONFIGURE_FLAGS="[^"]*"/ /' \
                -e 's/ DISTCHECK_CONFIGURE_FLAGS=[^ ]/ /' \
-             $(xtests) | grep '\$$MAKE .*='; then \
+               -e "s/ exp='[^']*'/ /" \
+               -e 's/ exp="[^"]*"/ /' \
+               -e 's/ exp=[^ ]/ /' \
+             $$tests | grep '\$$MAKE .*='; then \
          echo 'Rewrite "$$MAKE foo=bar" as "foo=bar $$MAKE -e" in the above 
lines,' 1>&2; \
          echo 'it is more portable.' 1>&2; \
          exit 1; \
diff --git a/tests/depcomp.sh b/tests/depcomp.sh
index d149280..7fa07ab 100755
--- a/tests/depcomp.sh
+++ b/tests/depcomp.sh
@@ -286,30 +286,25 @@ test -f build-aux/depcomp \
 # selected by '--enable-dependency-tracking', we make this threefold check
 # only in this later case.
 
+if test $depmode,$depcomp_with_libtool = auto,yes; then
+  do_all_tests () { do_test; }
+else
+  do_all_tests ()
+  {
+    do_test default
+    do_test noshared --disable-shared
+    do_test nostatic --disable-static
+  }
+fi
+
 case $depmode in
   auto)
-    if test $depcomp_with_libtool = no; then
-      plan_ 28
-      do_all_tests () { do_test; }
-    else
-      plan_ 84
-      do_all_tests ()
-      {
-        do_test default
-        do_test noshared --disable-shared
-        do_test nostatic --disable-static
-      }
-    fi
     displayed_depmode='..*' # At least one character long.
     cfg_deptrack=--enable-dependency-tracking ;;
   disabled)
-    plan_ 28
-    do_all_tests () { do_test; }
     displayed_depmode=none
     cfg_deptrack=--disable-dependency-tracking ;;
   *)
-    plan_ 28
-    do_all_tests () { do_test; }
     displayed_depmode="(cached) $depmode"
     cfg_deptrack="$cachevar=$depmode"
     # Sanity check: ensure the cache variable we force is truly
diff --git a/tests/gen-testsuite-part b/tests/gen-testsuite-part
index 0c334fe..7013209 100755
--- a/tests/gen-testsuite-part
+++ b/tests/gen-testsuite-part
@@ -341,6 +341,7 @@ foreach my $lt (TRUE, FALSE)
   {
     foreach my $m (keys %depmodes)
       {
+        my $planned = ($lt && $m eq "auto") ? 72 : 28;
         my @required =
           (
             @{$depmodes{$m}},
@@ -361,6 +362,7 @@ foreach my $lt (TRUE, FALSE)
               #! /bin/sh
               # Automatically generated test.  DO NOT EDIT BY HAND!
               @vars_init
+              plan_ $planned
               required="@required"
               . ./defs-static || exit '99'
               . "\$testsrcdir/depcomp.sh"; exit "\$?"


hooks/post-receive
-- 
GNU Automake