Signed-off-by: Stefano Lattarini <stefano.lattar...@gmail.com> --- lib/am/all-target.am | 2 +- lib/am/check-typos.am | 2 +- lib/am/distdir.am | 2 +- lib/am/header-vars.am | 2 +- lib/am/lisp.am | 2 +- t/make-dryrun.tap | 6 +++--- 6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/lib/am/all-target.am b/lib/am/all-target.am index 9e69726..e307d5d 100644 --- a/lib/am/all-target.am +++ b/lib/am/all-target.am @@ -27,7 +27,7 @@ endif # But of course, we shouldn't attempt to build any of them when # running in dry mode. am.built-early = %LOCAL-HEADERS% $(BUILT_SOURCES) -ifeq ($(am__make_dryrun),true) +ifeq ($(am.make.dry-run),true) # A trick to make the "make -n" output more useful, albeit not # completely accurate. all check install: | $(am.built-early) diff --git a/lib/am/check-typos.am b/lib/am/check-typos.am index b752b59..e633e4f 100644 --- a/lib/am/check-typos.am +++ b/lib/am/check-typos.am @@ -35,7 +35,7 @@ # make invocations and creation of an auxiliary makefile fragments, and # such an approach do not interact very well with "make -n"; in such a case, # it's simpler and safer to go for "greedy checking". -ifeq ($(am__make_dryrun),true) +ifeq ($(am.make.dry-run),true) AM_FORCE_SANITY_CHECKS ?= yes endif diff --git a/lib/am/distdir.am b/lib/am/distdir.am index bf74c5d..16de751 100644 --- a/lib/am/distdir.am +++ b/lib/am/distdir.am @@ -212,7 +212,7 @@ endif %?TOPDIR_P% if %?SUBDIRS% @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - $(am__make_dryrun) \ + $(am.make.dry-run) \ || test -d "$(distdir)/$$subdir" \ || $(MKDIR_P) "$(distdir)/$$subdir" \ || exit 1; \ diff --git a/lib/am/header-vars.am b/lib/am/header-vars.am index 23e9987..c0e15ba 100644 --- a/lib/am/header-vars.am +++ b/lib/am/header-vars.am @@ -136,7 +136,7 @@ am__vpath_rewrite = \ ## would wrongly misinterpret that as and indication that make is running ## in dry mode. This has already happened in practice. So we need the ## hack with $(subst \ , ...). -am__make_dryrun := \ +am.make.dry-run := \ $(strip $(if $(strip \ $(foreach am__v, $(subst \ ,,$(strip $(MAKEFLAGS))), \ $(if $(or $(findstring =,$(am__v)),$(filter --%,$(am__v))),, \ diff --git a/lib/am/lisp.am b/lib/am/lisp.am index 40ac35e..84dd696 100644 --- a/lib/am/lisp.am +++ b/lib/am/lisp.am @@ -52,7 +52,7 @@ $(am__ELCFILES): elc-stamp ## ## If "make -n" is called, do not execute any command in the recipe that ## changes the tree; however, invoke the recursive make for debuggability. - @if $(am__make_dryrun); then dry=:; else dry=; fi; \ + @if $(am.make.dry-run); then dry=:; else dry=; fi; \ if test "$(EMACS)" != no && test ! -f $@; then \ ## If "make -j" is used and more than one file has been erased, several ## processes can execute this block. We have to make sure that only diff --git a/t/make-dryrun.tap b/t/make-dryrun.tap index 42fd3df..39a3454 100755 --- a/t/make-dryrun.tap +++ b/t/make-dryrun.tap @@ -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/>. -# Check that $(am__make_dryrun) works as expected. +# Check that $(am.make.dry-run) works as expected. . ./defs || exit 1 @@ -31,10 +31,10 @@ foo: $(MAKE) all notdry: @echo ":: $$MAKEFLAGS ::" # For debugging. - $(am__make_dryrun) && exit 1; exit 0 + $(am.make.dry-run) && exit 1; exit 0 dry: +@echo ":: $$MAKEFLAGS ::" # For debugging. - +$(am__make_dryrun) || exit 1; echo ok > from-dry-mode + +$(am.make.dry-run) || exit 1; echo ok > from-dry-mode END $ACLOCAL || fatal_ "aclocal failed" -- 1.7.10.4