diff options
author | Matthias Paulmier <matthias.paulmier@etu.u-bordeaux.fr> | 2018-06-11 16:12:05 +0200 |
---|---|---|
committer | Matthias Paulmier <matthias.paulmier@etu.u-bordeaux.fr> | 2018-06-22 14:19:00 +0200 |
commit | 2873033e62c6396eac407fef6d94b2e0a60b8e5c (patch) | |
tree | c892606fdafdd1ce8b62101c58edb1265debea7c | |
parent | 17babb6e4fee5288309b56c6c724eada1b451ca5 (diff) | |
download | automake-2873033e62c6396eac407fef6d94b2e0a60b8e5c.tar.gz |
ConfVars.pm: Move global vars to this module
The variables are coherent with the methods served by this module.
The module still needs some documentation.
-rw-r--r-- | lib/Automake/ConfVars.pm | 15 | ||||
-rw-r--r-- | lib/Automake/Global.pm | 43 |
2 files changed, 30 insertions, 28 deletions
diff --git a/lib/Automake/ConfVars.pm b/lib/Automake/ConfVars.pm index 8d7f362b0..a962d848a 100644 --- a/lib/Automake/ConfVars.pm +++ b/lib/Automake/ConfVars.pm @@ -36,8 +36,21 @@ use Automake::Variable; use vars qw (@ISA @EXPORT); @ISA = qw (Exporter); -@EXPORT = qw (define_standard_variables); +@EXPORT = qw (%configure_vars %ignored_configure_vars $output_vars + &define_standard_variables); +# Hash table of discovered configure substitutions. Keys are names, +# values are 'FILE:LINE' strings which are used by error message +# generation. +our %configure_vars = (); + +# Ignored configure substitutions (i.e., variables not to be output in +# Makefile.in) +our %ignored_configure_vars = (); + +# This variable is used when generating each Makefile.in. It holds the +# Makefile.in vars until the file is ready to be printed +our $output_vars; sub _define_configure_variable ($) { diff --git a/lib/Automake/Global.pm b/lib/Automake/Global.pm index 73d0bbfac..6ca9b864d 100644 --- a/lib/Automake/Global.pm +++ b/lib/Automake/Global.pm @@ -37,23 +37,22 @@ use vars qw (@ISA @EXPORT); $seen_gettext $seen_gettext_external $seen_gettext_intl @extra_recursive_targets %libtool_tags $libtool_new_api $seen_canonical $package_version $seen_ar %required_aux_file $seen_init_automake - $seen_automake_version %configure_vars %ignored_configure_vars - @configure_deps $configure_deps_greatest_timestamp %configure_cond - %extension_map @configure_dist_common %languages %link_languages - %sourceflags %required_targets $am_file $configure_ac $ac_gettext_location - $seen_maint_mode $package_version_location $required_conf_file_queue - $relative_dir $output_deps_greatest_timestamp $output_vars $output_all - $output_header $output_rules $output_trailer @include_stack @all @check - @check_tests %clean_files %compile_clean_files %libtool_clean_directories - @sources @dist_sources %object_map %object_compilation_map %directory_map - %dep_files @dist_targets @proglist @liblist @ltliblist @dup_shortnames - %known_programs %known_libraries %extension_seen %language_scratch - %lang_specific_files @dist_common $handle_dist_run %linkers_used - $need_link $must_handle_compiled_objects %transformed_files %am_file_cache - AC_CANONICAL_BUILD AC_CANONICAL_HOST AC_CANONICAL_TARGET MOSTLY_CLEAN - CLEAN DIST_CLEAN MAINTAINER_CLEAN LANG_IGNORE LANG_PROCESS LANG_SUBDIR - COMPILE_LIBTOOL COMPILE_ORDINARY INTERNAL QUEUE_MESSAGE QUEUE_CONF_FILE - QUEUE_LOCATION QUEUE_STRING); + $seen_automake_version @configure_deps $configure_deps_greatest_timestamp + %configure_cond %extension_map @configure_dist_common %languages + %link_languages %sourceflags %required_targets $am_file $configure_ac + $ac_gettext_location $seen_maint_mode $package_version_location + $required_conf_file_queue $relative_dir $output_deps_greatest_timestamp + $output_all $output_header $output_rules $output_trailer @include_stack + @all @check @check_tests %clean_files %compile_clean_files + %libtool_clean_directories @sources @dist_sources %object_map + %object_compilation_map %directory_map %dep_files @dist_targets @proglist + @liblist @ltliblist @dup_shortnames %known_programs %known_libraries + %extension_seen %language_scratch %lang_specific_files @dist_common + $handle_dist_run %linkers_used $need_link $must_handle_compiled_objects + %transformed_files %am_file_cache AC_CANONICAL_BUILD AC_CANONICAL_HOST + AC_CANONICAL_TARGET MOSTLY_CLEAN CLEAN DIST_CLEAN MAINTAINER_CLEAN + LANG_IGNORE LANG_PROCESS LANG_SUBDIR COMPILE_LIBTOOL COMPILE_ORDINARY + INTERNAL QUEUE_MESSAGE QUEUE_CONF_FILE QUEUE_LOCATION QUEUE_STRING); ## ----------- ## ## Constants. ## @@ -277,15 +276,6 @@ our $seen_init_automake = 0; # TRUE if we've seen AM_AUTOMAKE_VERSION. our $seen_automake_version = 0; -# Hash table of discovered configure substitutions. Keys are names, -# values are 'FILE:LINE' strings which are used by error message -# generation. -our %configure_vars = (); - -# Ignored configure substitutions (i.e., variables not to be output in -# Makefile.in) -our %ignored_configure_vars = (); - # Files included by $configure_ac. our @configure_deps = (); @@ -369,7 +359,6 @@ our $output_deps_greatest_timestamp; # These variables are used when generating each Makefile.in. # They hold the Makefile.in until it is ready to be printed. -our $output_vars; our $output_all; our $output_header; our $output_rules; |