diff options
| author | Matthias Paulmier <matthias.paulmier@etu.u-bordeaux.fr> | 2018-06-11 16:04:38 +0200 |
|---|---|---|
| committer | Matthias Paulmier <matthias.paulmier@etu.u-bordeaux.fr> | 2018-06-22 14:18:55 +0200 |
| commit | 17babb6e4fee5288309b56c6c724eada1b451ca5 (patch) | |
| tree | 1db31631a2f4743503206305b05602f26905a7b9 | |
| parent | 7f20965b622abc1487382125814edd23ff343335 (diff) | |
| download | automake-17babb6e4fee5288309b56c6c724eada1b451ca5.tar.gz | |
CondStack.pm: Move @cond_stack to this file
This global variable is better to be served from this module.
| -rw-r--r-- | lib/Automake/CondStack.pm | 7 | ||||
| -rw-r--r-- | lib/Automake/Global.pm | 26 |
2 files changed, 17 insertions, 16 deletions
diff --git a/lib/Automake/CondStack.pm b/lib/Automake/CondStack.pm index 5d5260719..45cec9b9e 100644 --- a/lib/Automake/CondStack.pm +++ b/lib/Automake/CondStack.pm @@ -27,7 +27,12 @@ use Automake::ChannelDefs; use vars qw (@ISA @EXPORT); @ISA = qw (Exporter); -@EXPORT = qw (cond_stack_if cond_stack_else cond_stack_endif); +@EXPORT = qw (@cond_stack &cond_stack_if &cond_stack_else &cond_stack_endif); + + +# This is the conditional stack, updated on if/else/endif, and +# used to build Condition objects. +our @cond_stack; my %_am_macro_for_cond = ( diff --git a/lib/Automake/Global.pm b/lib/Automake/Global.pm index 2288d655a..73d0bbfac 100644 --- a/lib/Automake/Global.pm +++ b/lib/Automake/Global.pm @@ -43,17 +43,17 @@ use vars qw (@ISA @EXPORT); %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 @cond_stack @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); + $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. ## @@ -375,10 +375,6 @@ our $output_header; our $output_rules; our $output_trailer; -# This is the conditional stack, updated on if/else/endif, and -# used to build Condition objects. -our @cond_stack; - # This holds the set of included files. our @include_stack; |