[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.12.2-232-g03b7cf9

[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=03b7cf99c697f1b9d601de50b8fcd4698d254d21

The branch, master has been updated
       via  03b7cf99c697f1b9d601de50b8fcd4698d254d21 (commit)
       via  21ec3a527390dc996ae09172b625a576f82ebcba (commit)
       via  3c85b9c95b745b08aea12afe1f0839d30228cbaa (commit)
       via  7f5d43e158048fc660c676e58eff123b8d19d375 (commit)
       via  6fd3e230c4251df977c43365129ead24e275dff5 (commit)
       via  7de7d19e6f8b88d7dc35be519430ac1f27e4ea59 (commit)
       via  c3e7ee629804d4d3b3338afd1cd54cab92903f79 (commit)
      from  2a7c9aeaab41f9bf66a92a68e1fe186b2af89038 (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 03b7cf99c697f1b9d601de50b8fcd4698d254d21
Merge: 2a7c9ae 21ec3a5
Author: Stefano Lattarini <address@hidden>
Date:   Fri Aug 10 12:51:40 2012 +0200

    Merge branch 'maint'
    
    * maint:
      cleanup: remove two almost-unused global variables: {am,in}_file_name
      cleanup: remove almost-unused global var 'topsrcdir'
      automake: remove an unused variable
      tests: make a test script more semantic
      tests: remove an obsolete, no-op test script
      tests: remove an obsolete test script

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

Summary of changes:
 automake.in        |   37 +++++++++----------------------------
 t/info.sh          |   44 --------------------------------------------
 t/list-of-tests.mk |    2 --
 t/noinstdir.sh     |   25 +++++++++++++++++++++++--
 t/scripts.sh       |   27 ---------------------------
 5 files changed, 32 insertions(+), 103 deletions(-)
 delete mode 100755 t/info.sh
 delete mode 100755 t/scripts.sh

diff --git a/automake.in b/automake.in
index 91133bd..faa2d29 100644
--- a/automake.in
+++ b/automake.in
@@ -373,8 +373,6 @@ my $libtool_new_api = 0;
 
 # Most important AC_CANONICAL_* macro seen so far.
 my $seen_canonical = 0;
-# Location of that macro.
-my $canonical_location;
 
 # Where AM_MAINTAINER_MODE appears.
 my $seen_maint_mode;
@@ -484,16 +482,10 @@ my $am_file = 'BUG';
 ## ------------------------------------------ ##
 
 # Basename and relative dir of the input file.
-my $am_file_name;
 my $am_relative_dir;
-
 # Same but wrt Makefile.in.
-my $in_file_name;
 my $relative_dir;
 
-# Relative path to the top directory.
-my $topsrcdir;
-
 # Greatest timestamp of the output's dependencies (excluding
 # configure's dependencies).
 my $output_deps_greatest_timestamp;
@@ -642,12 +634,8 @@ sub initialize_per_input ()
 {
     reset_local_duplicates ();
 
-    $am_file_name = undef;
     $am_relative_dir = undef;
-
-    $in_file_name = undef;
     $relative_dir = undef;
-    $topsrcdir = undef;
 
     $output_deps_greatest_timestamp = 0;
 
@@ -2302,8 +2290,10 @@ sub handle_LIBOBJS_or_ALLOCA ($)
          # we are already there, and since the targets are built without
          # a $(top_builddir), it helps BSD Make to match them with
          # dependencies.
-         $dir = "$config_libobj_dir/" if $config_libobj_dir ne '.';
-         $dir = "$topsrcdir/$dir" if $relative_dir ne '.';
+         $dir = "$config_libobj_dir/"
+           if $config_libobj_dir ne '.';
+         $dir = backname ($relative_dir) . "/$dir"
+           if $relative_dir ne '.';
          define_variable ('LIBOBJDIR', "$dir", INTERNAL);
          $clean_files{"\$($var)"} = MOSTLY_CLEAN;
          # If LTLIBOBJS is used, we must also clear LIBOBJS (which might
@@ -5201,7 +5191,6 @@ sub scan_autoconf_traces ($)
          if ($seen_canonical <= AC_CANONICAL_BUILD)
            {
              $seen_canonical = AC_CANONICAL_BUILD;
-             $canonical_location = $where;
            }
        }
       elsif ($macro eq 'AC_CANONICAL_HOST')
@@ -5209,13 +5198,11 @@ sub scan_autoconf_traces ($)
          if ($seen_canonical <= AC_CANONICAL_HOST)
            {
              $seen_canonical = AC_CANONICAL_HOST;
-             $canonical_location = $where;
            }
        }
       elsif ($macro eq 'AC_CANONICAL_TARGET')
        {
          $seen_canonical = AC_CANONICAL_TARGET;
-         $canonical_location = $where;
        }
       elsif ($macro eq 'AC_CONFIG_AUX_DIR')
        {
@@ -6707,9 +6694,9 @@ sub define_standard_variables
 }
 
 # Read main am file.
-sub read_main_am_file
+sub read_main_am_file ($$)
 {
-    my ($amfile) = @_;
+    my ($amfile, $infile) = @_;
 
     # This supports the strange variable tricks we are about to play.
     prog_error ("variable defined before read_main_am_file\n" . variables_dump 
())
@@ -6717,8 +6704,8 @@ sub read_main_am_file
 
     # Generate copyright header for generated Makefile.in.
     # We do discard the output of predefined variables, handled below.
-    $output_vars = ("# $in_file_name generated by automake "
-                  . $VERSION . " from $am_file_name.\n");
+    $output_vars = ("# " . basename ($infile) . " generated by automake "
+                  . $VERSION . " from " . basename ($amfile) . ".\n");
     $output_vars .= '# ' . subst ('configure_input') . "\n";
     $output_vars .= $gen_copyright;
 
@@ -7897,11 +7884,6 @@ sub generate_makefile ($$)
   # we have processed AUTOMAKE_OPTIONS.
   buffer_messages ('warning');
 
-  # Name of input file ("Makefile.am") and output file
-  # ("Makefile.in").  These have no directory components.
-  $am_file_name = basename ($makefile_am);
-  $in_file_name = basename ($makefile_in);
-
   # $OUTPUT is encoded.  If it contains a ":" then the first element
   # is the real output file, and all remaining elements are input
   # files.  We don't scan or otherwise deal with these input files,
@@ -7911,9 +7893,8 @@ sub generate_makefile ($$)
 
   $relative_dir = dirname ($makefile);
   $am_relative_dir = dirname ($makefile_am);
-  $topsrcdir = backname ($relative_dir);
 
-  read_main_am_file ($makefile_am);
+  read_main_am_file ($makefile_am, $makefile_in);
   if (handle_options)
     {
       # Process buffered warnings.
diff --git a/t/info.sh b/t/info.sh
deleted file mode 100755
index e00e9e9..0000000
--- a/t/info.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996-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
-# 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 to make sure info files are distributed correctly.
-# FIXME: This test is probably obsoleted, or wrong.  The generated
-#        Makefile.in seems not to define any 'INFOS' variable!
-
-. ./defs || exit 1
-
-cat > Makefile.am << 'END'
-info_TEXINFOS = foo.texi
-END
-
-echo '@setfilename foo.info' > foo.texi
-: > texinfo.tex
-
-$ACLOCAL
-$AUTOMAKE
-
-for i in $(grep '^INFOS =' Makefile.in | sed -e 's/^INFOS = //'); do
-   echo $i
-   case "$i" in
-    foo*)
-       ;;
-    *)
-       exit 1
-       ;;
-   esac
-done
-
-:
diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk
index 3125cf4..b3b0b0c 100644
--- a/t/list-of-tests.mk
+++ b/t/list-of-tests.mk
@@ -493,7 +493,6 @@ t/help-silent.sh \
 t/help-upc.sh \
 t/hfs.sh \
 t/implicit.sh \
-t/info.sh \
 t/init.sh \
 t/init2.sh \
 t/insh2.sh \
@@ -962,7 +961,6 @@ t/self-check-seq.tap \
 t/self-check-is-blocked-signal.tap \
 t/self-check-unindent.tap \
 t/sanity.sh \
-t/scripts.sh \
 t/seenc.sh \
 t/silent.sh \
 t/silent2.sh \
diff --git a/t/noinstdir.sh b/t/noinstdir.sh
index be07970..24854cf 100755
--- a/t/noinstdir.sh
+++ b/t/noinstdir.sh
@@ -17,6 +17,7 @@
 # Test to make sure that noinst_* and check_* are not installed.
 # From Pavel Roskin.
 
+required=cc
 . ./defs || exit 1
 
 cat > Makefile.am << 'END'
@@ -36,6 +37,7 @@ cat >> configure.ac << 'END'
 AC_PROG_CC
 AM_PROG_AR
 AC_PROG_RANLIB
+AC_OUTPUT
 END
 
 : > ar-lib
@@ -43,7 +45,26 @@ END
 $ACLOCAL
 $AUTOMAKE
 
-grep 'noinstdir' Makefile.in && exit 1
-grep 'checkdir' Makefile.in && exit 1
+$EGREP '(noinst|check)dir' Makefile.in && exit 1
+
+$AUTOCONF
+./configure --prefix="$(pwd)/inst"
+
+echo 'int main (void) { return 0; }' > foo.c
+echo 'int main (void) { return 0; }' > bar.c
+
+echo 'int foo (void) { return 0; }' > libfoo.c
+echo 'int bar (void) { return 0; }' > libbar.c
+
+: > foo.sh
+: > foo.xpm
+: > foo.h
+: > bar.sh
+: > bar.xpm
+: > bar.h
+
+$MAKE
+$MAKE install
+test ! -e inst
 
 :
diff --git a/t/scripts.sh b/t/scripts.sh
deleted file mode 100755
index 996cc9a..0000000
--- a/t/scripts.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996-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
-# 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 for bug reported by Jim Meyering.
-# AC_PROG_INSTALL was required when only noinst_SCRIPTS was defined.
-
-. ./defs || exit 1
-
-cat > Makefile.am << 'END'
-noinst_SCRIPTS = foo
-END
-
-$ACLOCAL
-$AUTOMAKE


hooks/post-receive
-- 
GNU Automake