diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2014-12-23 17:27:30 +0100 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2014-12-23 17:27:30 +0100 |
| commit | a38fe86d4f425575e9753b34d65d73c98838b085 (patch) | |
| tree | 8e93d7be7a83b87aa9212a51e20e24d60f576bfa /t | |
| parent | 912383451a4a394383a8e95240e3e98ee68faf72 (diff) | |
| parent | 55270ac3222bb00e60505ec7c2d63f0047152bfa (diff) | |
| download | automake-a38fe86d4f425575e9753b34d65d73c98838b085.tar.gz | |
Merge branch 'am-deps' into micro
* am-deps:
include: fix bug in handling of user-defined makefile fragments generation
tests: expose bug in handling of user-defined makefile fragments generation
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 't')
| -rw-r--r-- | t/am-include-only-one-generated-fragment.sh | 48 | ||||
| -rw-r--r-- | t/list-of-tests.mk | 1 |
2 files changed, 49 insertions, 0 deletions
diff --git a/t/am-include-only-one-generated-fragment.sh b/t/am-include-only-one-generated-fragment.sh new file mode 100644 index 000000000..57a8aecbf --- /dev/null +++ b/t/am-include-only-one-generated-fragment.sh @@ -0,0 +1,48 @@ +#! /bin/sh +# Copyright (C) 2014 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/>. + +# Check that inclusion of only one '.am' that can be regenerated via +# a user-defined Makefile rule does not incur in spurious automake +# warnings about "target redefinition". + +. test-init.sh + +cat >> configure.ac <<'END' +AC_CONFIG_FILES([sub/Makefile]) +AC_OUTPUT +END + +cat > Makefile.am <<'END' +include foobar.am +$(srcdir)/foobar.am: $(srcdir)/touch.sh + $(SHELL) $(srcdir)/touch.sh $(srcdir)/foobar.am +EXTRA_DIST = touch.sh +END + +mkdir sub +cat > sub/Makefile.am <<'END' +include $(top_srcdir)/quux.am +$(top_srcdir)/quux.am: $(top_srcdir)/touch.sh + $(SHELL) $(top_srcdir)/touch.sh $@ +END + +: > foobar.am +: > quux.am + +$ACLOCAL +$AUTOMAKE + +: diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk index c98d69e11..dcdfec783 100644 --- a/t/list-of-tests.mk +++ b/t/list-of-tests.mk @@ -143,6 +143,7 @@ t/amopts-location.sh \ t/amopts-variable-expansion.sh \ t/amsubst.sh \ t/am-default-source-ext.sh \ +t/am-include-only-one-generated-fragment.sh \ t/ansi2knr-no-more.sh \ t/ar-lib.sh \ t/ar-lib2.sh \ |