[Automake-commit] [SCM] GNU Automake branch, java-work, updated. v1.11-458-g60bd0bf

[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=60bd0bf85380e6cabb50ff07cec3366c18f170b2

The branch, java-work has been updated
       via  60bd0bf85380e6cabb50ff07cec3366c18f170b2 (commit)
       via  236ad0bcb351a6e0795a69f272646bd2201b4056 (commit)
       via  bbddd445708efd8e7a484645f7ebf9b2a3a76102 (commit)
      from  036767871101be12266ca04f9efe1957727744de (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 60bd0bf85380e6cabb50ff07cec3366c18f170b2
Merge: 0367678 236ad0b
Author: Stefano Lattarini <address@hidden>
Date:   Thu Aug 25 21:20:57 2011 +0200

    Merge branch 'maint' into java-work
    
    * maint:
      tests: list "forgotten" test script in TESTS
      ylwrap: fix unusual indentation whitespace

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

Summary of changes:
 ChangeLog                       |   13 +++++++++++++
 lib/ylwrap                      |   28 ++++++++++++++--------------
 tests/Makefile.am               |    1 +
 tests/Makefile.in               |    4 ++++
 tests/java-empty-classpath.test |    4 ++--
 5 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d8b1434..2a7f445 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2011-08-25  Stefano Lattarini  <address@hidden>
+
+       tests: list "forgotten" test script in TESTS
+       * tests/Makefile.am (TESTS): Also list ...
+       * tests/java-empty-classpath.test: ... this test.  Since we are
+       at it, remove trailing whitespace from a couple of lines.
+
+2011-08-25  Eric Blake  <address@hidden>
+
+       ylwrap: fix unusual indentation whitespace
+       * lib/ylwrap: Convert tabs to spaces.
+       Reported by Karl Berry.
+
 2011-08-17  Stefano Lattarini  <address@hidden>
 
        * THANKS (Daniel Richard G.): Update e-mail address.
diff --git a/lib/ylwrap b/lib/ylwrap
index 92b2011..9253635 100755
--- a/lib/ylwrap
+++ b/lib/ylwrap
@@ -1,10 +1,10 @@
 #! /bin/sh
 # ylwrap - wrapper for lex/yacc invocations.
 
-scriptversion=2010-02-06.18; # UTC
+scriptversion=2011-08-25.18; # UTC
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005,
-# 2007, 2009, 2010 Free Software Foundation, Inc.
+# 2007, 2009, 2010, 2011 Free Software Foundation, Inc.
 #
 # Written by Tom Tromey <address@hidden>.
 #
@@ -137,19 +137,19 @@ if test $ret -eq 0; then
     # Handle y_tab.c and y_tab.h output by DOS
     if test $y_tab_nodot = "yes"; then
       if test $from = "y.tab.c"; then
-       from="y_tab.c"
+        from="y_tab.c"
       else
-       if test $from = "y.tab.h"; then
-         from="y_tab.h"
-       fi
+        if test $from = "y.tab.h"; then
+          from="y_tab.h"
+        fi
       fi
     fi
     if test -f "$from"; then
       # If $2 is an absolute path name, then just use that,
       # otherwise prepend `../'.
       case "$2" in
-       [\\/]* | ?:[\\/]*) target="$2";;
-       *) target="../$2";;
+        [\\/]* | ?:[\\/]*) target="$2";;
+        *) target="../$2";;
       esac
 
       # We do not want to overwrite a header file if it hasn't
@@ -159,8 +159,8 @@ if test $ret -eq 0; then
       # Makefile.  Divert the output of all other files to a temporary
       # file so we can compare them to existing versions.
       if test $first = no; then
-       realtarget="$target"
-       target="tmp-`echo $target | sed s/.*[\\/]//g`"
+        realtarget="$target"
+        target="tmp-`echo $target | sed s/.*[\\/]//g`"
       fi
       # Edit out `#line' or `#' directives.
       #
@@ -184,10 +184,10 @@ if test $ret -eq 0; then
 
       # Check whether header files must be updated.
       if test $first = no; then
-       if test -f "$realtarget" && cmp -s "$realtarget" "$target"; then
-         echo "$2" is unchanged
-         rm -f "$target"
-       else
+        if test -f "$realtarget" && cmp -s "$realtarget" "$target"; then
+          echo "$2" is unchanged
+          rm -f "$target"
+        else
           echo updating "$2"
           mv -f "$target" "$realtarget"
         fi
diff --git a/tests/Makefile.am b/tests/Makefile.am
index cbd5b65..a93f4f8 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -446,6 +446,7 @@ java2.test \
 java3.test \
 java-check.test \
 java-clean.test \
+java-empty-classpath.test \
 javaprim.test \
 javasubst.test \
 javaflags.test \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 2fc45d1..434644d 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -723,7 +723,11 @@ java.test \
 java2.test \
 java3.test \
 java-check.test \
+<<<<<<< HEAD
 java-clean.test \
+=======
+java-empty-classpath.test \
+>>>>>>> maint
 javaprim.test \
 javasubst.test \
 javaflags.test \
diff --git a/tests/java-empty-classpath.test b/tests/java-empty-classpath.test
index 230bb7c..e94f885 100755
--- a/tests/java-empty-classpath.test
+++ b/tests/java-empty-classpath.test
@@ -37,8 +37,8 @@ cat > Makefile.am <<END
 CLEANFILES = *.class
 SUBDIRS = org
 END
-echo SUBDIRS = gnu > org/Makefile.am 
-echo SUBDIRS = bug > org/gnu/Makefile.am 
+echo SUBDIRS = gnu > org/Makefile.am
+echo SUBDIRS = bug > org/gnu/Makefile.am
 cat > org/gnu/bug/Makefile.am <<'END'
 JAVAROOT = ../../..
 dist_noinst_JAVA = Library.java Application.java


hooks/post-receive
-- 
GNU Automake