[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-1732-g5db22a1

[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=5db22a16ba0a6d2ba01fa8360481d80a0c40c964

The branch, master has been updated
       via  5db22a16ba0a6d2ba01fa8360481d80a0c40c964 (commit)
       via  05c02989174d490b842c46cb8f25fb8b601a7c4f (commit)
       via  def0340b7e8ae999eafe4466fc934e7694fe372d (commit)
       via  59367c05bbfd19062c6754f088d16bec33f39b54 (commit)
       via  0188e0f50e4b9802f50ccaa11390a364db7354a6 (commit)
       via  4013982ecfc418f588d6c423c61600d49ad9d3f4 (commit)
      from  a23d5bdc04af351b3fde8243b711601d049249d0 (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 5db22a16ba0a6d2ba01fa8360481d80a0c40c964
Merge: a23d5bd 05c0298
Author: Stefano Lattarini <address@hidden>
Date:   Sun Jan 15 17:40:09 2012 +0100

    Merge branch 'maint'
    
    * maint:
      gnupload: moved to gnulib
      sync: gitlog-to-changelog from gnulib upstream
      test defs: backport optimized 'using_gmake' implementation
      tests: unify some tests on "make -n", reducing duplication
      vala: use "$(am__cd) $(srcdir)", not "cd $(srcdir)"
    
    + Extra edits:
    
    * tests/maken3.test: Carry over (with necessary adjustments) the
    code from maken4.test that determines whether $MAKE supports the
    special '.MAKE' target.

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

Summary of changes:
 Makefile.am             |    2 +
 NEWS                    |    3 +
 automake.in             |    2 +-
 lib/gitlog-to-changelog |    6 +-
 lib/gnupload            |   10 ++--
 tests/list-of-tests.mk  |    2 -
 tests/maken.test        |    9 ++-
 tests/maken2.test       |   62 ----------------
 tests/maken3.test       |   36 ++++++++--
 tests/maken4.test       |  184 -----------------------------------------------
 10 files changed, 51 insertions(+), 265 deletions(-)
 delete mode 100755 tests/maken2.test
 delete mode 100755 tests/maken4.test

diff --git a/Makefile.am b/Makefile.am
index 208ea2d..03470675 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -918,6 +918,7 @@ INSTALL \
 config-ml.in \
 config.guess \
 config.sub \
+gnupload \
 gitlog-to-changelog \
 symlink-tree \
 texinfo.tex
@@ -932,6 +933,7 @@ fetch:
        $(WGET_SV_GIT_CF)config.sub -O config.sub && \
        $(WGET_SV_CVS)texinfo/texinfo/doc/texinfo.tex -O texinfo.tex && \
        $(WGET_SV_GIT_GL)doc/INSTALL -O INSTALL && \
+       $(WGET_SV_GIT_GL)build-aux/gnupload -O gnupload && \
        $(WGET_SV_GIT_GL)build-aux/gitlog-to-changelog -O gitlog-to-changelog 
&& \
        $(WGET_GCC)config-ml.in -O config-ml.in && \
        $(WGET_GCC)symlink-tree -O symlink-tree)
diff --git a/NEWS b/NEWS
index a686d05..f193988 100644
--- a/NEWS
+++ b/NEWS
@@ -177,6 +177,9 @@ New in 1.11.2a:
 
 * Miscellaneous changes:
 
+  - The master copy of the `gnupload' script is now maintained in gnulib,
+    not in automake.
+
   - The `missing' script don't try to wrap calls to `tar' anymore.
 
   - "make dist" doesn't wrap `tar' invocations with the `missing' script
diff --git a/automake.in b/automake.in
index 7f2750c..086e217 100644
--- a/automake.in
+++ b/automake.in
@@ -5901,7 +5901,7 @@ sub lang_vala_finish_target ($$)
 
   $output_rules .=
     "\$(srcdir)/${derived}_vala.stamp: \$(${derived}_SOURCES)\n".
-    "\t${verbose}cd \$(srcdir) && ${compile} \$(${derived}_SOURCES)\n".
+    "\t${verbose}\$(am__cd) \$(srcdir) && ${compile} \$(${derived}_SOURCES)\n".
     "\t${silent}touch address@hidden";
 
   push_dist_common ("${derived}_vala.stamp");
diff --git a/lib/gitlog-to-changelog b/lib/gitlog-to-changelog
index 9d5327a..0efedb0 100755
--- a/lib/gitlog-to-changelog
+++ b/lib/gitlog-to-changelog
@@ -3,7 +3,7 @@ eval '(exit $?0)' && eval 'exec perl -wS "$0" ${1+"$@"}'
     if 0;
 # Convert git log output to ChangeLog format.
 
-my $VERSION = '2012-01-02 14:48'; # UTC
+my $VERSION = '2012-01-06 07:14'; # UTC
 # The definition above must lie within the first 8 lines in order
 # for the Emacs time-stamp write hook (at end) to update it.
 # If you change this file with Emacs, please let the write hook
@@ -47,7 +47,7 @@ sub usage ($)
   my $STREAM = ($exit_code == 0 ? *STDOUT : *STDERR);
   if ($exit_code != 0)
     {
-      print $STREAM "Try `$ME --help' for more information.\n";
+      print $STREAM "Try '$ME --help' for more information.\n";
     }
   else
     {
@@ -211,7 +211,7 @@ sub parse_amend_file($)
   my @cmd = (qw (git log --log-size),
              '--pretty=format:%H:%ct  %an  <%ae>%n%n'.$format_string, @ARGV);
   open PIPE, '-|', @cmd
-    or die ("$ME: failed to run `". quoted_cmd (@cmd) ."': $!\n"
+    or die ("$ME: failed to run '". quoted_cmd (@cmd) ."': $!\n"
             . "(Is your Git too old?  Version 1.5.1 or later is required.)\n");
 
   my $prev_multi_paragraph;
diff --git a/lib/gnupload b/lib/gnupload
index 209f875..51e17c6 100755
--- a/lib/gnupload
+++ b/lib/gnupload
@@ -1,10 +1,9 @@
 #!/bin/sh
 # Sign files and upload them.
 
-scriptversion=2010-05-23.15; # UTC
+scriptversion=2012-01-15.15; # UTC
 
-# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 2004-2010, 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
@@ -20,6 +19,8 @@ scriptversion=2010-05-23.15; # UTC
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Originally written by Alexandre Duret-Lutz <address@hidden>.
+# The master copy of this file is maintained in the gnulib Git repository.
+# Please send bug reports and feature requests to address@hidden
 
 set -e
 
@@ -105,8 +106,7 @@ happen to have an ncftp package installed, the ncftpput-ftp 
script in
 the build-aux/ directory of the gnulib package
 (http://savannah.gnu.org/projects/gnulib) may serve as a replacement.
 
-Report bugs to <address@hidden>.
-Send patches to <address@hidden>."
+Send patches and bug reports to <address@hidden>."
 
 # Read local configuration file
 if test -r "$conffile"; then
diff --git a/tests/list-of-tests.mk b/tests/list-of-tests.mk
index 4d57232..f1c6615 100644
--- a/tests/list-of-tests.mk
+++ b/tests/list-of-tests.mk
@@ -594,9 +594,7 @@ make.test \
 makej.test \
 makej2.test \
 maken.test \
-maken2.test \
 maken3.test \
-maken4.test \
 makevars.test \
 makefile-deps.test \
 man.test \
diff --git a/tests/maken.test b/tests/maken.test
index aa6d598..01b4448 100755
--- a/tests/maken.test
+++ b/tests/maken.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2009, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2009, 2011, 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
@@ -16,8 +16,8 @@
 
 # Ensure that `make -n dist' and `make -n distcheck' do not change files
 # on disk, due to GNU make executing rules containing `$(MAKE)'.
-
-# Please keep this test in sync with sister test maken2.test.
+# Also, ensure that `make -n dist' and `make -n distcheck' show what
+# would happen, at least when using GNU make.
 
 . ./defs || Exit 1
 
@@ -52,6 +52,9 @@ echo stamp > stampfile
 $sleep
 for target in dist distcheck; do
   $MAKE -n $target
+  if using_gmake; then
+    $MAKE -n $target | grep stamp-sub-dist-hook || Exit 1
+  fi
   $MAKE test-no-distdir
   test `ls -1t | sed 1q` = stampfile
 done
diff --git a/tests/maken2.test b/tests/maken2.test
deleted file mode 100755
index a6625e2..0000000
--- a/tests/maken2.test
+++ /dev/null
@@ -1,62 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2009, 2011 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
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Ensure that `make -n dist' and `make -n distcheck' show what would
-# happen.  This currently works for GNU make, but might fail with other
-# make implementations (e.g., FreeBSD's or NetBSD's).
-
-# Please keep this test in sync with sister test maken.test.
-
-required=GNUmake
-. ./defs || Exit 1
-
-mkdir sub
-
-cat >> configure.in << 'END'
-AC_CONFIG_FILES([sub/Makefile])
-AC_OUTPUT
-END
-
-cat > Makefile.am <<'END'
-SUBDIRS = sub
-distcheck-hook:
-       @: > stamp-distcheck-hook
-test-no-distdir:
-       test ! -d $(distdir)
-       test ! -f stamp-distcheck-hook
-       test ! -f sub/stamp-sub-dist-hook
-END
-cat >sub/Makefile.am <<'END'
-dist-hook:
-       @: > stamp-sub-dist-hook
-END
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-./configure
-
-$sleep
-echo stamp > stampfile
-$sleep
-for target in dist distcheck; do
-  $MAKE -n $target
-  $MAKE test-no-distdir
-  $MAKE -n $target | grep stamp-sub-dist-hook
-  test `ls -1t | sed 1q` = stampfile
-done
-
-Exit 0
diff --git a/tests/maken3.test b/tests/maken3.test
index eb54d35..d9b9c21 100755
--- a/tests/maken3.test
+++ b/tests/maken3.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2009, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2009, 2011, 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,16 +14,33 @@
 # 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 `make -n' for various targets, to ensure that no files or
-# directories are created.
+# Test `make -n' for various targets, to ensure that:
+#
+#  1. no files or directories are created or removed, and
+#
+#  2. if using GNU make or a make implementation supporting the .MAKE
+#     special target, the output from make is sufficiently complete.
 #
 # This test exercises the GCS-mandated targets (except for dist)
 # as well as tags, TAGS.
 
-# Please keep this test in sync with sister test maken4.test.
-
 . ./defs || Exit 1
 
+# Does $MAKE support the '.MAKE' special target?
+have_dotmake=false
+if using_gmake; then
+  have_dotmake=: # GNU make must support it.
+else
+  unindent > mk.tmp << 'END'
+    targ.tmp:
+       : > $@
+    .MAKE: targ.tmp
+END
+  if $MAKE -n -f mk.tmp targ.tmp && test -f targ.tmp; then
+    have_dotmake=:
+  fi
+fi
+
 mkdir sub sub2
 
 cat >> configure.in << 'END'
@@ -131,18 +148,27 @@ check_targets ()
     case $target in
     install-* | installdirs | tags | TAGS ) ;;
     *)
+      if $have_dotmake; then
+        grep "stamp-$target$" stdout || Exit 1
+      fi
       test ! -f "stamp-$target$" || Exit 1
       ;;
     esac
     case $target in
     install-* | installdirs ) ;;
     *)
+      if $have_dotmake; then
+        grep "stamp-$target-sub" stdout || Exit 1
+      fi
       test ! -f "sub/stamp-$target-sub" || Exit 1
       ;;
     esac
     case $target in
     distclean | maintainer-clean ) ;;
     *)
