[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.11-328-ge87c030

[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=e87c030d838a0c649239c9d2a632c1b2415852a0

The branch, maint has been updated
       via  e87c030d838a0c649239c9d2a632c1b2415852a0 (commit)
       via  0a6a45503a44d149da77e1b3b35aa16592c1a258 (commit)
       via  e72a1b007f3ae165ded1af8a00dce83448c2ff2c (commit)
      from  8d3571b9dddfcab822f7b62832070b2214a11ac9 (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 e87c030d838a0c649239c9d2a632c1b2415852a0
Author: Ralf Wildenhues <address@hidden>
Date:   Sat Apr 2 11:09:10 2011 +0200

    Create subdirs for generated sources even when not dep tracking.
    
    * automake.in (handle_single_transform): If $object is derived
    and lands in subdir, be sure to output a dirstamp dependency.
    * tests/yacc5.test: Avoid falsely matching the dirstamp
    dependency when grepping for a rule.
    * tests/lex-subobj-nodep.test: New test.
    * tests/Makefile.am (TESTS): Update.
    * THANKS: Update.
    Report by Ignacy Gawedzki.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

commit 0a6a45503a44d149da77e1b3b35aa16592c1a258
Merge: 8d3571b e72a1b0
Author: Ralf Wildenhues <address@hidden>
Date:   Sat Apr 2 11:07:34 2011 +0200

    Merge branch 'fix-check-exported-srcdir.test' into maint
    
    * fix-check-exported-srcdir.test:
      Fix locale issue in check-exported-srcdir.test.

commit e72a1b007f3ae165ded1af8a00dce83448c2ff2c
Author: Ralf Wildenhues <address@hidden>
Date:   Sat Apr 2 11:07:04 2011 +0200

    Fix locale issue in check-exported-srcdir.test.
    
    * tests/check-exported-srcdir.test: Reformulate glob to not fail
    in a locale that ignores or interleaves character case.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

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

Summary of changes:
 ChangeLog                                          |   16 +++++
 THANKS                                             |    1 +
 automake.in                                        |    9 +++
 tests/Makefile.am                                  |    1 +
 tests/Makefile.in                                  |    1 +
 tests/check-exported-srcdir.test                   |    6 +-
 .../{target-cflags.test => lex-subobj-nodep.test}  |   67 ++++++++++----------
 tests/yacc5.test                                   |   11 ++-
 8 files changed, 71 insertions(+), 41 deletions(-)
 copy tests/{target-cflags.test => lex-subobj-nodep.test} (55%)

diff --git a/ChangeLog b/ChangeLog
index 1bf953a..c3ce897 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2011-04-02  Ralf Wildenhues  <address@hidden>
+
+       Create subdirs for generated sources even when not dep tracking.
+       * automake.in (handle_single_transform): If $object is derived
+       and lands in subdir, be sure to output a dirstamp dependency.
+       * tests/yacc5.test: Avoid falsely matching the dirstamp
+       dependency when grepping for a rule.
+       * tests/lex-subobj-nodep.test: New test.
+       * tests/Makefile.am (TESTS): Update.
+       * THANKS: Update.
+       Report by Ignacy Gawedzki.
+
+       Fix locale issue in check-exported-srcdir.test.
+       * tests/check-exported-srcdir.test: Reformulate glob to not fail
+       in a locale that ignores or interleaves character case.
+
 2011-04-01  Stefano Lattarini  <address@hidden>
 
        docs: better visibility for aclocal in the index
diff --git a/THANKS b/THANKS
index 720cddd..040da98 100644
--- a/THANKS
+++ b/THANKS
@@ -131,6 +131,7 @@ Harlan Stenn                address@hidden
 He Li                  address@hidden
 Henrik Frystyk Nielsen address@hidden
 Ian Lance Taylor       address@hidden
+Ignacy Gawedzki                address@hidden
 Илья Н. Голубев            address@hidden
 Imacat                 address@hidden
 Inoue                  address@hidden
diff --git a/automake.in b/automake.in
index d56fbf7..d74730d 100755
--- a/automake.in
+++ b/automake.in
@@ -2053,6 +2053,15 @@ sub handle_single_transform ($$$$$%)
            # derived from is not.
            &push_dist_common ($object)
              unless ($topparent =~ /^(?:nobase_)?nodist_/);
+
+           # If resulting derived source is in a subdir, we need to make
+           # sure the subdir exists at build time.
+           if ($object =~ /\//)
+             {
+               my $dirstamp = require_build_directory_maybe ($object);
+               depend ($object, $dirstamp)
+                 if ($dirstamp);
+             }
            next;
          }
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index bfa8edf..35cbbd0 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -428,6 +428,7 @@ lex2.test \
 lex3.test \
 lex4.test \
 lex5.test \
+lex-subobj-nodep.test \
 lflags.test \
 lflags2.test \
 libexec.test \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index ed89d07..c0bbfff 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -698,6 +698,7 @@ lex2.test \
 lex3.test \
 lex4.test \
 lex5.test \
+lex-subobj-nodep.test \
 lflags.test \
 lflags2.test \
 libexec.test \
diff --git a/tests/check-exported-srcdir.test b/tests/check-exported-srcdir.test
index dc02b22..5cec7fc 100755
--- a/tests/check-exported-srcdir.test
+++ b/tests/check-exported-srcdir.test
@@ -32,9 +32,9 @@ show_info ()
   fi
 }
 
-mkdir SrcDir BuildDir
-
-mv [a-z]* SrcDir
+mkdir SrcDir
+mv [!S]* SrcDir
+mkdir BuildDir
 cd SrcDir
 
 cat >> configure.in << 'END'
diff --git a/tests/target-cflags.test b/tests/lex-subobj-nodep.test
similarity index 55%
copy from tests/target-cflags.test
copy to tests/lex-subobj-nodep.test
index b324568..4449715 100755
--- a/tests/target-cflags.test
+++ b/tests/lex-subobj-nodep.test
@@ -1,6 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2000, 2001, 2002, 2004, 2010 Free Software Foundation,
-# Inc.
+# Copyright (C) 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
@@ -15,60 +14,60 @@
 # 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 target specific CFLAGS work
-# Assar Westerlund <address@hidden>
+# Ensure subdirs for subdir scanners are generated when subdir-objects
+# are used, even when dependency tracking is disabled.
 
-required=gcc
+required=flex
 . ./defs || Exit 1
 
-cat > configure.in << 'END'
-AC_INIT(foo.c)
-AM_INIT_AUTOMAKE(target-cflags,0.0)
+set -e
+
+cat >>configure.in <<\END
 AC_PROG_CC
 AM_PROG_CC_C_O
-AC_OUTPUT(Makefile)
+AC_PROG_LEX
+AC_OUTPUT
 END
 
-cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = no-dependencies
-
-bin_PROGRAMS = foo bar
-foo_CFLAGS   = -DFOO
+cat >Makefile.am <<\END
+AUTOMAKE_OPTIONS = subdir-objects
+bin_PROGRAMS = p1 p2
+p1_SOURCES = sub1/s1.l
+p2_SOURCES = sub2/s2.l
+p2_CPPFLAGS = -DWHATEVER
 END
 
-cat > foo.c << 'END'
-#include <stdio.h>
-#ifdef FOO
-int main(void) {
+mkdir sub1 sub2
+
+cat >sub1/s1.l <<\END
+%%
+"END"   return EOF;
+.
+%%
+int main (void)
+{
+  while (yylex () != EOF)
+    ;
   return 0;
 }
-#endif
-END
 
-cat > bar.c << 'END'
-#ifndef FOO
-int main(void)
+int yywrap(void)
 {
   return 0;
 }
-#endif
 END
 
-set -e
+cp sub1/s1.l sub2/s2.l
 
 $ACLOCAL
 $AUTOCONF
 $AUTOMAKE -a
 mkdir build
-
 cd build
-../configure
+../configure --disable-dependency-tracking
+$MAKE sub1/s1.c
+$MAKE sub2/s2.c
+rm -rf sub1 sub2
 $MAKE
-./foo
-./bar
-cd ..
 
-./configure
-$MAKE
-./foo
-./bar
+:
diff --git a/tests/yacc5.test b/tests/yacc5.test
index 8b00ed8..f428396 100755
--- a/tests/yacc5.test
+++ b/tests/yacc5.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2001, 2002, 2003  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 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
@@ -42,7 +42,7 @@ mkdir sub
 $ACLOCAL
 $AUTOMAKE -a
 
-grep '^maude\.c:' Makefile.in
+grep '^maude\.c:.*maude\.y' Makefile.in
 
 
 ## Try again with subdir-objects.
@@ -56,8 +56,9 @@ END
 $ACLOCAL
 $AUTOMAKE -a
 
-# No rule needed, the default .y.c: inference rule is enough.
-grep '^sub/maude\.c:' Makefile.in && Exit 1
+# No rule needed, the default .y.c: inference rule is enough
+# (but there may be an additional dependency on a dirstamp file).
+grep '^sub/maude\.c:.*maude\.y' Makefile.in && Exit 1
 
 
 ## Try again with per-exe flags.
@@ -80,3 +81,5 @@ grep 'maudec' Makefile.in && Exit 1
 
 # Make sure the .o file is required.
 grep '^am_maude_OBJECTS.*maude' Makefile.in
+
+:


hooks/post-receive
-- 
GNU Automake