Rearrange file exports and function prototypes

* automake.in: Rearrange function prototypes.
* lib: Remove useless exports.

3 files changed, 46 insertions, 16 deletions

diff --git a/bin/automake.in b/bin/automake.in
index 556780eb2..e76e19a09 100755
--- a/bin/automake.in
+++ b/bin/automake.in
@@ -83,16 +83,32 @@ use Carp;
 ## Subroutine prototypes.  ##
 ## ----------------------- ##
 
+sub am_install_var;
+sub am_primary_prefixes;
 sub append_exeext (&$);
+sub backname;
+sub check_canonical_spelling;
+sub check_directories_in_var;
+sub check_directory;
 sub check_gnits_standards ();
 sub check_gnu_standards ();
+sub check_libobjs_sources;
 sub check_trailing_slash ($\$);
 sub check_typos ();
-sub define_verbose_libtool ();
-sub define_verbose_texinfo ();
+sub define_compiler_variable;
+sub define_linker_variable;
+sub define_objects_from_sources;
+sub define_per_target_linker_variable;
 sub do_check_merge_target ();
+sub generate_makefile;
 sub get_number_of_threads ();
+sub handle_ALLOCA;
+sub handle_LIBOBJS;
+sub handle_LIBOBJS_or_ALLOCA;
+sub handle_all;
+sub handle_clean;
 sub handle_compile ();
+sub handle_configure;
 sub handle_data ();
 sub handle_dist ();
 sub handle_emacs_lisp ();
@@ -103,37 +119,53 @@ sub handle_headers ();
 sub handle_install ();
 sub handle_java ();
 sub handle_languages ();
+sub handle_lib_objects;
 sub handle_libraries ();
 sub handle_libtool ();
 sub handle_ltlibraries ();
+sub handle_makefile;
 sub handle_makefiles_serial ();
+sub handle_makefiles_threaded;
 sub handle_man_pages ();
 sub handle_minor_options ();
 sub handle_options ();
+sub handle_per_suffix_test;
 sub handle_programs ();
 sub handle_python ();
 sub handle_scripts ();
+sub handle_single_transform;
+sub handle_source_transform;
 sub handle_subdirs ();
 sub handle_tags ();
 sub handle_targets ();
 sub handle_tests ();
 sub handle_tests_dejagnu ();
 sub handle_texinfo ();
+sub handle_texinfo_helper;
 sub handle_user_recursion ();
 sub initialize_per_input ();
-sub lang_lex_finish ();
-sub lang_sub_obj ();
-sub lang_vala_finish ();
-sub lang_yacc_finish ();
+sub is_valid_test_extension;
+sub locate_am;
+sub output_texinfo_build_rules;
 sub parse_arguments ();
+sub prepend_srcdir;
+sub print_autodist_files;
+sub read_am_file;
+sub read_main_am_file;
+sub rewrite_inputs_into_dependencies;
 sub scan_aclocal_m4 ();
+sub scan_autoconf_config_files;
 sub scan_autoconf_files ();
-sub silent_flag ();
-sub transform ($\%);
-sub transform_token ($\%$);
+sub scan_autoconf_traces;
+sub scan_texinfo_file;
+sub shadow_unconditionally;
+sub split_config_file_spec;
+sub substitute_ac_subst_variables;
+sub substitute_ac_subst_variables_worker;
+sub target_cmp;
 sub usage ();
+sub user_phony_rule;
 sub version ();
-sub yacc_lex_finish_helper ();
 
 ################################################################
 
diff --git a/lib/Automake/Global.pm b/lib/Automake/Global.pm
index b025fc9f3..25a703608 100644
--- a/lib/Automake/Global.pm
+++ b/lib/Automake/Global.pm
@@ -38,7 +38,7 @@ use vars qw (@ISA @EXPORT);
     @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
-    $package_version_location $required_conf_file_queue $relative_dir
+    $package_version_location $required_conf_file_queue
     $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
diff --git a/lib/Automake/Requires.pm b/lib/Automake/Requires.pm
index dbb1c10ed..587a194b0 100644
--- a/lib/Automake/Requires.pm
+++ b/lib/Automake/Requires.pm
@@ -19,11 +19,9 @@ use vars '@ISA', '@EXPORT';
 
 @ISA = qw (Exporter);
 
-@EXPORT = qw (push_required_file required_file_check_or_copy
-    require_file_internal require_file require_file_with_macro
-    require_libsource_with_macro queue_required_file_check_or_copy
-    require_queued_file_check_or_copy require_conf_file
-    require_conf_file_with_macro require_build_directory
+@EXPORT = qw (require_file require_file_with_macro
+    require_libsource_with_macro require_queued_file_check_or_copy
+    require_conf_file require_conf_file_with_macro require_build_directory
     require_build_directory_maybe);
 
 # push_required_file ($DIR, $FILE, $FULLFILE)