Signed-off-by: Stefano Lattarini <stefano.lattar...@gmail.com> --- automake.in | 2 +- lib/am/check-typos.am | 2 +- lib/am/serial-tests.am | 2 +- t/all-prog-libs.sh | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/automake.in b/automake.in index 4b2faf9..5b9db39 100644 --- a/automake.in +++ b/automake.in @@ -6948,7 +6948,7 @@ 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-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; diff --git a/lib/am/check-typos.am b/lib/am/check-typos.am index 6e4b804..ef45246 100644 --- a/lib/am/check-typos.am +++ b/lib/am/check-typos.am @@ -71,7 +71,7 @@ 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) \ + $(sort $(call am__canon, $(am.all-progs) \ $(am__all_libs) \ $(am__all_ltlibs))) 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/t/all-prog-libs.sh b/t/all-prog-libs.sh index 60da56c..357b85d 100755 --- a/t/all-prog-libs.sh +++ b/t/all-prog-libs.sh @@ -15,7 +15,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # Test internal automake variables: -# - $(am__all_progs). +# - $(am.all-progs). # - $(am__all_libs). # - $(am__all_ltlibs). @@ -62,11 +62,11 @@ my_SCRIPTS = x5 .PHONY: debug test debug: - @echo PROGS-BEG: $(am__all_progs) :PROGS-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-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 -- 1.7.10.4