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 /lib | |
| 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 'lib')
| -rw-r--r-- | lib/am/configure.am | 6 |
1 files changed, 5 insertions, 1 deletions
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% |