From: Stefano Lattarini Date: Sun, 22 Jul 2012 15:59:13 +0000 (+0200) Subject: [ng] rename: am__config_aux_dir -> am.conf.aux-dir X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b0aa3214c7588320101c604b36a65f7bf1395998;p=thirdparty%2Fautomake.git [ng] rename: am__config_aux_dir -> am.conf.aux-dir Signed-off-by: Stefano Lattarini --- diff --git a/automake.in b/automake.in index 3b9740d52..e238106f2 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 } @@ -4176,7 +4176,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 +4188,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 +5070,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 +6520,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 +6903,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/parallel-tests.am b/lib/am/parallel-tests.am index 19e21a623..61d3c8a57 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/texi-vers.am b/lib/am/texi-vers.am index 0608e0b81..1053dcd73 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 ce3d18861..8a6b28e2f 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 c071fe717..a7602e5a8 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 0d01d247b..c17bf86c2 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 6c6e0554e..1e42ebb01 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/distcom2.sh b/t/distcom2.sh index b96eefd61..794d2ffd1 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/yacc-auxdir.sh b/t/yacc-auxdir.sh index d531758f2..7e5db72f2 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 :