[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-584-gf7b16b4 |
|
Date: |
Mon, 23 Jul 2012 10:27:04 +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=f7b16b4ce8c0095030481c9d4dd4425d65f89fc5
The branch, ng/master has been updated
via f7b16b4ce8c0095030481c9d4dd4425d65f89fc5 (commit)
via 7867c326973cbe3463d8c7c5f30ef10669c44544 (commit)
via 21cccd322a1676874c111dde94e81bebf0ed1873 (commit)
via b0aa3214c7588320101c604b36a65f7bf1395998 (commit)
from bf04ad799edc3205ec0a73cbef335a2a95f7999b (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 f7b16b4ce8c0095030481c9d4dd4425d65f89fc5
Author: Stefano Lattarini <address@hidden>
Date: Sun Jul 22 18:26:55 2012 +0200
[ng] rename: ACLOCAL_M4 -> am.remake.aclocal-m4
Signed-off-by: Stefano Lattarini <address@hidden>
commit 7867c326973cbe3463d8c7c5f30ef10669c44544
Author: Stefano Lattarini <address@hidden>
Date: Sun Jul 22 18:14:48 2012 +0200
[ng] rename: am__configure_deps -> am.remake.configure-deps
Signed-off-by: Stefano Lattarini <address@hidden>
commit 21cccd322a1676874c111dde94e81bebf0ed1873
Author: Stefano Lattarini <address@hidden>
Date: Sun Jul 22 18:10:04 2012 +0200
[ng] rename: am__aclocal_m4_deps -> am.remake.aclocal-m4-deps
Signed-off-by: Stefano Lattarini <address@hidden>
commit b0aa3214c7588320101c604b36a65f7bf1395998
Author: Stefano Lattarini <address@hidden>
Date: Sun Jul 22 17:59:13 2012 +0200
[ng] rename: am__config_aux_dir -> am.conf.aux-dir
Signed-off-by: Stefano Lattarini <address@hidden>
-----------------------------------------------------------------------
Summary of changes:
NG-NEWS | 4 ++++
automake.in | 26 ++++++++++++++------------
lib/am/configure.am | 14 +++++++-------
lib/am/parallel-tests.am | 2 +-
lib/am/remake-hdr.am | 2 +-
lib/am/texi-vers.am | 2 +-
t/auxdir.sh | 2 +-
t/auxdir6.sh | 4 ++--
t/auxdir7.sh | 4 ++--
t/auxdir8.sh | 4 ++--
t/confdeps.sh | 4 ++--
t/distcom2.sh | 4 ++--
t/flavor.sh | 2 +-
t/remake-all-1.sh | 2 +-
t/yacc-auxdir.sh | 4 ++--
15 files changed, 43 insertions(+), 37 deletions(-)
diff --git a/NG-NEWS b/NG-NEWS
index ca91927..48e466f 100644
--- a/NG-NEWS
+++ b/NG-NEWS
@@ -273,6 +273,10 @@ Obsolete Features Removed
'AM_SET_LEADING_DOT' and AC_SUBST'd variable 'am__leading_dot' have
been removed.
+* The Automake-defined internal make variable '$(ACLOCAL_M4)' has been
+ renamed to '$(am.remake.aclocal-m4)', and should be considered an
+ internal detail.
+
Source Files with Unknown Extensions
====================================
diff --git a/automake.in b/automake.in
index 3b9740d..7727fb3 100644
--- a/automake.in
+++ b/automake.in
@@ -1287,7 +1287,7 @@ sub handle_languages
{
# Set location of depcomp.
define_variable ('depcomp', INTERNAL,
- '$(SHELL) $(am__config_aux_dir)/depcomp');
+ '$(SHELL) $(am.conf.aux-dir)/depcomp');
require_conf_file ("$am_file.am", FOREIGN, 'depcomp');
@@ -2945,7 +2945,7 @@ sub handle_texinfo_helper ($)
}
elsif ($config_aux_dir_set_in_configure_ac)
{
- $texinfodir = '$(am__config_aux_dir)';
+ $texinfodir = '$(am.conf.aux-dir)';
define_variable ('TEXINFO_TEX', INTERNAL, "$texinfodir/texinfo.tex");
$need_texi_file = 2; # so that we require_conf_file later
}
@@ -3488,7 +3488,8 @@ sub scan_aclocal_m4 ()
if (-f 'aclocal.m4')
{
- define_variable ("ACLOCAL_M4", INTERNAL, '$(top_srcdir)/aclocal.m4');
+ define_variable ("am.remake.aclocal-m4", INTERNAL,
+ '$(top_srcdir)/aclocal.m4');
my $aclocal = new Automake::XFile "< aclocal.m4";
my $line = $aclocal->getline;
@@ -3616,11 +3617,12 @@ sub handle_configure ($$$@)
$colon_infile = '' if $colon_infile eq ":$makefile.in";
my @rewritten = rewrite_inputs_into_dependencies ($makefile, @inputs);
my $regen_aclocal_m4 = scan_aclocal_m4;
- define_variable ('am__aclocal_m4_deps', INTERNAL,
+ define_variable ('am.remake.aclocal-m4-deps', INTERNAL,
@configure_deps, '$(top_srcdir)/' . $configure_ac);
- my @configuredeps = ('$(am__aclocal_m4_deps)', '$(CONFIGURE_DEPENDENCIES)');
- push @configuredeps, '$(ACLOCAL_M4)' if -f 'aclocal.m4';
- define_variable ('am__configure_deps', INTERNAL, @configuredeps);
+ my @configuredeps = ('$(am.remake.aclocal-m4-deps)',
+ '$(CONFIGURE_DEPENDENCIES)');
+ push @configuredeps, '$(am.remake.aclocal-m4)' if -f 'aclocal.m4';
+ define_variable ('am.remake.configure-deps', INTERNAL, @configuredeps);
my $automake_options = '--' . $strictness_name .
(global_option 'no-dependencies' ? ' --ignore-deps' :
'');
@@ -4176,7 +4178,7 @@ sub handle_emacs_lisp
require_variables ($elfiles[0][0], "Emacs Lisp sources seen", TRUE,
'EMACS', 'lispdir');
require_conf_file ($elfiles[0][0], FOREIGN, 'elisp-comp');
- define_variable ('elisp_comp', INTERNAL, '$(am__config_aux_dir)/elisp-comp');
+ define_variable ('elisp_comp', INTERNAL, '$(am.conf.aux-dir)/elisp-comp');
}
# Handle Python
@@ -4188,7 +4190,7 @@ sub handle_python
require_variables ($pyfiles[0][0], "Python sources seen", TRUE, 'PYTHON');
require_conf_file ($pyfiles[0][0], FOREIGN, 'py-compile');
- define_variable ('py_compile', INTERNAL, '$(am__config_aux_dir)/py-compile');
+ define_variable ('py_compile', INTERNAL, '$(am.conf.aux-dir)/py-compile');
}
# Handle Java.
@@ -5070,7 +5072,7 @@ sub lang_yacc_lex_finish
# FIXME: for now, no line number.
require_conf_file ($configure_ac, FOREIGN, 'ylwrap');
- define_variable ('YLWRAP', INTERNAL, '$(am__config_aux_dir)/ylwrap');
+ define_variable ('YLWRAP', INTERNAL, '$(am.conf.aux-dir)/ylwrap');
}
# Given a hash table of linker names, pick the name that has the most
@@ -6520,7 +6522,7 @@ sub push_required_file
# of $am_config_aux_dir here is deliberate and necessary.
elsif ($dir eq $config_aux_dir)
{
- push_dist_common ('$(am__config_aux_dir)/' . $file);
+ push_dist_common ('$(am.conf.aux-dir)/' . $file);
}
# FIXME: another spacial case, for AC_LIBOBJ/AC_LIBSOURCE support.
# We probably need some refactoring of this function and its callers,
@@ -6903,7 +6905,7 @@ sub generate_makefile ($$)
# Must do this after reading .am file.
define_variable ('subdir', INTERNAL, $relative_dir);
- define_variable ('am__config_aux_dir', INTERNAL, $am_config_aux_dir);
+ define_variable ('am.conf.aux-dir', INTERNAL, $am_config_aux_dir);
# If DIST_SUBDIRS is defined, make sure SUBDIRS is, so that
# recursive rules are enabled.
diff --git a/lib/am/configure.am b/lib/am/configure.am
index 34b2d32..13a936b 100644
--- a/lib/am/configure.am
+++ b/lib/am/configure.am
@@ -19,13 +19,13 @@
## --------------------- ##
## This rule remakes the Makefile.in.
-%MAKEFILE-IN%: %MAINTAINER-MODE% %MAKEFILE-AM% %MAKEFILE-IN-DEPS%
$(am__configure_deps)
+%MAKEFILE-IN%: %MAINTAINER-MODE% %MAKEFILE-AM% %MAKEFILE-IN-DEPS%
$(am.remake.configure-deps)
## If configure.ac or one of configure's dependencies has changed, all
## Makefile.in are to be updated; it is then more efficient to run
## automake on all the Makefiles at once. It also allow Automake to be
## run for newly added directories.
@for dep in $?; do \
- case '$(am__configure_deps)' in \
+ case '$(am.remake.configure-deps)' in \
*$$dep*) \
?TOPDIR_P? echo ' cd $(srcdir) && $(AUTOMAKE) %AUTOMAKE-OPTIONS%'; \
?TOPDIR_P? cd $(srcdir) && $(AUTOMAKE) %AUTOMAKE-OPTIONS% \
@@ -83,14 +83,14 @@ 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-files += $(top_srcdir)/configure $(am__configure_deps)
+am.dist.common-files += $(top_srcdir)/configure $(am.remake.configure-deps)
endif %?TOPDIR_P%
$(top_builddir)/config.status: $(top_srcdir)/configure
$(CONFIG_STATUS_DEPENDENCIES)
?TOPDIR_P? $(SHELL) ./config.status --recheck
?!TOPDIR_P? cd $(top_builddir) && $(MAKE) .am/nil
-$(top_srcdir)/configure: %MAINTAINER-MODE% $(am__configure_deps)
+$(top_srcdir)/configure: %MAINTAINER-MODE% $(am.remake.configure-deps)
?TOPDIR_P? cd $(srcdir) && $(AUTOCONF)
?!TOPDIR_P? cd $(top_builddir) && $(MAKE) .am/nil
@@ -102,17 +102,17 @@ $(top_srcdir)/configure: %MAINTAINER-MODE%
$(am__configure_deps)
## Whenever a configure dependency changes we need to rebuild
## aclocal.m4 too. Changing configure.ac, or any file included by
## aclocal.m4 might require adding more files to aclocal.m4. Hence
-## the $(am__configure_deps) dependency.
+## the $(am.remake.configure-deps) dependency.
## We still need $(ACLOCAL_AMFLAGS) for sake of backward-compatibility;
## we should hopefully be able to get rid of it in a not-so-distant
## future.
if %?REGEN-ACLOCAL-M4%
-$(ACLOCAL_M4): %MAINTAINER-MODE% $(am__aclocal_m4_deps)
+$(am.remake.aclocal-m4): %MAINTAINER-MODE% $(am.remake.aclocal-m4-deps)
?TOPDIR_P? cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
?!TOPDIR_P? cd $(top_builddir) && $(MAKE) .am/nil
## Avoid the "deleted header file" problem for the dependencies.
-$(am__aclocal_m4_deps):
+$(am.remake.aclocal-m4-deps):
endif %?REGEN-ACLOCAL-M4%
diff --git a/lib/am/parallel-tests.am b/lib/am/parallel-tests.am
index 19e21a6..61d3c8a 100644
--- a/lib/am/parallel-tests.am
+++ b/lib/am/parallel-tests.am
@@ -70,7 +70,7 @@ am__tpfx = \
!
## FIXME: This will pick up the default from the environment; are we sure
## FIXME: we want that?
-!$$(call am__tpfx,$1)LOG_DRIVER ?= $(SHELL) $(am__config_aux_dir)/test-driver
+!$$(call am__tpfx,$1)LOG_DRIVER ?= $(SHELL) $(am.conf.aux-dir)/test-driver
!
!%.log %.trs: %$1 $$($$(call am__tpfx,$1)LOG_DEPENDENCIES)
! @$$(call am__runtest,$$(call am__tpfx,$1))
diff --git a/lib/am/remake-hdr.am b/lib/am/remake-hdr.am
index 2bcf2df..77d3fae 100644
--- a/lib/am/remake-hdr.am
+++ b/lib/am/remake-hdr.am
@@ -27,7 +27,7 @@
## Only the first file of AC_CONFIG_HEADERS is assumed to be generated
## by autoheader.
if %?FIRST%
-%CONFIG_HIN%: %MAINTAINER-MODE% $(am__configure_deps)
+%CONFIG_HIN%: %MAINTAINER-MODE% $(am.remake.configure-deps)
cd $(top_srcdir) && $(AUTOHEADER)
## Whenever $(AUTOHEADER) has run, we must make sure that
## ./config.status will rebuild config.h. The dependency from %STAMP%
diff --git a/lib/am/texi-vers.am b/lib/am/texi-vers.am
index 0608e0b..1053dcd 100644
--- a/lib/am/texi-vers.am
+++ b/lib/am/texi-vers.am
@@ -28,7 +28,7 @@ am.dist.common-files += %VTEXI% %STAMPVTI%
## in this file.)
%STAMPVTI%: %TEXI% $(top_srcdir)/configure
@$(am__ensure_target_dir_exists)
- @(set `$(SHELL) $(am__config_aux_dir)/mdate-sh $<`; \
+ @(set `$(SHELL) $(am.conf.aux-dir)/mdate-sh $<`; \
echo "@set UPDATED $$1 $$2 $$3"; \
echo "@set UPDATED-MONTH $$2 $$3"; \
echo "@set EDITION $(VERSION)"; \
diff --git a/t/auxdir.sh b/t/auxdir.sh
index ce3d188..8a6b28e 100755
--- a/t/auxdir.sh
+++ b/t/auxdir.sh
@@ -33,6 +33,6 @@ END
$ACLOCAL
$AUTOMAKE ././Makefile
-grep '^am__config_aux_dir = \$(top_srcdir)/\./\.$' Makefile.in
+grep '^am\.conf\.aux-dir = \$(top_srcdir)/\./\.$' Makefile.in
:
diff --git a/t/auxdir6.sh b/t/auxdir6.sh
index c071fe7..a7602e5 100755
--- a/t/auxdir6.sh
+++ b/t/auxdir6.sh
@@ -39,7 +39,7 @@ mkdir subdir auxdir
$ACLOCAL
$AUTOMAKE
-grep '^am__config_aux_dir = \$(top_srcdir)/auxdir$' Makefile.in
-grep '^am__config_aux_dir = \$(top_srcdir)/auxdir$' subdir/Makefile.in
+grep '^am\.conf\.aux-dir = \$(top_srcdir)/auxdir$' Makefile.in
+grep '^am\.conf\.aux-dir = \$(top_srcdir)/auxdir$' subdir/Makefile.in
:
diff --git a/t/auxdir7.sh b/t/auxdir7.sh
index 0d01d24..c17bf86 100755
--- a/t/auxdir7.sh
+++ b/t/auxdir7.sh
@@ -36,7 +36,7 @@ mkdir subdir
$ACLOCAL
$AUTOMAKE
-grep '^am__config_aux_dir = \$(top_srcdir)$' Makefile.in
-grep '^am__config_aux_dir = \$(top_srcdir)$' subdir/Makefile.in
+grep '^am\.conf\.aux-dir = \$(top_srcdir)$' Makefile.in
+grep '^am\.conf\.aux-dir = \$(top_srcdir)$' subdir/Makefile.in
:
diff --git a/t/auxdir8.sh b/t/auxdir8.sh
index 6c6e055..1e42ebb 100755
--- a/t/auxdir8.sh
+++ b/t/auxdir8.sh
@@ -35,7 +35,7 @@ mkdir subdir
$ACLOCAL
$AUTOMAKE
-grep '^am__config_aux_dir = \$(top_srcdir)$' Makefile.in
-grep '^am__config_aux_dir = \$(top_srcdir)$' subdir/Makefile.in
+grep '^am\.conf\.aux-dir = \$(top_srcdir)$' Makefile.in
+grep '^am\.conf\.aux-dir = \$(top_srcdir)$' subdir/Makefile.in
:
diff --git a/t/confdeps.sh b/t/confdeps.sh
index 95e60f9..23d9cad 100755
--- a/t/confdeps.sh
+++ b/t/confdeps.sh
@@ -24,7 +24,7 @@ $ACLOCAL
echo "$me: Generated by aclocal ..."
$AUTOMAKE
-grep '^\$(ACLOCAL_M4):' Makefile.in
+grep '^\$(am\.remake\.aclocal-m4):' Makefile.in
echo "$me: Not generated by aclocal ..."
# Pretend it is not from aclocal (remove the signature),
@@ -32,6 +32,6 @@ echo "$me: Not generated by aclocal ..."
sed -n '3,$p' aclocal.m4 >aclocal.m4t
mv -f aclocal.m4t aclocal.m4
$AUTOMAKE
-grep '^\$(ACLOCAL_M4):' Makefile.in && exit 1
+$FGREP '$(am.remake.aclocal-m4):' Makefile.in && exit 1
:
diff --git a/t/distcom2.sh b/t/distcom2.sh
index b96eefd..794d2ff 100755
--- a/t/distcom2.sh
+++ b/t/distcom2.sh
@@ -57,11 +57,11 @@ for opt in '' --no-force; do
cat dc.txt # For debugging.
cat subdir/dc.txt # Likewise.
- $FGREP ' $(am__config_aux_dir)/depcomp ' subdir/dc.txt
+ $FGREP ' $(am.conf.aux-dir)/depcomp ' subdir/dc.txt
# 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 \
+ $FGREP ' $(am.conf.aux-dir)/compile ' dc.txt \
|| $FGREP ' compile ' dc.txt
done
diff --git a/t/flavor.sh b/t/flavor.sh
index 91b3341..90e0b15 100755
--- a/t/flavor.sh
+++ b/t/flavor.sh
@@ -43,7 +43,7 @@ for flavor in --gnits --gnu --foreign --ignore-deps; do
$MAKE
# Two code paths in configure.am:
- # - either a file in $(am__configure_deps) has been updated ...
+ # - either a file in $(am.remake.configure-deps) has been updated ...
$sleep
touch aclocal.m4
$MAKE
diff --git a/t/remake-all-1.sh b/t/remake-all-1.sh
index b57157a..a6ec8e2 100755
--- a/t/remake-all-1.sh
+++ b/t/remake-all-1.sh
@@ -46,7 +46,7 @@ $FGREP "$magic1" mkfile.in && exit 1 # Sanity check.
# Two code paths in configure.am:
-# - either a file in $(am__configure_deps) has been updated ...
+# - either a file in $(am.remake.configure-deps) has been updated ...
$sleep
echo "AC_SUBST([FOO])" >> configure.ac
$MAKE
diff --git a/t/yacc-auxdir.sh b/t/yacc-auxdir.sh
index d531758..7e5db72 100755
--- a/t/yacc-auxdir.sh
+++ b/t/yacc-auxdir.sh
@@ -50,7 +50,7 @@ test -f aux1/ylwrap
test ! -e ylwrap
test ! -e sub/ylwrap
grep -i 'ylwrap' Makefile.in sub/Makefile.in # For debugging.
-$FGREP '$(am__config_aux_dir)/ylwrap' Makefile.in
-$FGREP '$(am__config_aux_dir)/ylwrap' sub/Makefile.in
+$FGREP '$(am.conf.aux-dir)/ylwrap' Makefile.in
+$FGREP '$(am.conf.aux-dir)/ylwrap' sub/Makefile.in
:
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-584-gf7b16b4,
Stefano Lattarini <=