diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-01-02 09:40:13 +0100 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-01-03 18:37:01 +0100 |
| commit | f4e221b65d381243553f82e125c615eaaf8ed5de (patch) | |
| tree | 38b69e7b11374300ba468265b7580c3933e703f8 /tests/Makefile.am | |
| parent | 4337813be1c35f0d821283aae2ccb3d67c2ff1df (diff) | |
| download | automake-f4e221b65d381243553f82e125c615eaaf8ed5de.tar.gz | |
progs, libs: implement EXTRA_foo_DEPENDENCIES
Backported from commit `v1.11-377-g6edafbb'.
The feature implemented by that change is quite unobtrusive, so
adding it to a maintenance release is acceptable. Also, there
have been requests from real-world users for this feature since
it has been implemented in master; see automake bug#9320:
<http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9320>
and this short discussion on the automake list:
<http://lists.gnu.org/archive/html/automake/2010-11/msg00099.html>
It would be a pity to make such users wait even more (until
Automake 1.12 is out) before they could start using this feature.
Thus we backport it, so that it will appear in the next maintenance
version of automake (1.11.3).
* automake.in (handle_programs, handle_libraries)
(handle_ltlibraries): Mark EXTRA_*_DEPENDENCIES as recognized.
* doc/automake.texi (Linking, Program and Library Variables)
(LIBOBJS): Document EXTRA_*_DEPENDENCIES.
* lib/am/library.am (%LIBRARY%): Also depend on
$(EXTRA_%XLIBRARY%_DEPENDENCIES).
* lib/am/ltlibrary.am (%LTLIBRARY%): Also depend on
(%XLTLIBRARY%_DEPENDENCIES).
* lib/am/program.am (%PROGRAM%%EXEEXT%): Also depend on
$(EXTRA_%XPROGRAM%_DEPENDENCIES).
* tests/extradep.test, tests/extradep2.test: New tests.
* tests/Makefile.am (TESTS): Update.
* NEWS: Update.
Diffstat (limited to 'tests/Makefile.am')
| -rw-r--r-- | tests/Makefile.am | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 2f1ac0d48..3d2087186 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,7 +1,8 @@ ## Process this file with automake to create Makefile.in # Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +# 2006, 2007, 2008, 2009, 2010, 2011, 2012 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 @@ -386,6 +387,8 @@ extra8.test \ extra10.test \ extra11.test \ extra12.test \ +extradep.test \ +extradep2.test \ f90only.test \ flavor.test \ flibs.test \ @@ -942,6 +945,7 @@ $(parallel_tests) depcomp4.log: libtool-macros.log depcomp7.log: libtool-macros.log depcomp8b.log: libtool-macros.log +extradep2.log: libtool-macros.log fort5.log: libtool-macros.log instdir-ltlib.log: libtool-macros.log instfail-libtool.log: libtool-macros.log |