automake-ng
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Automake-NG] [FYI] [ng] rename: am__ensure_target_dir_exists -> am.cmd.


From: Stefano Lattarini
Subject: [Automake-NG] [FYI] [ng] rename: am__ensure_target_dir_exists -> am.cmd.ensure-target-dir-exists
Date: Tue, 31 Jul 2012 19:30:35 +0200

Signed-off-by: Stefano Lattarini <address@hidden>
---
 lib/am/common-targets.mk | 2 +-
 lib/am/depend2.am        | 4 ++--
 lib/am/header-vars.mk    | 2 +-
 lib/am/lex.am            | 2 +-
 lib/am/library.am        | 2 +-
 lib/am/ltlibrary.am      | 2 +-
 lib/am/program.am        | 2 +-
 lib/am/texi-vers.am      | 2 +-
 lib/am/texibuild.mk      | 6 +++---
 lib/am/yacc.am           | 2 +-
 10 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/lib/am/common-targets.mk b/lib/am/common-targets.mk
index 772c340..ec7fbc2 100644
--- a/lib/am/common-targets.mk
+++ b/lib/am/common-targets.mk
@@ -163,6 +163,6 @@ all check install: | $(am.built-early)
 else
 $(foreach x,$(am.built-early),$(eval -include .am/built-sources/$(x)))
 .am/built-sources/%: | %
-       @$(am__ensure_target_dir_exists)
+       @$(am.cmd.ensure-target-dir-exists)
        @touch $@
 endif
diff --git a/lib/am/depend2.am b/lib/am/depend2.am
index d52af03..da3e4b5 100644
--- a/lib/am/depend2.am
+++ b/lib/am/depend2.am
@@ -54,7 +54,7 @@ if %FASTDEP%
        %SILENT%$(am__mv) $(am__depbase).Tpo $(am__depbase).Po
 else !%FASTDEP%
 if !%AMDEP%
-       %SILENT%$(am__ensure_target_dir_exists)
+       %SILENT%$(am.cmd.ensure-target-dir-exists)
 else %AMDEP%
        %SILENT%$(am__ensure_depdir)
        %VERBOSE%object=$@ libtool=no @AMDEPBACKSLASH@
@@ -76,7 +76,7 @@ if %FASTDEP%
        %SILENT%$(am__mv) $(am__depbase).Tpo $(am__depbase).Plo
 else !%FASTDEP%
 if !%AMDEP%
-       %SILENT%$(am__ensure_target_dir_exists)
+       %SILENT%$(am.cmd.ensure-target-dir-exists)
 else %AMDEP%
        %SILENT%$(am__ensure_depdir)
        %VERBOSE%object=$@ libtool=yes @AMDEPBACKSLASH@
diff --git a/lib/am/header-vars.mk b/lib/am/header-vars.mk
index f899813..1118897 100644
--- a/lib/am/header-vars.mk
+++ b/lib/am/header-vars.mk
@@ -132,7 +132,7 @@ am.cmd.ensure-dir-exists = \
 
 # Ensure the directory containing the target of the current recipe
 # exists, by creating it if necessary.
-am__ensure_target_dir_exists = $(call am.cmd.ensure-dir-exists,$(@D))
+am.cmd.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/lib/am/lex.am b/lib/am/lex.am
index 5d039f5..7d414f5 100644
--- a/lib/am/lex.am
+++ b/lib/am/lex.am
@@ -23,7 +23,7 @@ endif %?MAINTAINER-MODE%
 
 ?GENERIC?%%DERIVED-EXT%: %%EXT%
 ?!GENERIC?%OBJ%: %SOURCE%
-       %SILENT%$(am__ensure_target_dir_exists)
+       %SILENT%$(am.cmd.ensure-target-dir-exists)
 ?GENERIC?      %VERBOSE%$(am.lex.maybe-skip) \
 ?!GENERIC??DIST_SOURCE?        %VERBOSE%$(am.lex.maybe-skip) \
        $(SHELL) $(YLWRAP) $< $(LEX_OUTPUT_ROOT).c %OBJ% -- %COMPILE%
diff --git a/lib/am/library.am b/lib/am/library.am
index 0d5ac9e..76adec2 100644
--- a/lib/am/library.am
+++ b/lib/am/library.am
@@ -16,6 +16,6 @@
 %LIBRARY%: $(%XLIBRARY%_OBJECTS) $(%XLIBRARY%_DEPENDENCIES) \
            $(EXTRA_%XLIBRARY%_DEPENDENCIES)
        %SILENT%rm -f $@
-       %SILENT%$(am__ensure_target_dir_exists)
+       %SILENT%$(am.cmd.ensure-target-dir-exists)
        %VERBOSE%$(%XLIBRARY%_AR) $@ $(%XLIBRARY%_OBJECTS) $(%XLIBRARY%_LIBADD)
        %SILENT%$(RANLIB) $@
diff --git a/lib/am/ltlibrary.am b/lib/am/ltlibrary.am
index 371e31c..3e62eb8 100644
--- a/lib/am/ltlibrary.am
+++ b/lib/am/ltlibrary.am
@@ -15,5 +15,5 @@
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 %LTLIBRARY%: $(%XLTLIBRARY%_OBJECTS) $(%XLTLIBRARY%_DEPENDENCIES) \
              $(EXTRA_%XLTLIBRARY%_DEPENDENCIES)
-       %SILENT%$(am__ensure_target_dir_exists)
+       %SILENT%$(am.cmd.ensure-target-dir-exists)
        %VERBOSE%$(%XLINK%) %RPATH% $(%XLTLIBRARY%_OBJECTS) 
$(%XLTLIBRARY%_LIBADD) $(LIBS)
diff --git a/lib/am/program.am b/lib/am/program.am
index b444bd9..a7a79e6 100644
--- a/lib/am/program.am
+++ b/lib/am/program.am
@@ -21,5 +21,5 @@
 ## Or maybe not... sadly, incremental linkers are rarer than losing
 ## systems.
        %SILENT%rm -f $@
-       %SILENT%$(am__ensure_target_dir_exists)
+       %SILENT%$(am.cmd.ensure-target-dir-exists)
        %VERBOSE%$(%XLINK%) $(%XPROGRAM%_OBJECTS) $(%XPROGRAM%_LDADD) $(LIBS)
diff --git a/lib/am/texi-vers.am b/lib/am/texi-vers.am
index afacbc8..2d5789e 100644
--- a/lib/am/texi-vers.am
+++ b/lib/am/texi-vers.am
@@ -27,7 +27,7 @@ am.dist.common-files += %VTEXI% %STAMPVTI%
 ## (Not configure.ac, because not all setups define the version number
 ## in this file.)
 %STAMPVTI%: %TEXI% $(top_srcdir)/configure
-       @$(am__ensure_target_dir_exists)
+       @$(am.cmd.ensure-target-dir-exists)
        @(set `$(SHELL) $(am.conf.aux-dir)/mdate-sh $<`; \
        echo "@set UPDATED $$1 $$2 $$3"; \
        echo "@set UPDATED-MONTH $$2 $$3"; \
diff --git a/lib/am/texibuild.mk b/lib/am/texibuild.mk
index aad09a1..cbd9005 100644
--- a/lib/am/texibuild.mk
+++ b/lib/am/texibuild.mk
@@ -21,7 +21,7 @@ MAKEINFOHTML = $(MAKEINFO) --html
 AM_MAKEINFOHTMLFLAGS ?= $(AM_MAKEINFOFLAGS)
 
 define am__texibuild_dvi_or_pdf
-       $1$(am__ensure_target_dir_exists) && \
+       $1$(am.cmd.ensure-target-dir-exists) && \
        TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
 ## Must set MAKEINFO like this so that version.texi will be found even
 ## if it is in srcdir.
@@ -43,7 +43,7 @@ define am__texibuild_dvi_or_pdf
 endef
 
 define am__texibuild_info
-       $(if $1,,@$(am__ensure_target_dir_exists))
+       $(if $1,,@$(am.cmd.ensure-target-dir-exists))
 ## Back up the info files before running makeinfo. This is the cheapest
 ## way to ensure that
 ## 1) If the texinfo file shrinks (or if you start using --no-split),
@@ -78,7 +78,7 @@ define am__texibuild_info
 endef
 
 define am__texibuild_html
-       $(AM_V_MAKEINFO)$(am__ensure_target_dir_exists) \
+       $(AM_V_MAKEINFO)$(am.cmd.ensure-target-dir-exists) \
 ## When --split (the default) is used, makeinfo will output a
 ## directory.  However it will not update the time stamp of a
 ## previously existing directory, and when the names of the nodes
diff --git a/lib/am/yacc.am b/lib/am/yacc.am
index b621687..5cff9ba 100644
--- a/lib/am/yacc.am
+++ b/lib/am/yacc.am
@@ -41,7 +41,7 @@ endif %?FIRST%
 
 ?GENERIC?%%DERIVED-EXT%: %%EXT%
 ?!GENERIC?%OBJ%: %SOURCE%
-       %SILENT%$(am__ensure_target_dir_exists)
+       %SILENT%$(am.cmd.ensure-target-dir-exists)
        %VERBOSE% \
 ?GENERIC?      $(am.yacc.maybe-skip) \
 ?!GENERIC??DIST_SOURCE?        $(am.yacc.maybe-skip) \
-- 
1.7.12.rc0




reply via email to

[Prev in Thread] Current Thread [Next in Thread]