[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Automake-NG] [FYI] [ng] rename: am__dir -> am.dir, am__abs_dir -> am.ab
From: |
Stefano Lattarini |
Subject: |
[Automake-NG] [FYI] [ng] rename: am__dir -> am.dir, am__abs_dir -> am.abs-dir, etc. |
Date: |
Sat, 28 Jul 2012 10:55:57 +0200 |
Complete list of renames:
am__dir -> am.dir
am__abs_dir -> am.abs-dir
am__top_dir -> am.top-dir
am__abs_top_dir -> am.abs-top-dir
Signed-off-by: Stefano Lattarini <address@hidden>
---
lib/am/am-dir.am | 18 +++++++++---------
lib/am/check-typos.am | 6 +++---
lib/am/distdir.am | 8 ++++----
lib/am/parallel-tests.am | 2 +-
t/am-dir.sh | 20 ++++++++++----------
5 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/lib/am/am-dir.am b/lib/am/am-dir.am
index 17381c2..5cc0ec9 100644
--- a/lib/am/am-dir.am
+++ b/lib/am/am-dir.am
@@ -19,25 +19,25 @@
# the filesystem. It is not created by default; recipes needing it
# should add an order-only dependency on it, as in:
#
-# am-rule: am-prereqs | $(am__dir)
-# [recipe creating/using files in $(am__dir)]
+# am-rule: am-prereqs | $(am.dir)
+# [recipe creating/using files in $(am.dir)]
#
-am__dir = .am
+am.dir = .am
# Its counterpart with an absolute path, for recipes that can chdir around.
-am__abs_dir = $(abs_builddir)/$(am__dir)
+am.abs-dir = $(abs_builddir)/$(am.dir)
# Its counterpart for use in subdir makefiles, in case they need to refer
-# to the top-level $(am__dir) directory.
-am__top_dir = $(top_builddir)/$(am__dir)
+# to the top-level $(am.dir) directory.
+am.top-dir = $(top_builddir)/$(am.dir)
# Its counterpart with an absolute path and for use in subdir makefiles.
-am__abs_top_dir = $(abs_top_builddir)/$(am__dir)
+am.abs-top-dir = $(abs_top_builddir)/$(am.dir)
.PHONY: am--distclean-amdir
am--distclean-amdir:
- rm -rf $(am__dir)
+ rm -rf $(am.dir)
distclean-am: am--distclean-amdir
-$(am__dir):
+$(am.dir):
@mkdir $@
diff --git a/lib/am/check-typos.am b/lib/am/check-typos.am
index e52e5e4..0fa5b3f 100644
--- a/lib/am/check-typos.am
+++ b/lib/am/check-typos.am
@@ -110,17 +110,17 @@ else # $(AM_FORCE_SANITY_CHECKS) != yes
# Makefile: .am/check-typos-stamp.mk: No such file or directory
# Although such a warning would *not* be an error in our setup, it still
# is ugly and annoying enough to justify ...
--include $(am__dir)/check-typos-stamp.mk
+-include $(am.dir)/check-typos-stamp.mk
# ... this workaround; which is required by the fact that, if a recipe
# meant to rebuild a file included with "-include" file fails, the make
# run itself is not considered failed (this is quite consistent with
# the "-include" semantics).
ifdef .am/sanity-checks-failed
-$(shell rm -f $(am__dir)/check-typos-stamp.mk)
+$(shell rm -f $(am.dir)/check-typos-stamp.mk)
$(error Some Automake-NG sanity checks failed)
else
-$(am__dir)/check-typos-stamp.mk: %MAKEFILE% | $(am__dir)
+$(am.dir)/check-typos-stamp.mk: %MAKEFILE% | $(am__dir)
@if \
$(MAKE) --no-print-directory AM_FORCE_SANITY_CHECKS=yes .am/nil; \
then \
diff --git a/lib/am/distdir.am b/lib/am/distdir.am
index 2312fd4..310b338 100644
--- a/lib/am/distdir.am
+++ b/lib/am/distdir.am
@@ -73,7 +73,7 @@ am.mkdir-for-dist = \
@$(MKDIR_P) $(patsubst %,"$(distdir)"/%,$1)$(am.chars.newline)
am.write-list-of-distfiles = \
@lst='$1'; for x in $$lst; do echo $$x; done \
- >> $(am__dir)/address@hidden(am.chars.newline)
+ >> $(am.dir)/address@hidden(am.chars.newline)
if %?TOPDIR_P%
distdir = $(PACKAGE)-$(VERSION)
@@ -133,7 +133,7 @@ if %?SUBDIRS%
AM_RECURSIVE_TARGETS += distdir
endif %?SUBDIRS%
-distdir: $(am.dist.all-files) | $(am__dir)
+distdir: $(am.dist.all-files) | $(am.dir)
##
## For Gnits users, this is pretty handy. Look at 15 lines
## in case some explanatory text is desirable.
@@ -164,7 +164,7 @@ endif %?TOPDIR_P%
## There are situations in which 'ln' can fail. For instance a file to
## distribute could actually be a cross-filesystem symlink -- this can
## easily happen if "gettextize" was run on the distribution.
- @rm -f $(am__dir)/address@hidden
+ @rm -f $(am.dir)/address@hidden
$(call am.xargs-map,am.write-list-of-distfiles, \
$(am.dist.files-cooked))
@while read file; do \
@@ -200,7 +200,7 @@ endif %?TOPDIR_P%
|| cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
- done < $(am__dir)/address@hidden
+ done < $(am.dir)/address@hidden
##
## Test for directory existence here because previous automake
## invocation might have created some directories. Note that we
diff --git a/lib/am/parallel-tests.am b/lib/am/parallel-tests.am
index defd88b..579ffe5 100644
--- a/lib/am/parallel-tests.am
+++ b/lib/am/parallel-tests.am
@@ -293,7 +293,7 @@ am__mostlyclean_files += $(am.test-suite.test-results)
$(am.test-suite.test-logs
# $(TEST_LOGS) is a published interface.
TEST_LOGS = $(am.test-suite.test-logs)
-am.test-suite.workdir = $(am__dir)/test-harness
+am.test-suite.workdir = $(am.dir)/test-harness
am.test-suite.append-to-list-of-bases = \
@lst='$1'; for x in $$lst; do echo $$x; done \
diff --git a/t/am-dir.sh b/t/am-dir.sh
index fa101b3..1ffc666 100755
--- a/t/am-dir.sh
+++ b/t/am-dir.sh
@@ -18,10 +18,10 @@
# Check support for private automake working directory in builddir:
#
# * internal variables:
-# $(am__dir)
-# $(am__abs_dir)
-# $(am__top_dir)
-# $(am__abs_top_dir)
+# $(am.dir)
+# $(am.abs-dir)
+# $(am.top-dir)
+# $(am.abs-top-dir)
#
# * cleaning rules and "make distcheck" interaction.
#
@@ -37,19 +37,19 @@ END
cat > Makefile.am <<'END'
SUBDIRS = . xsrc
-all-local: | $(am__dir)
+all-local: | $(am.dir)
END
mkdir xsrc
cat >> xsrc/Makefile.am <<'END'
subdir:
mkdir $@
-all-local: | $(am__dir) subdir
- : > $(am__dir)/sub
- : > $(am__top_dir)/top
- (cd ./subdir && : > $(am__abs_dir)/abs-sub)
+all-local: | $(am.dir) subdir
+ : > $(am.dir)/sub
+ : > $(am.top-dir)/top
+ (cd ./subdir && : > $(am.abs-dir)/abs-sub)
rmdir subdir
- (cd /tmp && : > $(am__abs_top_dir)/abs-top)
+ (cd /tmp && : > $(am.abs-top-dir)/abs-top)
END
sort > exp <<END
--
1.7.12.rc0
- [Automake-NG] [FYI] [ng] rename: am__dir -> am.dir, am__abs_dir -> am.abs-dir, etc.,
Stefano Lattarini <=