diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2013-05-18 20:28:20 +0200 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2013-05-18 20:28:20 +0200 |
| commit | 42eaadf9b117768814796728c8bef23009d9a52a (patch) | |
| tree | 7cff713d3e41beb3c9967d59031426761d73a906 /t/fort5.sh | |
| parent | 5fe99e28ae324fe1fd211cf289c0f9f75977f07e (diff) | |
| parent | ca41efd3e14a9523e4e0cc1d9689eb30b6b7045a (diff) | |
| download | automake-42eaadf9b117768814796728c8bef23009d9a52a.tar.gz | |
Merge branch 'subdir-objects-work'
* subdir-objects-work:
depend: reduce code duplication, de-uglify make verbose output
depend: prefer $(...) over `...` in Cygwin-specific recipes
depend: reduce code duplication
depend: a preparatory refactoring
depend: refactor and remove code duplication
Automake::Language: drop unused fields 'compile_flag' and 'output_flag'
depend: assume '-c' compiler flag always means to produce object files
depend: assume we can always pass '-o' to the C compiler
cleanup: having subdir-objects mandatory allow us some simplifications
subdir-objects: enable unconditionally
Diffstat (limited to 't/fort5.sh')
| -rw-r--r-- | t/fort5.sh | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/t/fort5.sh b/t/fort5.sh index 7b9991b96..d090f6ffd 100644 --- a/t/fort5.sh +++ b/t/fort5.sh @@ -90,20 +90,17 @@ grep " --tag=FC" Makefile.in # ./configure may exit with status 77 if no compiler is found, # or if the compiler cannot compile Fortran 90 files). ./configure -$MAKE -subobjs=$(echo sub/*.lo) -test "$subobjs" = 'sub/*.lo' -$MAKE distcheck -# The following will be fixed in a later patch: -$MAKE distclean -echo 'AUTOMAKE_OPTIONS = subdir-objects' >> Makefile.am -$AUTOMAKE -a -./configure $MAKE +test -f sub/bar.lo test ! -e bar.lo +## The setting of FCFLAGS should only cause objects deriving from +## Fortran 90, not Fortran 77, to be renamed. +test -f sub/baz.lo test ! -e baz.lo +test ! -e sub/libgoodbye_la-baz.lo test ! -e libgoodbye_la-baz.lo + $MAKE distcheck : |