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/confh4.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/confh4.sh')
| -rwxr-xr-x | t/confh4.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/t/confh4.sh b/t/confh4.sh index a87b38e4f..ddcbebab2 100755 --- a/t/confh4.sh +++ b/t/confh4.sh @@ -37,7 +37,7 @@ mkdir include sub : > include/config.h.in cat > c-defs.am << 'END' -## To bring in the definition of DEFAULT_INCLUDES +## To bring in the definition of AM_DEFAULT_INCLUDES CC = who-cares AUTOMAKE_OPTIONS = no-dependencies bin_PROGRAMS = foo @@ -47,7 +47,7 @@ cat > Makefile.am << 'END' include $(top_srcdir)/c-defs.am .PHONY: test-default-includes test-default-includes: - echo ' ' $(DEFAULT_INCLUDES) ' ' \ + echo ' ' $(AM_DEFAULT_INCLUDES) ' ' \ | $(FGREP) ' -I$(top_builddir)/include ' END @@ -57,8 +57,8 @@ cat > include/Makefile.am << 'END' include $(top_srcdir)/c-defs.am .PHONY: test-default-includes test-default-includes: - echo ' ' $(DEFAULT_INCLUDES) ' ' | $(FGREP) ' -I. ' - case ' $(DEFAULT_INCLUDES) ' in \ + echo ' ' $(AM_DEFAULT_INCLUDES) ' ' | $(FGREP) ' -I. ' + case ' $(AM_DEFAULT_INCLUDES) ' in \ *'$(top_builddir)'*) exit 1;; \ *include*) exit 1;; \ *-I.*-I.*) exit 1;; \ |