[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.12.2
|
From: |
Stefano Lattarini |
|
Subject: |
[Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.12.2-572-g05c5e1b |
|
Date: |
Sat, 21 Jul 2012 16:59:49 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".
http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=05c5e1bf8dbd4bd2f7f196e806466231278303af
The branch, ng/master has been updated
via 05c5e1bf8dbd4bd2f7f196e806466231278303af (commit)
via 687c4afd270d4041a0b1f9b1f9812be04c52a1e7 (commit)
via c2009cd3f336155021dac71b2cccbf90c9cfbbbc (commit)
via 6e0bbcd050f4d9fdcfbd50a6ddecaf1b0c6fbd4c (commit)
via d777738470269e890c1de8821ab0d8c9d8f5c81c (commit)
via 8715fbef20aef483ed4c9607b0f8aa3a59e2cb09 (commit)
via 0efbd4c76aec60595ea97918069e2995e3c07889 (commit)
via 047df22d8bf4ca9fa87b9b134d8728f470b284c2 (commit)
via ffd05946898b4aaf7a9cf7e901fc90659b0cb204 (commit)
via 4a4ea77bea493465646e367a9bbbfa2101c614d8 (commit)
via afa986a0e4f9ffea8c8ac090636f1c0bb1dd060a (commit)
via 2d63c7eea1333d0b6766af0e982a63c94dc77ba3 (commit)
via f4f0c6bb82baa9da32e25ff39a222a36a7ddfc43 (commit)
via 8a76dc41d8146ef4ef86a2123924ff4f04c0ff91 (commit)
via ed5e55e5e3146c46d5961f549b145d050eb5072f (commit)
via 55a022c54ed230bdd4798fc0250647d87ff43b57 (commit)
via b316f6e374b5925e20dcc98d1c6b4d1d5817ba48 (commit)
via f7ef0bbdb20cfc4c21449b97bcea5b64a2785f7e (commit)
via 6e623db521ccf86c335bc748ad4669a24c41fe38 (commit)
via 2c72b8e53cd19bb22edde50fffc380caf1605aec (commit)
via ee6d5cf314d17d653391bf9bf787337253dc9bbd (commit)
via 64d125f93ddc5cc68eaad67463997d807d3f07ee (commit)
via 3a514a90c7effc4d8e1fcab9bca545f6c2c5f87d (commit)
via d9fa89dbddbe20cdfd959de171cb840ac542299f (commit)
via fda7ee651cd16c39d90bbeb831f45b7671104fdd (commit)
via bdce93fbb9daadcb5b2a89bddf9256030860aa32 (commit)
via 675baea5fb73b245cc7ed1f3954bce215589789b (commit)
via eae3c514cfdd92241b7bfb63fabc140e349774e1 (commit)
via dc8f59ab445da8d40d65ba75232248288f4b689a (commit)
via f692ad8d762d54357e63e35fe42edcb09f6106ed (commit)
via e394216c5715b1994bd3c9a8d653e91895015683 (commit)
via 532a17fbf4030bdd507a859a28ad10adae87dc81 (commit)
via 002093ec0a2b1b7e01f25860bc6d8d60196d9eb9 (commit)
via b2b14c5fc8d92b27a3be185fc12727da079ef7d6 (commit)
from 747774e04541f340524910146ebf450d2c8610e0 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 05c5e1bf8dbd4bd2f7f196e806466231278303af
Merge: 747774e 687c4af
Author: Stefano Lattarini <address@hidden>
Date: Sat Jul 21 18:56:42 2012 +0200
Merge branch 'ng/renames' into ng/master
* ng/renames: (33 commits)
[ng] rename: am__relativize -> am.dist.relativize-path
[ng] rename: am__canon -> am.util.canon
[ng] rename: am__toupper -> am.util.toupper
[ng] rename: am__tolower -> am.util.tolower
[ng] rename: am__using_parallel_tests -> am.conf.using-parallel-tests
[ng] rename: am__vpath_rewrite -> am.vpath.rewrite
[ng] rename: am__handle_exeext -> am.conf.handle-exeext
[ng] rename: am__private_suffix -> am.hack.private-suffix
[ng] rename: am__strip_suffixes -> am.util.strip-suffixes
[ng] am__strip_suffixes: use $0 for recursive invocations
[ng] rename: am__uniq -> am.util.uniq
[ng] am__uniq: use $0 for recursive invocations
[ng] rename: am__strip_lastword -> am.util.strip-last-word
[ng] rename: am__strip_firstword -> am.util.strip-first-word
[ng] rename: am__make_dryrun -> am.make.dry-run
[ng] rename: am__empty -> am.chars.empty
[ng] cosmetics: fix an imprecise comment
[ng] rename: am__squote -> am.chars.squote
[ng] rename: am__dquote -> am.chars.dquote
[ng] rename: am__bquote -> am.chars.bquote
...
Signed-off-by: Stefano Lattarini <address@hidden>
-----------------------------------------------------------------------
Summary of changes:
NG-NEWS | 6 +-
automake.in | 25 +++--
lib/am/all-target.am | 2 +-
lib/am/check-typos.am | 16 ++--
lib/am/compile.am | 2 +-
lib/am/configure.am | 4 +-
lib/am/data.am | 2 +-
lib/am/distdir.am | 54 +++++-----
lib/am/header-vars.am | 99 +++++++++---------
lib/am/java.am | 2 +-
lib/am/lisp.am | 4 +-
lib/am/parallel-tests.am | 12 +-
lib/am/python.am | 2 +-
lib/am/scripts.am | 2 +-
lib/am/serial-tests.am | 2 +-
lib/am/texi-vers.am | 2 +-
syntax-checks.mk | 9 +-
t/all-prog-libs.sh | 16 ++--
t/autodist-aclocal-m4.sh | 2 +-
t/autodist-configure-no-subdir.sh | 2 +-
t/autodist-stamp-vti.sh | 2 +-
t/autodist-subdir.sh | 10 +-
t/autodist.sh | 6 +-
t/clean-many.sh | 6 +-
t/clean-many2.sh | 2 +-
t/colon5.sh | 2 +-
t/colon7.sh | 6 +-
t/confh.sh | 4 +-
t/confh8.sh | 8 +-
t/depdist.sh | 2 +-
t/dist-auxfile.sh | 8 +-
t/dist-many.sh | 5 +-
t/dist-many2.sh | 5 +-
t/distcom-subdir.sh | 4 +-
t/distcom2.sh | 6 +-
t/distcom3.sh | 4 +-
t/distcom4.sh | 2 +-
t/distcom5.sh | 4 +-
t/hdr-vars-defined-once.sh | 4 +-
t/insh2.sh | 2 +-
t/internals.tap | 206 ++++++++++++++++++------------------
t/libobj7.sh | 8 +-
t/make-dryrun.tap | 6 +-
t/memoize.tap | 4 +-
t/nodist.sh | 4 +-
t/nodist3.sh | 2 +-
t/pr2.sh | 2 +-
t/relativize.tap | 8 +-
t/substref.sh | 4 +-
t/test-driver-is-distributed.sh | 2 +-
t/test-extensions-dynamic.sh | 2 +-
t/txinfo.sh | 4 +-
t/txinfo2.sh | 4 +-
t/txinfo8.sh | 4 +-
t/vpath-rewrite.sh | 2 +-
t/vtexi3.sh | 4 +-
t/vtexi4.sh | 4 +-
t/yacc-basic.sh | 2 +-
t/yacc-cxx.sh | 2 +-
t/yacc-d-basic.sh | 2 +-
t/yacc-d-cxx.sh | 2 +-
t/yacc-lex-cxx-alone.sh | 4 +-
62 files changed, 319 insertions(+), 320 deletions(-)
diff --git a/NG-NEWS b/NG-NEWS
index 22e2dfc..ca91927 100644
--- a/NG-NEWS
+++ b/NG-NEWS
@@ -217,9 +217,9 @@ Distribution
to be internal variables. But that was not clear from their names.
So we have renamed rename like this:
- DISTFILES => am__dist_files
- DIST_COMMON => am__dist_common
- DIST_SOURCES => am__dist_sources
+ DISTFILES => am.dist.all-files
+ DIST_COMMON => am.dist.common-files
+ DIST_SOURCES => am.dist.sources
Do not use any of these variables in your Makefiles!
diff --git a/automake.in b/automake.in
index e52a67a..3b9740d 100644
--- a/automake.in
+++ b/automake.in
@@ -3375,10 +3375,10 @@ sub handle_dist ()
# check that. But if the file is in a subdir without a Makefile,
# we want to distribute it here if we are doing '.'. Ugly!
# Also, in some corner cases, it's possible that the following code
- # will cause the same file to appear in the $(am__dist_common) variables
- # of two distinct Makefiles; but this is not a problem, since the
- # 'distdir' target in 'lib/am/distdir.am' can deal with the same
- # file being distributed multiple times.
+ # will cause the same file to appear in the $(am.dist.common-files)
+ # variables of two distinct Makefiles; but this is not a problem,
+ # since the 'distdir' target in 'lib/am/distdir.am' can deal with
+ # the same file being distributed multiple times.
# See also automake bug#9651.
if ($relative_dir eq '.')
{
@@ -6834,7 +6834,7 @@ sub require_conf_file_with_macro ($$$@)
################################################################
-# Push a list of files onto dist_common.
+# Push a list of files onto @dist_common.
sub push_dist_common
{
prog_error "push_dist_common run after handle_dist"
@@ -6934,7 +6934,7 @@ sub generate_makefile ($$)
# Variables used by distdir.am and tags.am.
define_variable ('SOURCES', INTERNAL, @sources);
- define_variable ('am__dist_sources', INTERNAL, @dist_sources)
+ define_variable ('am.dist.sources', INTERNAL, @dist_sources)
unless option 'no-dist';
handle_texinfo;
@@ -6952,9 +6952,9 @@ sub generate_makefile ($$)
# Must come after invocation of handle_programs, handle_libraries and
# handle_ltlibraries, so that %known_programs and %known_libraries are
# up-to-date.
- define_variable 'am__all_progs', INTERNAL, sort keys %known_programs;
- define_variable 'am__all_libs', INTERNAL, sort keys %known_libraries;
- define_variable 'am__all_ltlibs', INTERNAL, sort keys %known_ltlibraries;
+ define_variable 'am.all-progs', INTERNAL, sort keys %known_programs;
+ define_variable 'am.all-libs', INTERNAL, sort keys %known_libraries;
+ define_variable 'am.all-ltlibs', INTERNAL, sort keys %known_ltlibraries;
handle_tests;
# This must come after most other rules.
@@ -6986,8 +6986,11 @@ sub generate_makefile ($$)
# See if any _SOURCES (or _LIBADD, or ...) variable were misspelled.
$output_checks .= preprocess_file ("$libdir/am/check-typos.am",
MAKEFILE => basename ($makefile));
- # Report errors (if any) seen at make runtime.
- $output_checks .= '$(if $(am__seen_error),' .
+ # Bail out if we have encountered errors at make runtime. The
+ # relevant diagnostic should have already been reported by any
+ # call to the function '$(am.error)', so we just print a generic
+ # "errors seen, stopping" message.
+ $output_checks .= '$(if $(am.error.seen),' .
'$(error Some Automake-NG error occurred))' .
"\n";
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 6e4b804..e52e5e4 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
@@ -54,7 +54,7 @@ ifeq ($(AM_FORCE_SANITY_CHECKS),yes)
# The '*LOG_DEPENDENCIES' variables are used to declare extra dependencies
# for test cases, but only when the parallel testsuite harness is in use.
-ifeq "$(am__using_parallel_tests)" "yes"
+ifeq "$(am.conf.using-parallel-tests)" "yes"
# Extension-less tests are always accepted.
.am/vartypos/whitelisted-vars += LOG_DEPENDENCIES
# We expect '.ext' to be a valid tests extension iff 'EXT_LOG_DRIVER' is
@@ -71,13 +71,13 @@ endif
# Canonicalized names of programs and libraries (vanilla or libtool) that
# have been declared.
.am/vartypos/known-canon-proglibs := \
- $(sort $(call am__canon, $(am__all_progs) \
- $(am__all_libs) \
- $(am__all_ltlibs)))
+ $(sort $(call am.util.canon, $(am.all-progs) \
+ $(am.all-libs) \
+ $(am.all-ltlibs)))
# Extract 'foo' from something like "EXTRA_nodist_foo_SOURCES".
define .am/vartypos/canon-name-from-var
-$(call am__strip_suffixes, $(.am/vartypos/suffixes), \
+$(call am.util.strip-suffixes, $(.am/vartypos/suffixes), \
$(patsubst dist_%,%, \
$(patsubst nodist_%,%, \
$(patsubst nobase_%,%, \
@@ -88,8 +88,8 @@ endef
define .am/vartypos/check
$(eval $0/canon := $(call .am/vartypos/canon-name-from-var,$1))
$(if $(filter $($0/canon),$(.am/vartypos/known-canon-proglibs)),, \
- $(call am__error,variable '$1' is defined but no program) \
- $(call am__error, or library has '$($0/canon)' as canonical name))
+ $(call am.error,variable '$1' is defined but no program) \
+ $(call am.error, or library has '$($0/canon)' as canonical name))
endef
# The variables candidate for checking of typos.
diff --git a/lib/am/compile.am b/lib/am/compile.am
index ceb5c9d..ce235c0 100644
--- a/lib/am/compile.am
+++ b/lib/am/compile.am
@@ -20,7 +20,7 @@ AM_DEFAULT_INCLUDES = \
## We want '-I. -I$(srcdir)', but the latter -I is redundant and
## unaesthetic in non-VPATH builds, so get rid of it if it is not
## actually needed.
- $(call am__uniq, -I. -I$(srcdir) \
+ $(call am.util.uniq, -I. -I$(srcdir) \
$(foreach am__h, $(AM_CONFIG_HEADERS), \
$(patsubst %/,%,-I$(dir $(am__h)))))))
else !%?STDINC%
diff --git a/lib/am/configure.am b/lib/am/configure.am
index 9c55e6e..34b2d32 100644
--- a/lib/am/configure.am
+++ b/lib/am/configure.am
@@ -71,7 +71,7 @@
## Avoid the "deleted header file" problem for the dependencies.
?HAVE-MAKEFILE-IN-DEPS?%MAKEFILE-IN-DEPS%:
-am__dist_common += %MAKEFILE-AM%
+am.dist.common-files += %MAKEFILE-AM%
## --------------------------- ##
@@ -83,7 +83,7 @@ if %?TOPDIR_P%
## don't exist. This is especially important for configure, since it
## won't be created until autoconf is run -- which might be after
## automake is run.
-am__dist_common += $(top_srcdir)/configure $(am__configure_deps)
+am.dist.common-files += $(top_srcdir)/configure $(am__configure_deps)
endif %?TOPDIR_P%
$(top_builddir)/config.status: $(top_srcdir)/configure
$(CONFIG_STATUS_DEPENDENCIES)
diff --git a/lib/am/data.am b/lib/am/data.am
index 7417266..379bc15 100644
--- a/lib/am/data.am
+++ b/lib/am/data.am
@@ -96,5 +96,5 @@ endif %?INSTALL%
## -------------- ##
if %?DIST%
-am__dist_common += %DISTVAR%
+am.dist.common-files += %DISTVAR%
endif %?DIST%
diff --git a/lib/am/distdir.am b/lib/am/distdir.am
index fd2c39d..d16cc1d 100644
--- a/lib/am/distdir.am
+++ b/lib/am/distdir.am
@@ -14,24 +14,24 @@
## You should have received a copy of the GNU General Public License
## along with this program. If not, see <http://www.gnu.org/licenses/>.
-am__dist_common += %DIST-COMMON%
+am.dist.common-files += %DIST-COMMON%
-## Use 'sort', not 'am__uniq', for performance reasons. Luckily, we
+## Use 'sort', not 'am.util.uniq', for performance reasons. Luckily, we
## don't care in which order the distributed files are.
-am__dist_files = $(call am__memoize,am__dist_files,$(strip $(sort \
- $(am__dist_common) $(am__dist_sources) $(TEXINFOS) $(EXTRA_DIST))))
+am.dist.all-files = $(call am__memoize,am.dist.all-files,$(strip $(sort \
+ $(am.dist.common-files) $(am.dist.sources) $(TEXINFOS) $(EXTRA_DIST))))
-## Try to avoid repeated slashed in the entries, to make the
-## filtering in the 'am__dist_files_1' definition below more reliable.
-## This idiom should compress up to four consecutive '/' characters in
-## each $(am__dist_files) entry.
-am__dist_files_1 = $(call am__memoize,am__dist_files_1, \
- $(subst //,/,$(subst //,/,$(am__dist_files))))
+## Try to avoid repeated slashes in the entries, to make the filtering
+## in the 'am.dist.files-tmp2' definition below more reliable.
+## This idiom should compress up to four consecutive '/' characters
+## in each $(am.dist.all-files) entry.
+am.dist.files-tmp1 = $(call am__memoize,am.dist.files-tmp1, \
+ $(subst //,/,$(subst //,/,$(am.dist.all-files))))
-am__dist_files_2 = $(call am__memoize,am__dist_files_2, \
+am.dist.files-tmp2 = $(call am__memoize,am.dist.files-tmp2, \
## Files filtered out here require an ad-hoc "munging"; see the two
## following 'patsubst's.
- $(filter-out $(srcdir)/% $(top_srcdir)/%, $(am__dist_files_1)) \
+ $(filter-out $(srcdir)/% $(top_srcdir)/%, $(am.dist.files-tmp1)) \
## Let's strip leading $(srcdir) (which might appears in EXTRA_DIST,
## especially if one want to use the $(wildcard) built-in in there),
## so that in our 'distdir' recipe below we can loop on the list of
@@ -44,18 +44,18 @@ am__dist_files_2 = $(call am__memoize,am__dist_files_2, \
## present in mainstream Automake, and concerns only such corner-case
## situations that it's probably not worth worrying about.
$(patsubst $(srcdir)/%, %, \
- $(filter $(srcdir)/%, $(am__dist_files_1))) \
+ $(filter $(srcdir)/%, $(am.dist.files-tmp1))) \
## Also rewrite $(top_srcdir) -- which can sometimes appear in
-## $(am__dist_common), and can be absolute -- by $(top_builddir)
+## $(am.dist.common-files), and can be absolute -- by $(top_builddir)
## (which is always relative). If needed, $(srcdir) will be
## prepended later by our VPATH-aware rules.
## The same caveats reported above apply.
$(patsubst $(top_srcdir)/%, $(top_builddir)/%, \
- $(filter $(top_srcdir)/%, $(am__dist_files_1))))
+ $(filter $(top_srcdir)/%, $(am.dist.files-tmp1))))
## Strip extra whitespaces, for more safety.
-am__dist_files_cooked = \
- $(call am__memoize,am__dist_files_cooked,$(strip $(am__dist_files_2)))
+am.dist.files-cooked = \
+ $(call am__memoize,am.dist.files-cooked,$(strip $(am.dist.files-tmp2)))
## Given the pre-processing done above to the list of distributed files,
## this definition ensures that we won't try to create the wrong
@@ -65,9 +65,9 @@ am__dist_files_cooked = \
## will allow our rules to correctly create "$(distdir)/subdir", and not
## "$(distdir)/$(srcdir)/subdir" -- which, in a VPATH build where
## "$(subdir) = ..", would be the build directory!
-am__dist_parent_dirs = \
- $(call am__memoize,am__dist_parent_dirs,$(strip $(sort \
- $(filter-out ., $(patsubst ./%,%,$(dir $(am__dist_files_cooked)))))))
+am.dist.parent-dirs = \
+ $(call am__memoize,am.dist.parent-dirs,$(strip $(sort \
+ $(filter-out ., $(patsubst ./%,%,$(dir $(am.dist.files-cooked)))))))
am.mkdir-for-dist = \
@$(MKDIR_P) $(patsubst %,"$(distdir)"/%,$1)$(am__newline)
@@ -101,7 +101,7 @@ if %?SUBDIRS%
## - DIR2 relative pathname, relative to the current directory
## Output:
## - reldir relative pathname of DIR2, relative to DIR1
-am__relativize = \
+am.dist.relativize-path = \
dir0=`pwd`; \
sed_first='s,^\([^/]*\)/.*$$,\1,'; \
sed_rest='s,^[^/]*/*,,'; \
@@ -133,7 +133,7 @@ if %?SUBDIRS%
AM_RECURSIVE_TARGETS += distdir
endif %?SUBDIRS%
-distdir: $(am__dist_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.
@@ -157,7 +157,7 @@ if %?TOPDIR_P%
endif %?TOPDIR_P%
## Make the subdirectories for the files, avoiding to exceed command
## line length limitations.
- $(call am.xargs-map,am.mkdir-for-dist,$(am__dist_parent_dirs))
+ $(call am.xargs-map,am.mkdir-for-dist,$(am.dist.parent-dirs))
## Install the files and directories, applying a "VPATH rewrite"
## by hand where needed.
## To get the files in the distribution directory, use 'cp', not 'ln'.
@@ -166,7 +166,7 @@ endif %?TOPDIR_P%
## easily happen if "gettextize" was run on the distribution.
@rm -f $(am__dir)/address@hidden
$(call am.xargs-map,am.write-list-of-distfiles, \
- $(am__dist_files_cooked))
+ $(am.dist.files-cooked))
@while read file; do \
## Always look for the file or directory to distribute in the build
## directory first, in VPATH spirit.
@@ -212,15 +212,15 @@ 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; \
dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
- $(am__relativize); \
+ $(am.dist.relativize-path); \
new_distdir=$$reldir; \
dir1=$$subdir; dir2="$(top_distdir)"; \
- $(am__relativize); \
+ $(am.dist.relativize-path); \
new_top_distdir=$$reldir; \
echo " (cd $$subdir && $(MAKE) top_distdir="$$new_top_distdir"
distdir="$$new_distdir" \\"; \
echo " am__remove_distdir=: am__skip_length_check=:
am__skip_mode_fix=: distdir)"; \
diff --git a/lib/am/header-vars.am b/lib/am/header-vars.am
index 0549eaa..eb1df5f 100644
--- a/lib/am/header-vars.am
+++ b/lib/am/header-vars.am
@@ -32,29 +32,29 @@ MAKEFLAGS += --no-builtin-rules
## Declare an error, without immediately terminating the execution (proper
## code will take care later of that). This will allow us to diagnose more
## issues at once, rather than stopping at the first one.
-am__seen_error :=
-define am__error
-$(warning $1)$(eval am__seen_error := yes)
+am.error.seen :=
+define am.error
+$(warning $1)$(eval am.error.seen := yes)
endef
# Some problematic characters (especially when used in arguments
# to make functions, or for syntax highlighting).
-am__bslash := \\
-am__comma := ,
-am__dollar := $$
-am__pound := \#
-am__lparen := (
-am__rparen := )
-am__bquote := `
-am__dquote := "
-am__squote := '
+am.chars.bslash := \\
+am.chars.comma := ,
+am.chars.dollar := $$
+am.chars.hash := \#
+am.chars.lparen := (
+am.chars.rparen := )
+am.chars.bquote := `
+am.chars.dquote := "
+am.chars.squote := '
# "` # Fix font-lock.
# A literal newline character, that does not get stripped if used
# at the end of the expansion of another macro.
define am__newline
-$(am__empty)
+$(am.chars.empty)
endef
## Makefiles generated by Automake-NG require GNU make >= 3.81.
@@ -116,7 +116,7 @@ am__sh_e_setup = case $$- in *e*) set +e;; esac
## Emulate VPATH rewrites. This uses only GNU make primitives, which
## allows us to avoid extra forks.
-am__vpath_rewrite = \
+am.vpath.rewrite = \
$(firstword $(wildcard $(strip $(1))) $(srcdir)/$(strip $(1)))
## We used to define this. However, we don't because vendor makes
@@ -136,37 +136,38 @@ 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))),, \
$(findstring n,$(am__v))))), \
true, false))
-# An empty strings. It only serves to make the code readable
-# in some places.
-am__empty :=
+# An empty string. It can be very useful to "fool" the make parser w.r.t.
+# whitespace handling, and allow us to obtain tricky semantics. See the
+# definition of $(am__newline) below for a significant example.
+am.chars.empty :=
-am__strip_firstword = $(wordlist 2,$(words $(1)),$(1))
-am__strip_lastword = $(wordlist 2,$(words $(1)),dummy $(1))
+am.util.strip-first-word = $(wordlist 2,$(words $(1)),$(1))
+am.util.strip-last-word = $(wordlist 2,$(words $(1)),dummy $(1))
## Remove repeated elements from the given list (without reordering),
## and return the reduced list.
-am__uniq = $(strip \
+am.util.uniq = $(strip \
## If the list is empty, we have nothing to do. Otherwise, go on.
$(if $(strip $(1)), \
## Call the function recursively on the list of all the elements
## but the last one.
- $(call am__uniq, \
- $(call am__strip_lastword, $(1))) \
+ $(call $0, \
+ $(call am.util.strip-last-word, $(1))) \
## And append the last element, unless it was already present.
$(if $(filter $(lastword $(1)), \
- $(call am__strip_lastword, $(1))), \
- $(am__empty), \
+ $(call am.util.strip-last-word, $(1))), \
+ $(am.chars.empty), \
$(lastword $(1)))))
-?HANDLE-EXEEXT?am__handle_exeext := yes
-?!HANDLE-EXEEXT?am__handle_exeext := no
+?HANDLE-EXEEXT?am.conf.handle-exeext := yes
+?!HANDLE-EXEEXT?am.conf.handle-exeext := no
## These definitions have been generated by the following Bash 4 script:
##
@@ -177,24 +178,24 @@ am__uniq = $(strip \
## toupper="\$(subst $c,$C,$toupper)"
## tolower="\$(subst $C,$c,$tolower)"
## done
-## echo "am__tolower = $tolower"
-## echo "am__toupper = $toupper"
+## echo "am.util.tolower = $tolower"
+## echo "am.util.toupper = $toupper"
-am__tolower = $(subst Z,z,$(subst Y,y,$(subst X,x,$(subst W,w,$(subst
V,v,$(subst U,u,$(subst T,t,$(subst S,s,$(subst R,r,$(subst Q,q,$(subst
P,p,$(subst O,o,$(subst N,n,$(subst M,m,$(subst L,l,$(subst K,k,$(subst
J,j,$(subst I,i,$(subst H,h,$(subst G,g,$(subst F,f,$(subst E,e,$(subst
D,d,$(subst C,c,$(subst B,b,$(subst A,a,$1))))))))))))))))))))))))))
+am.util.tolower = $(subst Z,z,$(subst Y,y,$(subst X,x,$(subst W,w,$(subst
V,v,$(subst U,u,$(subst T,t,$(subst S,s,$(subst R,r,$(subst Q,q,$(subst
P,p,$(subst O,o,$(subst N,n,$(subst M,m,$(subst L,l,$(subst K,k,$(subst
J,j,$(subst I,i,$(subst H,h,$(subst G,g,$(subst F,f,$(subst E,e,$(subst
D,d,$(subst C,c,$(subst B,b,$(subst A,a,$1))))))))))))))))))))))))))
-am__toupper = $(subst z,Z,$(subst y,Y,$(subst x,X,$(subst w,W,$(subst
v,V,$(subst u,U,$(subst t,T,$(subst s,S,$(subst r,R,$(subst q,Q,$(subst
p,P,$(subst o,O,$(subst n,N,$(subst m,M,$(subst l,L,$(subst k,K,$(subst
j,J,$(subst i,I,$(subst h,H,$(subst g,G,$(subst f,F,$(subst e,E,$(subst
d,D,$(subst c,C,$(subst b,B,$(subst a,A,$1))))))))))))))))))))))))))
+am.util.toupper = $(subst z,Z,$(subst y,Y,$(subst x,X,$(subst w,W,$(subst
v,V,$(subst u,U,$(subst t,T,$(subst s,S,$(subst r,R,$(subst q,Q,$(subst
p,P,$(subst o,O,$(subst n,N,$(subst m,M,$(subst l,L,$(subst k,K,$(subst
j,J,$(subst i,I,$(subst h,H,$(subst g,G,$(subst f,F,$(subst e,E,$(subst
d,D,$(subst c,C,$(subst b,B,$(subst a,A,$1))))))))))))))))))))))))))
# Canonicalize the given filename. See also the &canonicalize function
# in the automake script.
-am__canon = $(strip \
+am.util.canon = $(strip \
$(subst ~,_,\
$(subst },_,\
$(subst |,_,\
$(subst {,_,\
- $(subst $(am__bquote),_,\
+ $(subst $(am.chars.bquote),_,\
$(subst ^,_,\
- $(subst $(am__bslash),_,\
+ $(subst $(am.chars.bslash),_,\
$(subst [,_,\
$(subst ],_,\
$(subst ?,_,\
@@ -206,17 +207,17 @@ am__canon = $(strip \
$(subst /,_,\
$(subst .,_,\
$(subst -,_,\
- $(subst $(am__comma),_,\
+ $(subst $(am.chars.comma),_,\
$(subst +,_,\
$(subst *,_,\
- $(subst $(am__lparen),_,\
- $(subst $(am__rparen),_,\
- $(subst $(am__squote),_,\
+ $(subst $(am.chars.lparen),_,\
+ $(subst $(am.chars.rparen),_,\
+ $(subst $(am.chars.squote),_,\
$(subst &,_,\
$(subst %,_,\
- $(subst $(am__dollar),_,\
- $(subst $(am__pound),_,\
- $(subst $(am__dquote),_,\
+ $(subst $(am.chars.dollar),_,\
+ $(subst $(am.chars.hash),_,\
+ $(subst $(am.chars.dquote),_,\
$(subst !,_,$1)))))))))))))))))))))))))))))))
@@ -243,19 +244,19 @@ am__canon = $(strip \
am__memoize = $(or $(am__memoized_value/$1),$(strip \
$(eval am__memoized_value/$1 := $$2))$(am__memoized_value/$1))
-## $(call am__strip_suffixes, SUFFIXES, LIST)
-## ------------------------------------------
+## $(call am.util.strip-suffixes, SUFFIXES, LIST)
+## ----------------------------------------------
## Strip any of the SUFFIXES from each of the entries of LIST. Even if an
## entry of LIST terminates with several suffixes, only one is stripped:
## the first one that matches.
-am__private_suffix = .,;&!@
-am__strip_suffixes = $(strip \
+am.hack.private-suffix = .,;&!@
+am.util.strip-suffixes = $(strip \
$(if \
$(strip $1), \
- $(patsubst %$(am__private_suffix),%, \
- $(call am__strip_suffixes, \
- $(call am__strip_firstword,$1), \
- $(patsubst %$(firstword $1),%$(am__private_suffix),$2))), \
+ $(patsubst %$(am.hack.private-suffix),%, \
+ $(call $0, \
+ $(call am.util.strip-first-word,$1), \
+ $(patsubst %$(firstword $1),%$(am.hack.private-suffix),$2))), \
$2))
# Helper variables and function to help in recipes that could exceed
diff --git a/lib/am/java.am b/lib/am/java.am
index 7b52bdc..7849344 100644
--- a/lib/am/java.am
+++ b/lib/am/java.am
@@ -90,5 +90,5 @@ am__clean_files += class%NDIR%.stamp
## -------------- ##
if %?DIST%
-am__dist_common += %DISTVAR%
+am.dist.common-files += %DISTVAR%
endif %?DIST%
diff --git a/lib/am/lisp.am b/lib/am/lisp.am
index 7b61e34..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
@@ -149,5 +149,5 @@ am__clean_files += elc-stamp $(ELCFILES)
## -------------- ##
if %?DIST%
-am__dist_common += %DISTVAR%
+am.dist.common-files += %DISTVAR%
endif %?DIST%
diff --git a/lib/am/parallel-tests.am b/lib/am/parallel-tests.am
index 83b90d5..be9fdd1 100644
--- a/lib/am/parallel-tests.am
+++ b/lib/am/parallel-tests.am
@@ -26,7 +26,7 @@ include color-tests.am
## (among them, TAP).
## Used by (at least) 'check-typos.am'.
-am__using_parallel_tests := yes
+am.conf.using-parallel-tests := yes
am__is_xfail_test = \
$(if $(filter-out $(am__xfail_test_bases), \
@@ -64,7 +64,7 @@ am__runtest = \
## Turn e.g., ".test" in "_TEST", and return the empty string unchanged.
am__tpfx = \
- $(if $1,$(call am__toupper,$(patsubst .%,%_,$1)))
+ $(if $1,$(call am.util.toupper,$(patsubst .%,%_,$1)))
!define am__handle_per_suffix_test
!
@@ -75,12 +75,12 @@ am__tpfx = \
!%.log %.trs: %$1 $$($$(call am__tpfx,$1)LOG_DEPENDENCIES)
! @$$(call am__runtest,$$(call am__tpfx,$1))
!
-!ifeq ($(am__handle_exeext),yes)
+!ifeq ($(am.conf.handle-exeext),yes)
!ifdef EXEEXT
!%.log %.trs: %$1$(EXEEXT) $$($$(call am__tpfx,$1)LOG_DEPENDENCIES)
! @$$(call am__runtest,$$(call am__tpfx,$1))
!endif # defined EXEEXT
-!endif # am__handle_exeext = yes
+!endif # am.conf.handle-exeext = yes
!
!endef # am__handle_per_suffix_test
!
@@ -88,7 +88,7 @@ am__tpfx = \
## FIXME: we want that?
!TEST_EXTENSIONS ?= .test
!$(foreach am__e,$(filter-out .%,$(TEST_EXTENSIONS)),\
-! $(call am__error,invalid test extension: '$(am__e)'))
+! $(call am.error,invalid test extension: '$(am__e)'))
!$(foreach am__e,$(TEST_EXTENSIONS), \
! $(eval $(call am__handle_per_suffix_test,$(am__e))))
## It is *imperative* that the "empty" suffix goes last. Otherwise, a
@@ -109,7 +109,7 @@ am__tpfx = \
# where removing the $(srcdir) from the $(wildcard) invocation would
# cause the idiom to break in VPATH builds.
am__get_test_bases = $(patsubst $(srcdir)/%,%,$(strip \
-$(call am__strip_suffixes, $(TEST_EXTENSIONS), \
+$(call am.util.strip-suffixes, $(TEST_EXTENSIONS), \
?!HANDLE-EXEEXT? $(1))))
?HANDLE-EXEEXT? $(patsubst %$(EXEEXT),%,$(1)))))
diff --git a/lib/am/python.am b/lib/am/python.am
index c2226cd..1ec6fbc 100644
--- a/lib/am/python.am
+++ b/lib/am/python.am
@@ -126,5 +126,5 @@ endif %?INSTALL%
## -------------- ##
if %?DIST%
-am__dist_common += %DISTVAR%
+am.dist.common-files += %DISTVAR%
endif %?DIST%
diff --git a/lib/am/scripts.am b/lib/am/scripts.am
index 6ae3362..f15edcb 100644
--- a/lib/am/scripts.am
+++ b/lib/am/scripts.am
@@ -95,7 +95,7 @@ endif %?INSTALL%
## -------------- ##
if %?DIST%
-am__dist_common += %DISTVAR%
+am.dist.common-files += %DISTVAR%
endif %?DIST%
diff --git a/lib/am/serial-tests.am b/lib/am/serial-tests.am
index af5e7b5..7a8f071 100644
--- a/lib/am/serial-tests.am
+++ b/lib/am/serial-tests.am
@@ -21,7 +21,7 @@ include color-tests.am
if %?HANDLE-EXEEXT%
## This is suboptimal, but we need to preserve the order of $(TESTS).
am__check_cook_with_exeext_1 = \
- $(if $(filter $(am__all_progs), $1), $1$(EXEEXT), $1)
+ $(if $(filter $(am.all-progs), $1), $1$(EXEEXT), $1)
am__check_cook_with_exeext = $(strip \
$(if $(EXEEXT), $(foreach am__t, $1, $(call $(0)_1, $(am__t))), $1))
else !%?HANDLE-EXEEXT%
diff --git a/lib/am/texi-vers.am b/lib/am/texi-vers.am
index 4c13130..0608e0b 100644
--- a/lib/am/texi-vers.am
+++ b/lib/am/texi-vers.am
@@ -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/>.
-am__dist_common += %VTEXI% %STAMPVTI%
+am.dist.common-files += %VTEXI% %STAMPVTI%
## Don't give this rule a command (even '@:').
## %STAMPVTI% is always newer than %VTEXI%, so this rule is always
diff --git a/syntax-checks.mk b/syntax-checks.mk
index 7bd071f..b1e1203 100644
--- a/syntax-checks.mk
+++ b/syntax-checks.mk
@@ -321,9 +321,9 @@ sc_no_am_makeflags:
fi
# Modern names for internal variables that had a bad name once.
-modern.DISTFILES = am__dist_files
-modern.DIST_COMMON = am__dist_common
-modern.DIST_SOURCES = am__dist_sources
+modern.DISTFILES = am.dist.all-files
+modern.DIST_COMMON = am.dist.common-files
+modern.DIST_SOURCES = am.dist.sources
modern.am__TEST_BASES = am__test_bases
modern.am__TEST_LOGS = am__test_logs
modern.am__TEST_RESULTS = am__test_results
@@ -348,9 +348,6 @@ $(sc_renamed_variables_rules): sc_no_% :
fi
# Variables whose name is prone to typos.
-fixtypo.am__distfiles = am__dist_files
-fixtypo.am__distcommon = am__dist_common
-fixtypo.am__distsources = am__dist_sources
define typos-for-clean
diff --git a/t/all-prog-libs.sh b/t/all-prog-libs.sh
index 60da56c..8332800 100755
--- a/t/all-prog-libs.sh
+++ b/t/all-prog-libs.sh
@@ -15,9 +15,9 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Test internal automake variables:
-# - $(am__all_progs).
-# - $(am__all_libs).
-# - $(am__all_ltlibs).
+# - $(am.all-progs).
+# - $(am.all-libs).
+# - $(am.all-ltlibs).
. ./defs || exit 1
@@ -62,13 +62,13 @@ my_SCRIPTS = x5
.PHONY: debug test
debug:
- @echo PROGS-BEG: $(am__all_progs) :PROGS-END
- @echo LIBS-BEG: $(am__all_libs) :LIBS-END
+ @echo PROGS-BEG: $(am.all-progs) :PROGS-END
+ @echo LIBS-BEG: $(am.all-libs) :LIBS-END
@echo LTLIBS-BEG: $(am__all_ltlibs) :LTLIBS-END
test: debug
- test '$(am__all_progs)' = 'p1 p2 p3 p4 p5'
- test '$(am__all_libs)' = 'lib01.a lib02.a lib03.a lib04.a lib05.a'
- test '$(am__all_ltlibs)' = 'lib1.la lib2.la lib3.la lib4.la lib5.la'
+ test '$(am.all-progs)' = 'p1 p2 p3 p4 p5'
+ test '$(am.all-libs)' = 'lib01.a lib02.a lib03.a lib04.a lib05.a'
+ test '$(am.all-ltlibs)' = 'lib1.la lib2.la lib3.la lib4.la lib5.la'
END
: > ltmain.sh
diff --git a/t/autodist-aclocal-m4.sh b/t/autodist-aclocal-m4.sh
index f879dea..1c86490 100755
--- a/t/autodist-aclocal-m4.sh
+++ b/t/autodist-aclocal-m4.sh
@@ -34,7 +34,7 @@ cat > Makefile.am <<'END'
test: distdir
ls -l $(distdir)
test ! -f $(distdir)/aclocal.m4
- echo $(am__dist_files) $(am__dist_common) \
+ echo $(am.dist.all-files) $(am.dist.common-files) \
| grep 'aclocal\.m4' && exit 1; :
check-local: test
END
diff --git a/t/autodist-configure-no-subdir.sh
b/t/autodist-configure-no-subdir.sh
index 458142c..dbb62c9 100755
--- a/t/autodist-configure-no-subdir.sh
+++ b/t/autodist-configure-no-subdir.sh
@@ -47,7 +47,7 @@ configure:
configure.ac:
$(dontbuild)
check-local:
- echo $(am__dist_files) $(am__dist_common) \
+ echo $(am.dist.all-files) $(am.dist.common-files) \
| grep 'configure' && exit 1; :
END
diff --git a/t/autodist-stamp-vti.sh b/t/autodist-stamp-vti.sh
index 5944f30..9731010 100755
--- a/t/autodist-stamp-vti.sh
+++ b/t/autodist-stamp-vti.sh
@@ -30,7 +30,7 @@ info_TEXINFOS = foo.texi
.PHONY: test
test: all distdir
ls -l $(distdir)
- echo ' ' $(am__dist_common) ' ' | grep '[ /]stamp-vti '
+ echo ' ' $(am.dist.common-files) ' ' | grep '[ /]stamp-vti '
test -f $(distdir)/stamp-vti
END
diff --git a/t/autodist-subdir.sh b/t/autodist-subdir.sh
index 657dcc2..2b76c5d 100755
--- a/t/autodist-subdir.sh
+++ b/t/autodist-subdir.sh
@@ -48,8 +48,8 @@ cat > Makefile.am <<'END'
SUBDIRS = sub
check-local:
## For debugging.
- @echo am__dist_common:
- @for f in $(am__dist_common); do echo " $$f"; done
+ @echo am.dist.common-files:
+ @for f in $(am.dist.common-files); do echo " $$f"; done
@echo DISTDIR:
@ls -l $(distdir) | sed 's/^/ /'
## Now the checks.
@@ -66,8 +66,8 @@ cat > sub/Makefile.am <<'END'
include distfiles.am
check-local:
## For debugging.
- @echo am__dist_common:
- @for f in $(am__dist_common); do echo " $$f"; done
+ @echo am.dist.common-files:
+ @for f in $(am.dist.common-files); do echo " $$f"; done
@echo DISTDIR:
@ls -l $(distdir) | sed 's/^/ /'
## Now the checks.
@@ -76,7 +76,7 @@ check-local:
## Some filenames might contain dots, but this won't cause spurious
## failures, and "spurious successes" are so unlikely that they're
## not worth worrying about.
- echo ' ' $(am__dist_common) ' ' | grep "[ /]$$f " >/dev/null \
+ echo ' ' $(am.dist.common-files) ' ' | grep "[ /]$$f " >/dev/null \
|| { echo $$f: distcom fail >&2; exit 1; }; \
done
END
diff --git a/t/autodist.sh b/t/autodist.sh
index 2ec7418..0f6c2de 100755
--- a/t/autodist.sh
+++ b/t/autodist.sh
@@ -47,8 +47,8 @@ cat > Makefile.am <<'END'
include distfiles.am
check-local:
## For debugging.
- @echo am__dist_common:
- @for f in $(am__dist_common); do echo " $$f"; done
+ @echo am.dist.common-files:
+ @for f in $(am.dist.common-files); do echo " $$f"; done
@echo DISTDIR:
@ls -l $(distdir) | sed 's/^/ /'
## Now the checks.
@@ -59,7 +59,7 @@ check-local:
## Some filenames might contain dots, but this won't cause spurious
## failures, and "spurious successes" are so unlikely that they're
## not worth worrying about.
- echo ' ' $(am__dist_common) ' ' | grep "[ /]$$f " >/dev/null \
+ echo ' ' $(am.dist.common-files) ' ' | grep "[ /]$$f " >/dev/null \
|| { echo $$f: distcom fail >&2; exit 1; }; \
done
END
diff --git a/t/clean-many.sh b/t/clean-many.sh
index 3f3d9a7..81bf837 100755
--- a/t/clean-many.sh
+++ b/t/clean-many.sh
@@ -49,11 +49,11 @@ while test $i -le 17; do
cat t t > t2
mv -f t2 t
done
-(echo 'files = \' && sed 's/$/ \\/' t && echo '$(am__empty)') > files.mk
+(echo 'files = \' && sed '$!s/$/ \\/' t) > files.mk
rm -f t
-# 2^17 + 2 = 131074.
-test $(wc -l <files.mk) -eq 65538 || fatal_ "populating 'files.mk'"
+# 2^17 + 1 = 65537.
+test $(wc -l <files.mk) -eq 65537 || fatal_ "populating 'files.mk'"
touch foo bar
$MAKE maintainer-clean
diff --git a/t/clean-many2.sh b/t/clean-many2.sh
index e7505be..61284ed 100755
--- a/t/clean-many2.sh
+++ b/t/clean-many2.sh
@@ -59,7 +59,7 @@ done
# Sanity check.
rm -f $(cat t) && fatal_ "setting up 'rm' wrapper"
-(echo 'files = \' && sed 's/$/ \\/' t && echo '$(am__empty)') >files.am
+(echo 'files = \' && sed '$!s/$/ \\/' t) >files.am
rm -f t
$ACLOCAL
diff --git a/t/colon5.sh b/t/colon5.sh
index aac3c22..4fe7b51 100755
--- a/t/colon5.sh
+++ b/t/colon5.sh
@@ -39,7 +39,7 @@ test-grep:
grep '=GrEp$(empty)Me_am=' Makefile
grep '=GrEp$(empty)Me_dep=' Makefile
test-distcommon:
- echo ' ' $(am__dist_common) ' ' | grep '[ /]Makefile.dep '
+ echo ' ' $(am.dist.common-files) ' ' | grep '[ /]Makefile.dep '
test-distdir: distdir
test -f $(distdir)/Makefile.dep
END
diff --git a/t/colon7.sh b/t/colon7.sh
index 4254c5b..8dc623f 100755
--- a/t/colon7.sh
+++ b/t/colon7.sh
@@ -33,10 +33,10 @@ mkdir subdir
: > Makefile.am
: > subdir/foo
cat > subdir/Makefile.am << 'END'
-# am__dist_common should contain 'foo', not 'subdir/foo'.
+# am.dist.common-files should contain 'foo', not 'subdir/foo'.
test:
- case '$(am__dist_common)' in *subdir/foo*) exit 1;; *) exit 0;; esac
- echo ' ' $(am__dist_common) ' ' | grep '[ /]foo '
+ case '$(am.dist.common-files)' in *subdir/foo*) exit 1;; *) exit 0;;
esac
+ echo ' ' $(am.dist.common-files) ' ' | grep '[ /]foo '
.PHONY: test
END
diff --git a/t/confh.sh b/t/confh.sh
index 6da0429..03b5a0b 100755
--- a/t/confh.sh
+++ b/t/confh.sh
@@ -27,8 +27,8 @@ END
cat > Makefile.am << 'END'
.PHONY: test1 test2
test1:
- @echo am__dist_common = $(am__dist_common)
- echo ' ' $(am__dist_common) ' ' | grep '[ /]include/config\.h\.in '
+ @echo am.dist.common-files = $(am.dist.common-files)
+ echo ' ' $(am.dist.common-files) ' ' | grep '[ /]include/config\.h\.in '
test2: distdir
ls -l $(distdir)/*
test -f $(distdir)/include/config.h.in
diff --git a/t/confh8.sh b/t/confh8.sh
index 009ae30..dd83c4e 100755
--- a/t/confh8.sh
+++ b/t/confh8.sh
@@ -27,11 +27,11 @@ END
cat > Makefile.am << 'END'
.PHONY: test0 test1 test2
test0:
- @echo am__dist_common = $(am__dist_common)
- echo ' ' $(am__dist_common) ' ' | grep '[ /]one\.h\.in '
- echo ' ' $(am__dist_common) ' ' | grep '[ /]two\.h\.in '
+ @echo am.dist.common-files = $(am.dist.common-files)
+ echo ' ' $(am.dist.common-files) ' ' | grep '[ /]one\.h\.in '
+ echo ' ' $(am.dist.common-files) ' ' | grep '[ /]two\.h\.in '
# Processed header files should not be distributed.
- if echo ' ' $(am__dist_common) ' ' | grep '\.h '; then \
+ if echo ' ' $(am.dist.common-files) ' ' | grep '\.h '; then \
exit 1; \
else \
exit 0; \
diff --git a/t/depdist.sh b/t/depdist.sh
index 103308e..e8baf26 100755
--- a/t/depdist.sh
+++ b/t/depdist.sh
@@ -43,7 +43,7 @@ SUBDIRS = subdir
check-local: test1 test2
.PHONY: test1 test2
test1:
- echo ' ' $(am__dist_common) ' ' | grep '[ /]config/depcomp '
+ echo ' ' $(am.dist.common-files) ' ' | grep '[ /]config/depcomp '
test2: distdir
ls -l $(distdir)/*
test -f $(distdir)/config/depcomp
diff --git a/t/dist-auxfile.sh b/t/dist-auxfile.sh
index baa8d27..763b14e 100755
--- a/t/dist-auxfile.sh
+++ b/t/dist-auxfile.sh
@@ -47,10 +47,10 @@ END
SUBDIRS = subdir
test: distdir
ls -l $(distdir) $(distdir)/* # For debugging.
- @echo am__dist_common = $(am__dist_common) # Likewise.
- echo ' ' $(am__dist_common) ' ' | grep '[ /]$(auxdir)foo.txt '
- echo ' ' $(am__dist_common) ' ' | grep '[ /]$(auxdir)bar.sh '
- echo ' ' $(am__dist_common) ' ' | grep '[ /]$(auxdir)zardoz '
+ @echo am.dist.common-files = $(am.dist.common-files) # Likewise.
+ echo ' ' $(am.dist.common-files) ' ' | grep '[ /]$(auxdir)foo.txt '
+ echo ' ' $(am.dist.common-files) ' ' | grep '[ /]$(auxdir)bar.sh '
+ echo ' ' $(am.dist.common-files) ' ' | grep '[ /]$(auxdir)zardoz '
test -f $(distdir)/$(auxdir)foo.txt
test -f $(distdir)/$(auxdir)bar.sh
test -f $(distdir)/$(auxdir)zardoz
diff --git a/t/dist-many.sh b/t/dist-many.sh
index e006c01..3fd0cb4 100755
--- a/t/dist-many.sh
+++ b/t/dist-many.sh
@@ -49,11 +49,10 @@ while test $i -le $count; do
done > t
set -x # Re-enable shell traces.
echo 'EXTRA_DIST = \' >> Makefile.am
-sed 's/$/ \\/' t >> Makefile.am
-echo '$(am__empty)' >> Makefile.am
+sed '$!s/$/ \\/' t >> Makefile.am
rm -f t
-test $(wc -l <Makefile.am) -eq $(( 2 + (3 * $count) )) \
+test $(wc -l <Makefile.am) -eq $(( 1 + (3 * $count) )) \
|| fatal_ "populating 'EXTRA_DIST'"
$ACLOCAL
diff --git a/t/dist-many2.sh b/t/dist-many2.sh
index cd39a71..90c527b 100755
--- a/t/dist-many2.sh
+++ b/t/dist-many2.sh
@@ -86,11 +86,10 @@ while test $i -le $count; do
done > t
set -x # Re-enable shell traces.
echo 'EXTRA_DIST = \' >> Makefile.am
-sed 's/$/ \\/' t >> Makefile.am
-echo '$(am__empty)' >> Makefile.am
+sed '$!s/$/ \\/' t >> Makefile.am
rm -f t
-test $(wc -l <Makefile.am) -eq $(( 2 + (3 * $count) )) \
+test $(wc -l <Makefile.am) -eq $(( 1 + (3 * $count) )) \
|| fatal_ "populating 'EXTRA_DIST'"
$ACLOCAL
diff --git a/t/distcom-subdir.sh b/t/distcom-subdir.sh
index c6b6926..3774a75 100755
--- a/t/distcom-subdir.sh
+++ b/t/distcom-subdir.sh
@@ -41,7 +41,7 @@ mkdir subdir
cat > subdir/Makefile.am << 'END'
.PHONY: test-distcom
test-distcom:
- echo ' ' $(am__dist_common) ' ' | $(FGREP) ' $(top_srcdir)/depcomp '
+ echo ' ' $(am.dist.common-files) ' ' | $(FGREP) ' $(top_srcdir)/depcomp
'
END
$ACLOCAL
@@ -53,7 +53,7 @@ cat >> subdir/Makefile.am << 'END'
bin_PROGRAMS = foo
.PHONY: test-distcom
test-distcom:
- echo ' ' $(am__dist_common) ' ' | $(FGREP) ' $(top_srcdir)/depcomp '
+ echo ' ' $(am.dist.common-files) ' ' | $(FGREP) ' $(top_srcdir)/depcomp
'
check-local: test-distcom
END
diff --git a/t/distcom2.sh b/t/distcom2.sh
index 28cc53b..b96eefd 100755
--- a/t/distcom2.sh
+++ b/t/distcom2.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 to make sure that depcomp and compile are added to am__dist_common.
+# Test to make sure that depcomp and compile are added to am.dist.common-files.
# Report from Pavel Roskin. Report of problems with '--no-force' from
# Scott James Remnant (Debian #206299)
@@ -50,7 +50,7 @@ for opt in '' --no-force; do
test -f depcomp
for dir in . subdir; do
- sed -n 's/^am__dist_common = *\(.*\)$/ \1 /p' \
+ sed -n 's/^am.dist.common-files = *\(.*\)$/ \1 /p' \
<$dir/Makefile.in >$dir/dc.txt
done
@@ -58,7 +58,7 @@ for opt in '' --no-force; do
cat subdir/dc.txt # Likewise.
$FGREP ' $(am__config_aux_dir)/depcomp ' subdir/dc.txt
- # The 'compile' script will be listed in the am__dist_common of
+ # The 'compile' script will be listed in the am.dist.common-files of
# the top-level Makefile because it's required in configure.ac
# (by AM_PROG_CC_C_O).
$FGREP ' $(am__config_aux_dir)/compile ' dc.txt \
diff --git a/t/distcom3.sh b/t/distcom3.sh
index d83409e..98446c1 100755
--- a/t/distcom3.sh
+++ b/t/distcom3.sh
@@ -36,7 +36,7 @@ $AUTOMAKE --add-missing --gnu >output 2>&1 || { cat output;
exit 1; }
cat output
grep README output && exit 1
-sed -n -e '/^am__dist_common =.*\\$/ {
+sed -n -e '/^am.dist.common-files =.*\\$/ {
:loop
p
n
@@ -46,7 +46,7 @@ sed -n -e '/^am__dist_common =.*\\$/ {
t loop
p
n
- }' -e '/^am__dist_common =/ p' Makefile.in | grep README
+ }' -e '/^am.dist.common-files =/ p' Makefile.in | grep README
# Should warn about missing README.
diff --git a/t/distcom4.sh b/t/distcom4.sh
index 4d98b17..e588e23 100755
--- a/t/distcom4.sh
+++ b/t/distcom4.sh
@@ -45,7 +45,7 @@ mkdir tests
cat > Makefile.am << 'END'
.PHONY: test1 test 2
test1:
- for x in $(am__dist_files); do echo $$x; done \
+ for x in $(am.dist.all-files); do echo $$x; done \
| grep 'tests/' > lst
cat lst # For debugging.
test `wc -l <lst` -eq 1
diff --git a/t/distcom5.sh b/t/distcom5.sh
index 4d3789d..5971f9e 100755
--- a/t/distcom5.sh
+++ b/t/distcom5.sh
@@ -49,13 +49,13 @@ SUBDIRS = tests
test: distdir
test -f $(distdir)/tests/wrapper.in
check-local: test
- for x in $(am__dist_files); do echo $$x; done \
+ for x in $(am.dist.all-files); do echo $$x; done \
| grep tests && exit 1; :
END
cat > tests/Makefile.am <<'END'
check-local:
- for x in $(am__dist_files); do echo $$x; done \
+ for x in $(am.dist.all-files); do echo $$x; done \
| grep wrapper.in > lst
cat lst # For debugging.
test `wc -l <lst` -eq 1
diff --git a/t/hdr-vars-defined-once.sh b/t/hdr-vars-defined-once.sh
index a160c11..5101755 100755
--- a/t/hdr-vars-defined-once.sh
+++ b/t/hdr-vars-defined-once.sh
@@ -34,7 +34,7 @@ $AUTOMAKE
test $(grep -c '^srcdir' Makefile.in) -eq 1
# Also make sure include file is distributed.
-sed -n -e '/^am__dist_common =.*\\$/ {
+sed -n -e '/^am.dist.common-files =.*\\$/ {
:loop
p
n
@@ -44,6 +44,6 @@ sed -n -e '/^am__dist_common =.*\\$/ {
t loop
p
n
- }' -e '/^am__dist_common =/ p' Makefile.in | grep
Will_Be_Included_In_Makefile
+ }' -e '/^am.dist.common-files =/ p' Makefile.in | grep
Will_Be_Included_In_Makefile
:
diff --git a/t/insh2.sh b/t/insh2.sh
index 9d1a3a1..cc964cf 100755
--- a/t/insh2.sh
+++ b/t/insh2.sh
@@ -25,7 +25,7 @@ pkgdata_DATA =
.PHONY: test
test: distdir
find $(distdir) # For debugging.
- echo ' ' $(am__dist_common) ' ' | grep '[ /]install-sh '
+ echo ' ' $(am.dist.common-files) ' ' | grep '[ /]install-sh '
test -f $(distdir)/install-sh
END
diff --git a/t/internals.tap b/t/internals.tap
index 1012be6..8063e04 100755
--- a/t/internals.tap
+++ b/t/internals.tap
@@ -45,122 +45,122 @@ default:
@echo Please select an explicit test; exit 1
.PHONY: default
-.PHONY: test-strip-firstword
-test-strip-firstword:
- test '$(call am__strip_firstword,)' = ''
- test '$(call am__strip_firstword,1)' = ''
- test '$(call am__strip_firstword,1 1)' = '1'
- test '$(call am__strip_firstword,1 2)' = '2'
- test '$(call am__strip_firstword,1 2 3 4 5 6 7 8)' = '2 3 4 5 6 7 8'
- test '$(call am__strip_firstword, 1 2 )' = '2'
-
-.PHONY: test-strip-lastword
-test-strip-lastword:
- test '$(call am__strip_lastword,)' = ''
- test '$(call am__strip_lastword,1)' = ''
- test '$(call am__strip_lastword,1 1)' = '1'
- test '$(call am__strip_lastword,1 2)' = '1'
- test '$(call am__strip_lastword,1 2 3 4 5 6 7 8)' = '1 2 3 4 5 6 7'
- test '$(call am__strip_lastword, 1 2 )' = '1'
+.PHONY: test-strip-first-word
+test-strip-first-word:
+ test '$(call am.util.strip-first-word,)' = ''
+ test '$(call am.util.strip-first-word,1)' = ''
+ test '$(call am.util.strip-first-word,1 1)' = '1'
+ test '$(call am.util.strip-first-word,1 2)' = '2'
+ test '$(call am.util.strip-first-word,1 2 3 4 5 6 7 8)' = '2 3 4 5 6 7
8'
+ test '$(call am.util.strip-first-word, 1 2 )' = '2'
+
+.PHONY: test-strip-last-word
+test-strip-last-word:
+ test '$(call am.util.strip-last-word,)' = ''
+ test '$(call am.util.strip-last-word,1)' = ''
+ test '$(call am.util.strip-last-word,1 1)' = '1'
+ test '$(call am.util.strip-last-word,1 2)' = '1'
+ test '$(call am.util.strip-last-word,1 2 3 4 5 6 7 8)' = '1 2 3 4 5 6
7'
+ test '$(call am.util.strip-last-word, 1 2 )' = '1'
.PHONY: test-uniq
test-uniq:
- test '$(call am__uniq,)' = ''
- test '$(call am__uniq,1)' = '1'
- test '$(call am__uniq,1 1)' = '1'
- test '$(call am__uniq,1 2)' = '1 2'
- test '$(call am__uniq,2 1)' = '2 1'
- test '$(call am__uniq,1 2 3)' = '1 2 3'
- test '$(call am__uniq,2 3 1)' = '2 3 1'
- test '$(call am__uniq,1 1 1)' = '1'
- test '$(call am__uniq,1 2 1)' = '1 2'
- test '$(call am__uniq,2 1 1)' = '2 1'
- test '$(call am__uniq,2 1 1)' = '2 1'
- test '$(call am__uniq,2 2 1)' = '2 1'
- test '$(call am__uniq,1 1 1 3 1 1 1)' = '1 3'
- test '$(call am__uniq,3 1 1 4 1 4 1 1)' = '3 1 4'
- test '$(call am__uniq, 1 3 1 )' = '1 3'
+ test '$(call am.util.uniq,)' = ''
+ test '$(call am.util.uniq,1)' = '1'
+ test '$(call am.util.uniq,1 1)' = '1'
+ test '$(call am.util.uniq,1 2)' = '1 2'
+ test '$(call am.util.uniq,2 1)' = '2 1'
+ test '$(call am.util.uniq,1 2 3)' = '1 2 3'
+ test '$(call am.util.uniq,2 3 1)' = '2 3 1'
+ test '$(call am.util.uniq,1 1 1)' = '1'
+ test '$(call am.util.uniq,1 2 1)' = '1 2'
+ test '$(call am.util.uniq,2 1 1)' = '2 1'
+ test '$(call am.util.uniq,2 1 1)' = '2 1'
+ test '$(call am.util.uniq,2 2 1)' = '2 1'
+ test '$(call am.util.uniq,1 1 1 3 1 1 1)' = '1 3'
+ test '$(call am.util.uniq,3 1 1 4 1 4 1 1)' = '3 1 4'
+ test '$(call am.util.uniq, 1 3 1 )' = '1 3'
.PHONY: test-strip-suffixes
test-strip-suffixes:
- test '$(call am__strip_suffixes,,)' = ''
- test '$(call am__strip_suffixes, ,)' = ''
- test '$(call am__strip_suffixes,, )' = ''
- test '$(call am__strip_suffixes, , )' = ''
- test '$(call am__strip_suffixes,x,)' = ''
- test '$(call am__strip_suffixes,x y, )' = ''
- test '$(call am__strip_suffixes,,x y)' = 'x y'
- test '$(call am__strip_suffixes, ,x y)' = 'x y'
- test '$(call am__strip_suffixes,.c,foo.c)' = 'foo'
- test '$(call am__strip_suffixes,.foo,a.foo b.foo)' = 'a b'
- test '$(call am__strip_suffixes, x y, ax ay ax)' = 'a a a'
- test '$(call am__strip_suffixes,x,ax)' = 'a'
- test '$(call am__strip_suffixes,x,xa)' = 'xa'
- test '$(call am__strip_suffixes,x,xx)' = 'x'
- test '$(call am__strip_suffixes,x,xux)' = 'xu'
- test '$(call am__strip_suffixes, .c .c++, \
+ test '$(call am.util.strip-suffixes,,)' = ''
+ test '$(call am.util.strip-suffixes, ,)' = ''
+ test '$(call am.util.strip-suffixes,, )' = ''
+ test '$(call am.util.strip-suffixes, , )' = ''
+ test '$(call am.util.strip-suffixes,x,)' = ''
+ test '$(call am.util.strip-suffixes,x y, )' = ''
+ test '$(call am.util.strip-suffixes,,x y)' = 'x y'
+ test '$(call am.util.strip-suffixes, ,x y)' = 'x y'
+ test '$(call am.util.strip-suffixes,.c,foo.c)' = 'foo'
+ test '$(call am.util.strip-suffixes,.foo,a.foo b.foo)' = 'a b'
+ test '$(call am.util.strip-suffixes, x y, ax ay ax)' = 'a a a'
+ test '$(call am.util.strip-suffixes,x,ax)' = 'a'
+ test '$(call am.util.strip-suffixes,x,xa)' = 'xa'
+ test '$(call am.util.strip-suffixes,x,xx)' = 'x'
+ test '$(call am.util.strip-suffixes,x,xux)' = 'xu'
+ test '$(call am.util.strip-suffixes, .c .c++, \
foo.c bar.c++ baz.cxx zap.c)' = 'foo bar baz.cxx zap'
- test '$(call am__strip_suffixes, .a .b, \
+ test '$(call am.util.strip-suffixes, .a .b, \
1.a.a 2.a.b 3.b.a 4.b.b)' = '1.a 2.a 3.b 4.b'
# Corner cases: the *first* matched suffix is stripped
- test '$(call am__strip_suffixes,.a .b,x.a.a)' = 'x.a'
- test '$(call am__strip_suffixes,.a .b,x.a.b)' = 'x.a'
- test '$(call am__strip_suffixes,.a .b,x.b.a)' = 'x.b'
- test '$(call am__strip_suffixes,.a .b,x.b.b)' = 'x.b'
- test '$(call am__strip_suffixes, .a .b.a, foo.b.a bar.a)' \
+ test '$(call am.util.strip-suffixes,.a .b,x.a.a)' = 'x.a'
+ test '$(call am.util.strip-suffixes,.a .b,x.a.b)' = 'x.a'
+ test '$(call am.util.strip-suffixes,.a .b,x.b.a)' = 'x.b'
+ test '$(call am.util.strip-suffixes,.a .b,x.b.b)' = 'x.b'
+ test '$(call am.util.strip-suffixes, .a .b.a, foo.b.a bar.a)' \
= 'foo.b bar'
- test '$(call am__strip_suffixes, .b.a .a, foo.b.a bar.a)' \
+ test '$(call am.util.strip-suffixes, .b.a .a, foo.b.a bar.a)' \
= 'foo bar'
.PHONY: test-toupper
test-toupper:
- test '$(call am__toupper,a)' = A
- test '$(call am__toupper,A)' = A
- test '$(call am__toupper,aba)' = ABA
- test '$(call am__toupper,a b)' = 'A B'
- test '$(call am__toupper, a B)' = ' A B'
- test '$(call am__toupper,Ab )' = 'AB '
- test '$(call am__toupper,A B c )' = 'A B C '
- test '$(call am__toupper,0)' = 0
- test '$(call am__toupper,0d)' = 0D
- test '$(call am__toupper,@:&/?-)' = '@:&/?-'
- test '$(call am__toupper,address@hidden)' = address@hidden
- test '$(call am__toupper,zxzxzxZXZxzxzxzxzx)' = ZXZXZXZXZXZXZXZXZX
- test '$(call am__toupper,$(lower))' = '$(upper)'
- test '$(call am__toupper,$(upper))' = '$(upper)'
+ test '$(call am.util.toupper,a)' = A
+ test '$(call am.util.toupper,A)' = A
+ test '$(call am.util.toupper,aba)' = ABA
+ test '$(call am.util.toupper,a b)' = 'A B'
+ test '$(call am.util.toupper, a B)' = ' A B'
+ test '$(call am.util.toupper,Ab )' = 'AB '
+ test '$(call am.util.toupper,A B c )' = 'A B C '
+ test '$(call am.util.toupper,0)' = 0
+ test '$(call am.util.toupper,0d)' = 0D
+ test '$(call am.util.toupper,@:&/?-)' = '@:&/?-'
+ test '$(call am.util.toupper,address@hidden)' = address@hidden
+ test '$(call am.util.toupper,zxzxzxZXZxzxzxzxzx)' = ZXZXZXZXZXZXZXZXZX
+ test '$(call am.util.toupper,$(lower))' = '$(upper)'
+ test '$(call am.util.toupper,$(upper))' = '$(upper)'
.PHONY: test-tolower
test-tolower:
- test '$(call am__tolower,A)' = a
- test '$(call am__tolower,a)' = a
- test '$(call am__tolower,ABA)' = aba
- test '$(call am__tolower,A B)' = 'a b'
- test '$(call am__tolower, A b)' = ' a b'
- test '$(call am__tolower,aB )' = 'ab '
- test '$(call am__tolower,a b C )' = 'a b c '
- test '$(call am__tolower,0)' = 0
- test '$(call am__tolower,0D)' = 0d
- test '$(call am__tolower,@:&/?-)' = '@:&/?-'
- test '$(call am__tolower,address@hidden)' = address@hidden
- test '$(call am__tolower,ZXZXZXzxzXZXZXZXZX)' = zxzxzxzxzxzxzxzxzx
- test '$(call am__tolower,$(upper))' = '$(lower)'
- test '$(call am__tolower,$(lower))' = '$(lower)'
+ test '$(call am.util.tolower,A)' = a
+ test '$(call am.util.tolower,a)' = a
+ test '$(call am.util.tolower,ABA)' = aba
+ test '$(call am.util.tolower,A B)' = 'a b'
+ test '$(call am.util.tolower, A b)' = ' a b'
+ test '$(call am.util.tolower,aB )' = 'ab '
+ test '$(call am.util.tolower,a b C )' = 'a b c '
+ test '$(call am.util.tolower,0)' = 0
+ test '$(call am.util.tolower,0D)' = 0d
+ test '$(call am.util.tolower,@:&/?-)' = '@:&/?-'
+ test '$(call am.util.tolower,address@hidden)' = address@hidden
+ test '$(call am.util.tolower,ZXZXZXzxzXZXZXZXZX)' = zxzxzxzxzxzxzxzxzx
+ test '$(call am.util.tolower,$(upper))' = '$(lower)'
+ test '$(call am.util.tolower,$(lower))' = '$(lower)'
.PHONY: test-canonicalize
test-canonicalize:
- test '$(call am__canon,A)' = A
- test '$(call am__canon, b)' = b
- test '$(call am__canon, foo )' = foo
- test '$(call am__canon,$(upper)$(lower)$(digits)_)' =
'$(upper)$(lower)$(digits)_'
- test '$(call am__canon,@)' = '@'
- test '$(call am__canon,%)' = '_'
- test '$(call am__canon,.&@!;)' = 'address@hidden'
- test '$(call am__canon,')' = '_'
- test '$(call am__canon,$(dollar))' = '_'
- test '$(call am__canon,$(bslash))' = '_'
- test '$(call am__canon,$(comma))' = '_'
- test '$(call am__canon,$(bslash)$(comma))' = '__'
- test '$(call am__canon,x$(comma)@$(bslash))' = 'address@hidden'
+ test '$(call am.util.canon,A)' = A
+ test '$(call am.util.canon, b)' = b
+ test '$(call am.util.canon, foo )' = foo
+ test '$(call am.util.canon,$(upper)$(lower)$(digits)_)' =
'$(upper)$(lower)$(digits)_'
+ test '$(call am.util.canon,@)' = '@'
+ test '$(call am.util.canon,%)' = '_'
+ test '$(call am.util.canon,.&@!;)' = 'address@hidden'
+ test '$(call am.util.canon,')' = '_'
+ test '$(call am.util.canon,$(dollar))' = '_'
+ test '$(call am.util.canon,$(bslash))' = '_'
+ test '$(call am.util.canon,$(comma))' = '_'
+ test '$(call am.util.canon,$(bslash)$(comma))' = '__'
+ test '$(call am.util.canon,x$(comma)@$(bslash))' = 'address@hidden'
.PHONY: test-newline-1
test-newline-1:
@@ -185,13 +185,13 @@ test-newline-3:
test -f n3
END
-command_ok_ am__strip_firstword $MAKE test-strip-firstword
-command_ok_ am__strip_lastword $MAKE test-strip-lastword
-command_ok_ am__uniq $MAKE test-uniq
-command_ok_ am__test_strip_suffixes $MAKE test-strip-suffixes
-command_ok_ am__tolower $MAKE test-tolower
-command_ok_ am__toupper $MAKE test-toupper
-command_ok_ am__canon $MAKE test-canonicalize
+command_ok_ am.util.strip-first-word $MAKE test-strip-first-word
+command_ok_ am.util.strip-last-word $MAKE test-strip-last-word
+command_ok_ am.util.uniq $MAKE test-uniq
+command_ok_ am.util.strip-suffixes $MAKE test-strip-suffixes
+command_ok_ am.util.tolower $MAKE test-tolower
+command_ok_ am.util.toupper $MAKE test-toupper
+command_ok_ am.util.canon $MAKE test-canonicalize
command_ok_ "am__newline (1)" $MAKE test-newline-1
command_ok_ "am__newline (2)" $MAKE test-newline-2
command_ok_ "am__newline (3)" $MAKE test-newline-3
diff --git a/t/libobj7.sh b/t/libobj7.sh
index b5e6742..d3874c5 100755
--- a/t/libobj7.sh
+++ b/t/libobj7.sh
@@ -39,10 +39,10 @@ check-local: test1 test2 test3
test1: all
$(AR) tv libtu.a
test2:
- @echo am__dist_common = $(am__dist_common)
- echo ' ' $(am__dist_common) ' ' | grep '[ /]basename\.c '
- echo ' ' $(am__dist_common) ' ' | grep '[ /]dirname\.c '
- echo ' ' $(am__dist_common) ' ' | grep '[ /]am__dummy_function\.c '
+ @echo am.dist.common-files = $(am.dist.common-files)
+ echo ' ' $(am.dist.common-files) ' ' | grep '[ /]basename\.c '
+ echo ' ' $(am.dist.common-files) ' ' | grep '[ /]dirname\.c '
+ echo ' ' $(am.dist.common-files) ' ' | grep '[ /]am__dummy_function\.c '
test3: distdir
test -f $(distdir)/basename.c
test -f $(distdir)/dirname.c
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:
address@hidden ":: $$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"
diff --git a/t/memoize.tap b/t/memoize.tap
index a89515b..6d5eda4 100755
--- a/t/memoize.tap
+++ b/t/memoize.tap
@@ -63,7 +63,7 @@ END
T "variables expanding to blanks only (1)" <<'END'
-foo = $(call am__memoize,foo,$(am__empty) )
+foo = $(call am__memoize,foo,$(am.chars.empty) )
test:
test '$(foo)' = ' '
@@ -74,7 +74,7 @@ END
T "variables expanding to blanks only (2)" <<END
-blank = \$(am__empty) $tab$tab \$(am__empty)
+blank = \$(am.chars.empty) $tab$tab \$(am.chars.empty)
foo = \$(call am__memoize,foo,\$(blank))
test:
diff --git a/t/nodist.sh b/t/nodist.sh
index 41083c3..cb79f61 100755
--- a/t/nodist.sh
+++ b/t/nodist.sh
@@ -34,7 +34,7 @@ $ACLOCAL
$AUTOMAKE
grep '^am_eyeball_OBJECTS' Makefile.in
-grep '^am__dist_sources =' Makefile.in
-grep '^am__dist_sources =.*nodist' Makefile.in && exit 1
+grep '^am.dist.sources =' Makefile.in
+grep '^am.dist.sources =.*nodist' Makefile.in && exit 1
:
diff --git a/t/nodist3.sh b/t/nodist3.sh
index 33a2d5c..f80445a 100755
--- a/t/nodist3.sh
+++ b/t/nodist3.sh
@@ -32,6 +32,6 @@ $ACLOCAL
$AUTOMAKE
grep '^dist:' Makefile.in && exit 1
-grep 'am__dist_sources' Makefile.in && exit 1
+grep 'am.dist.sources' Makefile.in && exit 1
:
diff --git a/t/pr2.sh b/t/pr2.sh
index 84973c9..70e17ee 100755
--- a/t/pr2.sh
+++ b/t/pr2.sh
@@ -22,7 +22,7 @@
# like the following (among the Makefiles)
# README.foo:templ/README.foo.in
# the generated dist target in the Makefile.in fails,
-# because am__dist_common will contain templ/README.foo.in
+# because am.dist.common-files will contain templ/README.foo.in
# and the dist target will try to copy templ/README.foo.in
# to the distribution directory before it creates a templ
# subdirectory in the distribution directory.
diff --git a/t/relativize.tap b/t/relativize.tap
index d940ddf..a9644af 100755
--- a/t/relativize.tap
+++ b/t/relativize.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/>.
-# Test Automake-provided internal make macro $(am__relativize).
+# Test Automake-provided internal make macro $(am.dist.relativize-path).
am_create_testdir=empty
. ./defs || exit 1
@@ -41,7 +41,7 @@ SUBDIRS = .
.PHONY: test
test:
- @$(am__relativize); echo "result: '$$reldir'"; set -x; \
+ @$(am.dist.relativize-path); echo "result: '$$reldir'"; set -x; \
case $${reldir:-.} in "$$exp"|"$$exp/.") ;; *) exit 1;; esac
END
@@ -55,8 +55,8 @@ rel_ ()
env dir1=$1 dir2=$2 exp=$4 $MAKE test
}
-# am__relativize
-# ~~~~~~~~~~~~~~
+# am.dist.relativize-path
+# ~~~~~~~~~~~~~~~~~~~~~~~
# Computes a relative pathname RELDIR such that DIR1/RELDIR = DIR2.
# Input:
# - DIR1 relative pathname, relative to the current directory
diff --git a/t/substref.sh b/t/substref.sh
index d24bf13..827f45c 100755
--- a/t/substref.sh
+++ b/t/substref.sh
@@ -47,8 +47,8 @@ $MAKE test
# This is unrelated to the rest of this test. But while we are
# at it, make sure we don't use am__helldl_SOURCES_DIST here, since
-# it's not needed. am__dist_sources should contain $(helldl_SOURCES).
+# it's not needed. am.dist.sources should contain $(helldl_SOURCES).
grep am__helldl_SOURCES_DIST Makefile && exit 1
-grep 'am__dist_sources.*\$(helldl_SOURCES)' Makefile
+grep 'am.dist.sources.*\$(helldl_SOURCES)' Makefile
:
diff --git a/t/test-driver-is-distributed.sh b/t/test-driver-is-distributed.sh
index 6e725c2..7675330 100755
--- a/t/test-driver-is-distributed.sh
+++ b/t/test-driver-is-distributed.sh
@@ -53,7 +53,7 @@ END
unindent > tests/Makefile.am << END
check-local: test-sub
test-sub:
- echo ' ' \$(am__dist_common) ' ' | grep '[ /]$test_driver '
+ echo ' ' \$(am.dist.common-files) ' ' | grep '[ /]$test_driver '
TESTS = foo.test
EXTRA_DIST = \$(TESTS)
END
diff --git a/t/test-extensions-dynamic.sh b/t/test-extensions-dynamic.sh
index b04dcca..091ca03 100755
--- a/t/test-extensions-dynamic.sh
+++ b/t/test-extensions-dynamic.sh
@@ -30,7 +30,7 @@ cat > Makefile.am << 'END'
SUBDIRS = sub
TESTS = foo.sh bar.test baz.t1 mu.t1.t2 zardoz.tap
TEST_EXTENSIONS = .test @suf@ $(foreach i,1 2,.t$(i))
-TEST_EXTENSIONS += $(subst &,.,$(call am__tolower,&SH))
+TEST_EXTENSIONS += $(subst &,.,$(call am.util.tolower,&SH))
END
cat > sub/Makefile.am << 'END'
diff --git a/t/txinfo.sh b/t/txinfo.sh
index 3c73ecd..ff75bdd 100755
--- a/t/txinfo.sh
+++ b/t/txinfo.sh
@@ -28,8 +28,8 @@ cat > Makefile.am << 'END'
info_TEXINFOS = textutils.texi
.PHONY: test1 test2
test1:
- @echo am__dist_files = $(am__dist_files)
- echo ' ' $(am__dist_files) ' ' | grep '[ /]texinfo\.tex '
+ @echo am.dist.all-files = $(am.dist.all-files)
+ echo ' ' $(am.dist.all-files) ' ' | grep '[ /]texinfo\.tex '
test2: distdir
ls -l $(distdir)
test -f $(distdir)/texinfo.tex
diff --git a/t/txinfo2.sh b/t/txinfo2.sh
index 78a4271..d52231a 100755
--- a/t/txinfo2.sh
+++ b/t/txinfo2.sh
@@ -27,8 +27,8 @@ cat > Makefile.am << 'END'
info_TEXINFOS = textutils.texi
.PHONY: test
test:
- @echo am__dist_files = $(am__dist_files)
- case '$(am__dist_files)' in *'~'*) exit 1;; *) exit 0;; esac
+ @echo am.dist.all-files = $(am.dist.all-files)
+ case '$(am.dist.all-files)' in *'~'*) exit 1;; *) exit 0;; esac
END
: > texinfo.tex
diff --git a/t/txinfo8.sh b/t/txinfo8.sh
index 72ae61b..45c3c09 100755
--- a/t/txinfo8.sh
+++ b/t/txinfo8.sh
@@ -32,8 +32,8 @@ cat > Makefile.am << 'END'
info_TEXINFOS = textutils.texi
.PHONY: test1 test2
test1:
- @echo am__dist_files = $(am__dist_files)
- echo ' ' $(am__dist_files) ' ' | grep '[ /]auxdir/texinfo\.tex '
+ @echo am.dist.all-files = $(am.dist.all-files)
+ echo ' ' $(am.dist.all-files) ' ' | grep '[ /]auxdir/texinfo\.tex '
test2: distdir
ls -l $(distdir)/*
test -f $(distdir)/auxdir/texinfo.tex
diff --git a/t/vpath-rewrite.sh b/t/vpath-rewrite.sh
index 8f1eecc..e856d4b 100755
--- a/t/vpath-rewrite.sh
+++ b/t/vpath-rewrite.sh
@@ -36,7 +36,7 @@ clean-local:
rm -rf bsub
## Yes, I'm a lazy typist.
-vr = \$(am__vpath_rewrite)
+vr = \$(am.vpath.rewrite)
test-common: bsub/foo/bar bsub/mu.c++ bsub/foo/pu.cxx
test '\$(call vr,Makefile)' = Makefile
diff --git a/t/vtexi3.sh b/t/vtexi3.sh
index dd897e0..4480ec4 100755
--- a/t/vtexi3.sh
+++ b/t/vtexi3.sh
@@ -41,7 +41,7 @@ cat > Makefile.am << 'END'
info_TEXINFOS = foobar.texi quux.texi zardoz.texi
.PHONY: echo-distfiles
echo-distfiles:
- @echo ' ' $(am__dist_files) ' '
+ @echo ' ' $(am.dist.all-files) ' '
END
cat > foobar.texi << 'END'
@@ -94,7 +94,7 @@ do_check ()
vmonth=$(grep 'address@hidden UPDATED ' $srcdir/$vfile.texi | awk '{print
$4, $5}')
grep "address@hidden UPDATED-MONTH $vmonth$" $srcdir/$vfile.texi
# Check that the vers*.texi file is distributed according
- # to $(am__dist_files).
+ # to $(am.dist.all-files).
$MAKE echo-distfiles # For debugging.
$MAKE -s echo-distfiles | grep "[ /]$vfile\\.texi"
}
diff --git a/t/vtexi4.sh b/t/vtexi4.sh
index abd1411..ed784db 100755
--- a/t/vtexi4.sh
+++ b/t/vtexi4.sh
@@ -55,8 +55,8 @@ test-grepinfo:
cat $(srcdir)/foo.info | grep 'GREPDATE=$(my_date_rx)='
cat $(srcdir)/foo.info | grep 'GREPMONTH=$(my_month_rx)='
test-distfiles:
- @echo am__dist_files = $(am__dist_files)
- echo ' ' $(am__dist_files) ' ' | grep '[ /]version.texi '
+ @echo am.dist.all-files = $(am.dist.all-files)
+ echo ' ' $(am.dist.all-files) ' ' | grep '[ /]version.texi '
test-distdir: distdir
ls -l $(distdir)
diff $(srcdir)/version.texi $(distdir)/version.texi
diff --git a/t/yacc-basic.sh b/t/yacc-basic.sh
index 2a98f9f..e8b2602 100755
--- a/t/yacc-basic.sh
+++ b/t/yacc-basic.sh
@@ -34,7 +34,7 @@ bar_YFLAGS = -v
.PHONY: echo-distcom
echo-distcom:
- @echo ' ' $(am__dist_common) ' '
+ @echo ' ' $(am.dist.common-files) ' '
END
cat > parse.y << 'END'
diff --git a/t/yacc-cxx.sh b/t/yacc-cxx.sh
index 2d284f4..ce27e6a 100755
--- a/t/yacc-cxx.sh
+++ b/t/yacc-cxx.sh
@@ -38,7 +38,7 @@ foo4_YFLAGS = $(foo3_YFLAGS)
.PHONY: echo-distcom
echo-distcom:
- @echo ' ' $(am__dist_common) ' '
+ @echo ' ' $(am.dist.common-files) ' '
END
cat > parse1.yy << 'END'
diff --git a/t/yacc-d-basic.sh b/t/yacc-d-basic.sh
index f8ff475..55f0ee5 100755
--- a/t/yacc-d-basic.sh
+++ b/t/yacc-d-basic.sh
@@ -39,7 +39,7 @@ bin_PROGRAMS = zardoz
zardoz_SOURCES = parse.y main.c
.PHONY: echo-distcom
echo-distcom:
- @echo ' ' $(am__dist_common) ' '
+ @echo ' ' $(am.dist.common-files) ' '
END
cp foo/Makefile.am bar/Makefile.am
cp foo/Makefile.am baz/Makefile.am
diff --git a/t/yacc-d-cxx.sh b/t/yacc-d-cxx.sh
index 0483d8c..3e9e0d4 100755
--- a/t/yacc-d-cxx.sh
+++ b/t/yacc-d-cxx.sh
@@ -66,7 +66,7 @@ mkdir foo bar baz qux baz/sub
cat > Makefile.am <<'END'
.PHONY: echo-distcom
echo-distcom:
- @echo ' ' $(am__dist_common) ' '
+ @echo ' ' $(am.dist.common-files) ' '
END
cp Makefile.am foo/Makefile.am
cp Makefile.am bar/Makefile.am
diff --git a/t/yacc-lex-cxx-alone.sh b/t/yacc-lex-cxx-alone.sh
index e669cbc..46e81ad 100755
--- a/t/yacc-lex-cxx-alone.sh
+++ b/t/yacc-lex-cxx-alone.sh
@@ -34,8 +34,8 @@ bar_SOURCES = bar.lxx
.PHONY: check-dist
check-dist: distdir
- echo ' ' $(am__dist_common) ' ' | grep '[ /]foo\.cc'
- echo ' ' $(am__dist_common) ' ' | grep '[ /]bar\.cxx'
+ echo ' ' $(am.dist.common-files) ' ' | grep '[ /]foo\.cc'
+ echo ' ' $(am.dist.common-files) ' ' | grep '[ /]bar\.cxx'
ls -l $(distdir)
test -f $(distdir)/foo.cc
test -f $(distdir)/bar.cxx
hooks/post-receive
--
GNU Automake
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.12.2-572-g05c5e1b,
Stefano Lattarini <=