diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-05-28 10:08:39 +0200 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-05-29 12:48:35 +0200 |
| commit | 9018af7199307ff5fc9992d1107a05016ec31513 (patch) | |
| tree | d6be19fe6b40ad1b6a626649ddf523f3890055e6 /t/no-extra-makefile-code.sh | |
| parent | 269236a4212bfeb491ced6c6f0ae5d8fa42b734c (diff) | |
| download | automake-9018af7199307ff5fc9992d1107a05016ec31513.tar.gz | |
[ng] compile: rename make variable DEFAULT_INCLUDES -> AM_DEFAULT_INCLUDES
The automake-generated variable 'DEFAULT_INCLUDES' has never been
documented, and it violates user namespace. So rename it to
'AM_DEFAULT_INCLUDES', to make it clear that it is owned by Automake.
We prefer that name to something that would sound more "private",
like 'am__default_includes', because there are possibly legitimate
usages of that variable on the user's part.
* automake.in, lib/am/compile.am: Do the rename.
* NG-NEWS, doc/automake-ng.texi: Update.
* t/confh4.sh, t/no-extra-makefile-code.sh: Adjust.
* syntax-checks.mk (old_vars_checks): Add new check
'sc_no_DEFAULT_INCLUDES'.
(modern_DEFAULT_INCLUDES): Define to 'DEFAULT_INCLUDES'.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 't/no-extra-makefile-code.sh')
| -rwxr-xr-x | t/no-extra-makefile-code.sh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/t/no-extra-makefile-code.sh b/t/no-extra-makefile-code.sh index f0246b769..1c91452e4 100755 --- a/t/no-extra-makefile-code.sh +++ b/t/no-extra-makefile-code.sh @@ -30,7 +30,6 @@ rm -f depcomp compile $ACLOCAL $AUTOMAKE -$EGREP 'DEFAULT_INCLUDES|-compile|\$\(OBJEXT\)|tab\.[ch]' Makefile.in \ - && Exit 1 +$EGREP 'INCLUDE|-compile|\$\(OBJEXT\)|tab\.[ch]' Makefile.in && Exit 1 : |