[ng] rename: am__ensure_dir_exists -> am.cmd.ensure-dir-exists

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

diff --git a/lib/am/depend2.am b/lib/am/depend2.am
index 2601434de42a797565e13a7d30919a208e57b4af..d52af034ebe1f6054bde651b119cfc6f8e696613 100644 (file)
--- a/lib/am/depend2.am
+++ b/lib/am/depend2.am
@@ -37,7 +37,7 @@ am__depdir = $(dir $@)/$(DEPDIR)
 ## FIXME: more precise in the removal of the suffix?
 am__depbase = $(am__depdir)/$(basename $(notdir $@))
 ## Avoid useless forks when possible.
-am__ensure_depdir = $(call am__ensure_dir_exists,$(am__depdir))
+am__ensure_depdir = $(call am.cmd.ensure-dir-exists,$(am__depdir))
 am__o_src = $(if $(filter .obj,$(suffix $@)),`$(CYGPATH_W) $<`,$<)
 ## To facilitate use of "libtool --dry-run".
 am__mv = mv -f

diff --git a/lib/am/header-vars.mk b/lib/am/header-vars.mk
index b2fb450145552ed69d1948adbfb1d51290ea02f8..f899813360a698aee915d9f4f9d1cdea96960d42 100644 (file)
--- a/lib/am/header-vars.mk
+++ b/lib/am/header-vars.mk
@@ -127,12 +127,12 @@ V ?= 0
 # try to optimize for those cases -- especially because, for our
 # usage patterns, one of them should always be true in non-VPATH
 # builds.
-am__ensure_dir_exists = \
+am.cmd.ensure-dir-exists = \
   $(if $(filter .,$1),:,$(if $(wildcard $1/),:,$(MKDIR_P) $1))
 
 # Ensure the directory containing the target of the current recipe
 # exists, by creating it if necessary.
-am__ensure_target_dir_exists = $(call am__ensure_dir_exists,$(@D))
+am__ensure_target_dir_exists = $(call am.cmd.ensure-dir-exists,$(@D))
 
 # The 'all' target must be the default one, independently from the
 # position it is declared in the output Makefile.

diff --git a/t/ensure-dir-exists.sh b/t/ensure-dir-exists.sh
index 28f6c4b09fbdd6ab6c4dea5a2e080176f992b245..9d35470b3020e8bc5ece9a711e35c75f26fc8ea2 100755 (executable)
--- a/t/ensure-dir-exists.sh
+++ b/t/ensure-dir-exists.sh
@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Test Automake-provided internal macro 'am__ensure_dir_exists'.
+# Test Automake-provided internal macro 'am.cmd.ensure-dir-exists'.
 
 am_create_testdir=empty
 . ./defs || exit 1
@@ -32,13 +32,13 @@ all: $(files)
 .PHONY: all
 
 sanity-check:
-       $(warning $(call am__ensure_dir_exists,x))
-       $(if $(filter $(call am__ensure_dir_exists,x),:MKDIR_P:),, \
-             $(error am__ensure_dir_exists does not contain $$(MKDIR_P)))
+       $(warning $(call am.cmd.ensure-dir-exists,x))
+       $(if $(filter $(call am.cmd.ensure-dir-exists,x),:MKDIR_P:),, \
+             $(error am.cmd.ensure-dir-exists does not contain $$(MKDIR_P)))
 .PHONY: sanity-check
 
 $(files):
-       $(call am__ensure_dir_exists,x)
+       $(call am.cmd.ensure-dir-exists,x)
        echo dummy > $@
 END