diff options
| -rw-r--r-- | NEWS | 7 | ||||
| -rw-r--r-- | lib/am/configure.am | 6 | ||||
| -rw-r--r-- | t/am-include-only-one-generated-fragment.sh | 48 | ||||
| -rw-r--r-- | t/list-of-tests.mk | 1 |
4 files changed, 61 insertions, 1 deletions
@@ -120,6 +120,13 @@ New in 1.14.2: Makefiles, in the face of the newly-introduced randomization for hash keys order in Perl 5.18. + - In older Automake versions, if a user defined one single Makefile + fragment (say 'foo.am') to be included (via Automake includes) in + his main Makefile.am, and defined a custom make rule to generate that + file from other data, Automake used to spuriously complain about with + something like "... overrides Automake target '$(srcdir)/foo.am". + This bug is now fixed. + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ New in 1.14.1: diff --git a/lib/am/configure.am b/lib/am/configure.am index 6f39f7dbe..d159e1b55 100644 --- a/lib/am/configure.am +++ b/lib/am/configure.am @@ -83,7 +83,11 @@ endif %?TOPDIR_P% esac; ## Avoid the "deleted header file" problem for the dependencies. -?HAVE-MAKEFILE-IN-DEPS?%MAKEFILE-IN-DEPS%: +## Add the trailing "$(am__empty)" to trick Automake into not spuriously +## complaining about "duplicated targets" in case the %MAKEFILE-IN-DEPS% +## list expands to a single target that is also declared in some +## user-defined rule. +?HAVE-MAKEFILE-IN-DEPS?%MAKEFILE-IN-DEPS% $(am__empty): DIST_COMMON += %MAKEFILE-AM% 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 \ |