[ng] rename: am__configure_deps -> am.remake.configure-deps

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>

diff --git a/automake.in b/automake.in
index 1a45aa0e32c8e6b68f689ae8273e8fb26f0426b8..7e988d889617e11b27fa7859e41907166778bdf2 100644 (file)
--- a/automake.in
+++ b/automake.in
@@ -3621,7 +3621,7 @@ sub handle_configure ($$$@)
   my @configuredeps = ('$(am.remake.aclocal-m4-deps)',
                        '$(CONFIGURE_DEPENDENCIES)');
   push @configuredeps, '$(ACLOCAL_M4)' if -f 'aclocal.m4';
-  define_variable ('am__configure_deps', INTERNAL, @configuredeps);
+  define_variable ('am.remake.configure-deps', INTERNAL, @configuredeps);
 
   my $automake_options = '--' . $strictness_name .
                         (global_option 'no-dependencies' ? ' --ignore-deps' : '');

diff --git a/lib/am/configure.am b/lib/am/configure.am
index cab6595de554be15718f2a89370b50a9d60ac5b6..bff38bfba5bb91d768866cfa87f508ee2188a555 100644 (file)
--- a/lib/am/configure.am
+++ b/lib/am/configure.am
@@ -19,13 +19,13 @@
 ## --------------------- ##
 
 ## This rule remakes the Makefile.in.
-%MAKEFILE-IN%: %MAINTAINER-MODE% %MAKEFILE-AM% %MAKEFILE-IN-DEPS% $(am__configure_deps)
+%MAKEFILE-IN%: %MAINTAINER-MODE% %MAKEFILE-AM% %MAKEFILE-IN-DEPS% $(am.remake.configure-deps)
 ## If configure.ac or one of configure's dependencies has changed, all
 ## Makefile.in are to be updated; it is then more efficient to run
 ## automake on all the Makefiles at once.  It also allow Automake to be
 ## run for newly added directories.
        @for dep in $?; do \
-         case '$(am__configure_deps)' in \
+         case '$(am.remake.configure-deps)' in \
            *$$dep*) \
 ?TOPDIR_P?           echo ' cd $(srcdir) && $(AUTOMAKE) %AUTOMAKE-OPTIONS%'; \
 ?TOPDIR_P?           cd $(srcdir) && $(AUTOMAKE) %AUTOMAKE-OPTIONS% \
@@ -83,14 +83,14 @@ if %?TOPDIR_P%
 ## don't exist.  This is especially important for configure, since it
 ## won't be created until autoconf is run -- which might be after
 ## automake is run.
-am.dist.common-files += $(top_srcdir)/configure $(am__configure_deps)
+am.dist.common-files += $(top_srcdir)/configure $(am.remake.configure-deps)
 endif %?TOPDIR_P%
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 ?TOPDIR_P?     $(SHELL) ./config.status --recheck
 ?!TOPDIR_P?    cd $(top_builddir) && $(MAKE) .am/nil
 
-$(top_srcdir)/configure: %MAINTAINER-MODE% $(am__configure_deps)
+$(top_srcdir)/configure: %MAINTAINER-MODE% $(am.remake.configure-deps)
 ?TOPDIR_P?     cd $(srcdir) && $(AUTOCONF)
 ?!TOPDIR_P?    cd $(top_builddir) && $(MAKE) .am/nil
 
@@ -102,7 +102,7 @@ $(top_srcdir)/configure: %MAINTAINER-MODE% $(am__configure_deps)
 ## Whenever a configure dependency changes we need to rebuild
 ## aclocal.m4 too.  Changing configure.ac, or any file included by
 ## aclocal.m4 might require adding more files to aclocal.m4.  Hence
-## the $(am__configure_deps) dependency.
+## the $(am.remake.configure-deps) dependency.
 ## We still need $(ACLOCAL_AMFLAGS) for sake of backward-compatibility;
 ## we should hopefully be able to get rid of it in a not-so-distant
 ## future.

diff --git a/lib/am/remake-hdr.am b/lib/am/remake-hdr.am
index 2bcf2df79625ef1fc6f5d65290ed0af0a6e721c1..77d3fae5887aecd1f9c840acd738234ccfe98f59 100644 (file)
--- a/lib/am/remake-hdr.am
+++ b/lib/am/remake-hdr.am
@@ -27,7 +27,7 @@
 ## Only the first file of AC_CONFIG_HEADERS is assumed to be generated
 ## by autoheader.
 if %?FIRST%
-%CONFIG_HIN%: %MAINTAINER-MODE% $(am__configure_deps)
+%CONFIG_HIN%: %MAINTAINER-MODE% $(am.remake.configure-deps)
        cd $(top_srcdir) && $(AUTOHEADER)
 ## Whenever $(AUTOHEADER) has run, we must make sure that
 ## ./config.status will rebuild config.h.  The dependency from %STAMP%

diff --git a/t/flavor.sh b/t/flavor.sh
index 91b3341763a79f0d311a99ef200d248b51428e83..90e0b15b6c5eae3dbd3b0fa1bd26187cebfb374d 100755 (executable)
--- a/t/flavor.sh
+++ b/t/flavor.sh
@@ -43,7 +43,7 @@ for flavor in --gnits --gnu --foreign --ignore-deps; do
   $MAKE
 
   # Two code paths in configure.am:
-  # - either a file in $(am__configure_deps) has been updated ...
+  # - either a file in $(am.remake.configure-deps) has been updated ...
   $sleep
   touch aclocal.m4
   $MAKE

diff --git a/t/remake-all-1.sh b/t/remake-all-1.sh
index b57157ab6f646f331181b4b230a918875d1621f7..a6ec8e2ad360343a79d64cfda4b53f2fa3a9b0db 100755 (executable)
--- a/t/remake-all-1.sh
+++ b/t/remake-all-1.sh
@@ -46,7 +46,7 @@ $FGREP "$magic1" mkfile.in && exit 1 # Sanity check.
 
 # Two code paths in configure.am:
 
-# - either a file in $(am__configure_deps) has been updated ...
+# - either a file in $(am.remake.configure-deps) has been updated ...
 $sleep
 echo "AC_SUBST([FOO])" >> configure.ac
 $MAKE