[Automake-commit] [SCM] GNU Automake branch, master, updated. Release-1-10-290-g12856eb

[Ralf Wildenhues]

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=12856eb28cc576237b9c6b123af912e76abfc1aa

The branch, master has been updated
       via  12856eb28cc576237b9c6b123af912e76abfc1aa (commit)
      from  610e9c060d988fd0c7493f0a9bb2f2bc212a0c6c (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 12856eb28cc576237b9c6b123af912e76abfc1aa
Author: Ralf Wildenhues <address@hidden>
Date:   Mon Apr 13 13:29:25 2009 +0200

    bin_PROGRAMS = $(EXTRA_PROGRAMS) should work.
    
    * automake.in (am_install_var): For `PROGRAMS' primary, strip
    `$(EXEEXT)' here already, so the name uniquifying works even
    when we look at names repeatedly, with inconsistent executable
    extension; through variable references, we might have added
    the extension ourselves earlier.
    (handle_programs): No need to strip `$(EXEEXT)' here any more.
    * tests/extra8.test: New test.
    * tests/Makefile.am: Update.
    * THANKS: Update.
    Report by Daniel Richard G.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

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

Summary of changes:
 ChangeLog                          |   14 ++++++++++++++
 THANKS                             |    1 +
 automake.in                        |   13 ++++++++-----
 tests/Makefile.am                  |    1 +
 tests/Makefile.in                  |    1 +
 tests/{cond41.test => extra8.test} |   21 +++++++++++++++------
 6 files changed, 40 insertions(+), 11 deletions(-)
 copy tests/{cond41.test => extra8.test} (67%)

diff --git a/ChangeLog b/ChangeLog
index 3114999..fc419d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2009-04-13  Ralf Wildenhues  <address@hidden>
+
+       bin_PROGRAMS = $(EXTRA_PROGRAMS) should work.
+       * automake.in (am_install_var): For `PROGRAMS' primary, strip
+       `$(EXEEXT)' here already, so the name uniquifying works even
+       when we look at names repeatedly, with inconsistent executable
+       extension; through variable references, we might have added
+       the extension ourselves earlier.
+       (handle_programs): No need to strip `$(EXEEXT)' here any more.
+       * tests/extra8.test: New test.
+       * tests/Makefile.am: Update.
+       * THANKS: Update.
+       Report by Daniel Richard G.
+
 2009-04-10  Jim Meyering  <address@hidden>
 
        Fix grammar in comments and documentation.
diff --git a/THANKS b/THANKS
index 9f91c9c..c041fbb 100644
--- a/THANKS
+++ b/THANKS
@@ -62,6 +62,7 @@ Dalibor Topic         address@hidden
 danbp                  address@hidden
 Daniel Jacobowitz      address@hidden
 Daniel Kahn Gillmor    address@hidden
+Daniel Richard G.      address@hidden
 Dave Brolley           address@hidden
 Dave Morrison          address@hidden
 David A. Swierczek     address@hidden
diff --git a/automake.in b/automake.in
index cdbe24a..3549bdb 100755
--- a/automake.in
+++ b/automake.in
@@ -2471,11 +2471,6 @@ sub handle_programs
       my $seen_libobjs = 0;
       my $obj = get_object_extension '.$(OBJEXT)';
 
-      # Strip any $(EXEEXT) suffix the user might have added, or this
-      # will confuse &handle_source_transform and &check_canonical_spelling.
-      # We'll add $(EXEEXT) back later anyway.
-      $one_file =~ s/\$\(EXEEXT\)$//;
-
       $known_programs{$one_file} = $where;
 
       # Canonicalize names and check for misspellings.
@@ -7144,6 +7139,14 @@ sub am_install_var
            }
          else
            {
+             # Strip any $(EXEEXT) suffix the user might have added, or this
+             # will confuse &handle_source_transform and 
&check_canonical_spelling.
+             # We'll add $(EXEEXT) back later anyway.
+             # Do it here rather than in handle_programs so the uniquifying at 
the
+             # end of this function works.
+             ${$locvals}[1] =~ s/\$\(EXEEXT\)$//
+               if $primary eq 'PROGRAMS';
+
              push (@result, $locvals);
            }
        }
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 027e3f5..9af8512 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -263,6 +263,7 @@ extra4.test \
 extra5.test \
 extra6.test \
 extra7.test \
+extra8.test \
 f90only.test \
 flibs.test \
 fn99.test \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 138e043..40fcf15 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -418,6 +418,7 @@ extra4.test \
 extra5.test \
 extra6.test \
 extra7.test \
+extra8.test \
 f90only.test \
 flibs.test \
 fn99.test \
diff --git a/tests/cond41.test b/tests/extra8.test
similarity index 67%
copy from tests/cond41.test
copy to tests/extra8.test
index 16da943..02272d4 100755
--- a/tests/cond41.test
+++ b/tests/extra8.test
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (C) 2008  Free Software Foundation, Inc.
+# Copyright (C) 2009  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -18,16 +18,25 @@
 # the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 # Boston, MA 02110-1301, USA.
 
-# AM_COND_IF with an undefined condition should fail.
+# Ensure defining bin_PROGRAMS in terms of EXTRA_PROGRAMS works,
+# and that referring to the same program with inconsistent addition
+# of $(EXEEXT) works, too.
+
+. ./defs || Exit 1
 
-. ./defs
 set -e
 
 cat >>configure.in <<'END'
-AM_COND_IF([COND],
-          [AC_CONFIG_FILES([file1])])
+AC_PROG_CC
 AC_OUTPUT
 END
+cat >Makefile.am <<'END'
+EXTRA_PROGRAMS = foo bar
+bin_PROGRAMS = $(EXTRA_PROGRAMS) baz
+noinst_PROGRAMS = baz$(EXEEXT)
+END
+
+$ACLOCAL
+$AUTOMAKE
 
-$ACLOCAL && Exit 1
 :


hooks/post-receive
--
GNU Automake