Hash :
f4e221b6
Author :
Date :
2012-01-02T09:40:13
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.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108
#! /bin/sh
# Copyright (C) 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
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# 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 EXTRA_*_DEPENDENCIES. See extradep2 for libtool variant.
required=cc
. ./defs || Exit 1
set -e
cat >> configure.in << 'END'
AC_PROG_CC
AC_PROG_RANLIB
AC_SUBST([deps], [bardep])
AM_CONDITIONAL([COND], [test -n "$cond"])
AC_OUTPUT
END
cat > Makefile.am << 'END'
noinst_LIBRARIES = libfoo.a
EXTRA_libfoo_a_DEPENDENCIES = libfoodep
libfoodep:
@echo making $@
@: > $@
CLEANFILES = libfoodep
bin_PROGRAMS = foo bar
EXTRA_foo_DEPENDENCIES = foodep
if COND
EXTRA_foo_DEPENDENCIES += foodep2
endif
bar_LDADD = libfoo.a
EXTRA_bar_DEPENDENCIES = $(deps)
EXTRA_DIST = foodep bardep
.PHONY: bar-has-been-updated
bar-has-been-updated:
stat older bar$(EXEEXT) libfoo.a || : For debugging.
test `ls -t bar$(EXEEXT) older | sed q` = bar$(EXEEXT)
END
cat >libfoo.c <<'END'
int libfoo () { return 0; }
END
cat >foo.c <<'END'
int main () { return 0; }
END
cat >bar.c <<'END'
extern int libfoo ();
int main () { return libfoo (); }
END
$ACLOCAL
$AUTOMAKE --add-missing
$AUTOCONF
./configure cond=yes
# Hypotheses:
# - EXTRA_*_DEPENDENCIES are honored.
# - Conditionals and substitutions are honored.
# - *_DEPENDENCIES are not overwritten by their EXTRA_* counterparts.
: >foodep
: >foodep2
: >bardep
$MAKE >stdout || { cat stdout; Exit 1; }
cat stdout
grep 'making libfoodep' stdout
rm -f foodep
$MAKE && Exit 1
: >foodep
rm -f foodep2
$MAKE && Exit 1
: >foodep2
rm -f bardep
$MAKE && Exit 1
: >bardep
$MAKE
: > older
$sleep
touch libfoo.a
$MAKE
$MAKE bar-has-been-updated
$MAKE distcheck
: