From: Stefano Lattarini Date: Tue, 31 Jul 2012 17:24:05 +0000 (+0200) Subject: [ng] rename: am__ensure_target_dir_exists -> am.cmd.ensure-target-dir-exists X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=77688699a254bcbde61d4a13b6df89102288ff6d;p=thirdparty%2Fautomake.git [ng] rename: am__ensure_target_dir_exists -> am.cmd.ensure-target-dir-exists Signed-off-by: Stefano Lattarini --- diff --git a/lib/am/common-targets.mk b/lib/am/common-targets.mk index 772c340f5..ec7fbc251 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 d52af034e..da3e4b58d 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 f89981336..111889755 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 5d039f5e9..7d414f56f 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 0d5ac9e70..76adec21c 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 371e31c13..3e62eb854 100644 --- a/lib/am/ltlibrary.am +++ b/lib/am/ltlibrary.am @@ -15,5 +15,5 @@ ## along with this program. If not, see . %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 b444bd933..a7a79e6b9 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 afacbc88d..2d5789eb4 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 aad09a14d..cbd900548 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 b62168748..5cff9ba62 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) \