diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2011-04-02 16:00:23 +0200 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2011-04-02 16:00:23 +0200 |
| commit | d555ae188b43938b7d1742164e9ae774382d4edd (patch) | |
| tree | 116e5d2d935146b574c491bd675d2e98a5013d96 /tests/subdir8.test | |
| parent | fac422c8914f14acae106338ddd6efc0297c49e9 (diff) | |
| parent | d4df619bfa53ef0bd81fbbbe03b3672711defe2f (diff) | |
| download | automake-d555ae188b43938b7d1742164e9ae774382d4edd.tar.gz | |
Merge branch 'maint'
Diffstat (limited to 'tests/subdir8.test')
| -rwxr-xr-x | tests/subdir8.test | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/tests/subdir8.test b/tests/subdir8.test index 01ff66250..98146ba50 100755 --- a/tests/subdir8.test +++ b/tests/subdir8.test @@ -67,12 +67,6 @@ $AUTOMAKE --copy --add-missing $MAKE # Now add new directories. -# -# We shouldn't need to $sleep here: configure ensures that files -# generated by it are newer than configure. Thus, even if -# Makefile.in is newer than configure but the updated Makefile.am -# below has the same timestamp as Makefile.in, the latter should -# be rebuilt due to its dependency on configure.in. # The first step users typically do when adding a new subdir is # editing configure.in. That is already tested by subdir5.test, @@ -93,6 +87,9 @@ mkdir maude # Update confiles.m4 *after* updating sub/Makefile.am; subdir5.test do # it in the other way: it updates configure.in before Makefile.am. +# We sleep here because modified configure dependencies must be newer +# than config.status. +$sleep echo 'AC_CONFIG_FILES([maude/Makefile sub/maude/Makefile])' >> confiles.m4 # We want a simple rebuild from sub/ to create sub/maude/Makefile @@ -100,6 +97,8 @@ echo 'AC_CONFIG_FILES([maude/Makefile sub/maude/Makefile])' >> confiles.m4 cd sub $MAKE cd .. +grep '^SUBDIRS = *maude *$' sub/Makefile.in +grep '^SUBDIRS = *maude *$' sub/Makefile test -f maude/Makefile test -f sub/maude/Makefile @@ -108,9 +107,10 @@ test -f sub/maude/Makefile echo 'AC_DEFUN([MORE_DEFS], [AC_SUBST([GREPME])])' > m4/moredefs.m4 $MAKE -grep '^GREPME =' Makefile -grep '^GREPME =' maude/Makefile -grep '^GREPME =' sub/Makefile -grep '^GREPME =' sub/maude/Makefile +for ext in '.in' ''; do + for d in . maude sub sub/maude; do + grep '^GREPME =' $d/Makefile$ext + done +done : |