+      if $have_dotmake; then
+        grep "should-not-be-executed" stdout || Exit 1
+      fi
       test ! -f "sub2/sub2-$target-should-not-be-executed" || Exit 1
       ;;
     esac
diff --git a/tests/maken4.test b/tests/maken4.test
deleted file mode 100755
index bdecb84..0000000
--- a/tests/maken4.test
+++ /dev/null
@@ -1,184 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2009, 2011 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
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# 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 `make -n' for various targets, to ensure that stdout output is
-# sufficiently complete.  This currently only works for GNU make and
-# BSD make implementations that support the `.MAKE' special target.
-#
-# This test exercises the GCS-mandated targets (except for dist)
-# as well as tags, TAGS.
-
-# Please keep this test in sync with sister test maken3.test.
-
-. ./defs || Exit 1
-
-if using_gmake; then
-  : Good, make is GNU make.
-else
-  unindent > mk.tmp << 'END'
-    targ.tmp:
-       : > $@
-    .MAKE: targ.tmp
-END
-  if $MAKE -n -f mk.tmp targ.tmp && test -f targ.tmp; then
-    : Good, make supports the '.MAKE' special target.
-  else
-    skip_ "GNU or BSD make required"
-  fi
-  rm -f *.tmp
-fi
-
-mkdir sub sub2
-
-cat >> configure.in << 'END'
-AC_CONFIG_FILES([sub/Makefile sub2/Makefile])
-AC_OUTPUT
-END
-
-cat > Makefile.am <<'END'
-TESTS = foo.test
-SUBDIRS = sub sub2
-##BUILT_SOURCES = foo
-foo:
-foo.test:
-all-local:
-       @: > stamp-all
-install-data-local:
-       @: > stamp-install
-uninstall-local:
-       @: > stamp-uninstall
-clean-local:
-       @: > stamp-clean
-distclean-local:
-       @: > stamp-distclean
-info-local:
-       @: > stamp-info
-html-local:
-       @: > stamp-html
-dvi-local:
-       @: > stamp-dvi
-ps-local:
-       @: > stamp-ps
-pdf-local:
-       @: > stamp-pdf
-check-local:
-       @: > stamp-check
-installcheck-local:
-       @: > stamp-installcheck
-mostlyclean-local:
-       @: > stamp-mostlyclean
-maintainer-clean-local:
-       @: > stamp-maintainer-clean
-END
-cat >sub/Makefile.am <<'END'
-all-local:
-       @: > stamp-all-sub
-install-data-local:
-       @: > stamp-install-sub
-uninstall-local:
-       @: > stamp-uninstall-sub
-clean-local:
-       @: > stamp-clean-sub
-distclean-local:
-       @: > stamp-distclean-sub
-info-local:
-       @: > stamp-info-sub
-html-local:
-       @: > stamp-html-sub
-dvi-local:
-       @: > stamp-dvi-sub
-ps-local:
-       @: > stamp-ps-sub
-pdf-local:
-       @: > stamp-pdf-sub
-check-local:
-       @: > stamp-check-sub
-installcheck-local:
-       @: > stamp-installcheck-sub
-tags:
-       @: > stamp-tags-sub
-TAGS:
-       @: > stamp-TAGS-sub
-mostlyclean-local:
-       @: > stamp-mostlyclean-sub
-maintainer-clean-local:
-       @: > stamp-maintainer-clean-sub
-END
-cat >sub2/Makefile.am <<'END'
-all install uninstall clean check:
-       @: > address@hidden
-info dvi pdf ps:
-       @: > address@hidden
-html:
-       @: > address@hidden
-install-info install-html install-dvi install-pdf install-ps:
-       @: > address@hidden
-installcheck installdirs tags TAGS mostlyclean:
-       @: > address@hidden
-## These targets cannot be overridden like this:
-## install-strip distclean maintainer-clean
-END
-
-$ACLOCAL
-$AUTOCONF
-
-check_targets ()
-{
-  for target in \
-    all install install-strip uninstall clean distclean check \
-    info html dvi pdf ps \
-    install-info install-html install-dvi install-pdf install-ps \
-    installcheck installdirs tags TAGS mostlyclean maintainer-clean
-  do
-    $MAKE -n $target >stdout || { cat stdout; Exit 1; }
-    cat stdout
-    case $target in
-    install-* | installdirs | tags | TAGS ) ;;
-    *)
-      grep "stamp-$target$" stdout || Exit 1
-      test ! -f "stamp-$target$" || Exit 1
-      ;;
-    esac
-    case $target in
-    install-* | installdirs ) ;;
-    *)
-      grep "stamp-$target-sub" stdout || Exit 1
-      test ! -f "sub/stamp-$target-sub" || Exit 1
-      ;;
-    esac
-    case $target in
-    distclean | maintainer-clean ) ;;
-    *)
-      grep "should-not-be-executed" stdout || Exit 1
-      test ! -f "sub2/sub2-$target-should-not-be-executed" || Exit 1
-      ;;
-    esac
-  done
-}
-
-$AUTOMAKE -a -Wno-override
-./configure
-check_targets || Exit 1
-
-# Now, introduce BUILT_SOURCES into the toplevel Makefile
-# TODO: add BUILT_SOURCES to sub2, fix fallout.
-sed 's/##//' < Makefile.am > t
-mv -f t Makefile.am
-$AUTOMAKE -Wno-override --force Makefile
-./configure
-check_targets || Exit 1
-
-Exit 0


hooks/post-receive
-- 
GNU Automake