diff options
| author | Akim Demaille <akim@epita.fr> | 2003-07-06 19:27:29 +0000 |
|---|---|---|
| committer | Akim Demaille <akim@epita.fr> | 2003-07-06 19:27:29 +0000 |
| commit | d23e68215c6c6bd2cd9deb4df74b86a54fbe70e6 (patch) | |
| tree | 595503e637363cd868abddcb5767de2221dcfab6 /automake.in | |
| parent | f9cef4a35ffef7b11611095b59088c4fe5ecd07b (diff) | |
| download | automake-d23e68215c6c6bd2cd9deb4df74b86a54fbe70e6.tar.gz | |
* automake.in (&define_files_variable): New.
(&handle_texinfo_helper): Move the handling of user variables from
here, to...
(&handle_texinfo): here.
This is to balance the size of these functions, and to match the
convention of other _helper functions.
(&handle_texinfo_helper): Use &define_files_variable.
Move some code to use less variables.
Rename $info_cursor as $texi.
(&handle_texinfo): Do not call handle_texinfo_helper if there are
no TEXINFOS.
* lib/am/texinfos.am: Sort the occurrences of dvi, info, pdf, ps
and html.
Remove *-recursive targets from .PHONY, they are part of
$(RECURSIVE_TARGETS) anyway.
(install-info, mostlyclean-aminfo): Are .PHONY.
Diffstat (limited to 'automake.in')
| -rwxr-xr-x | automake.in | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/automake.in b/automake.in index d331fa266..ded8717ae 100755 --- a/automake.in +++ b/automake.in @@ -1278,7 +1278,7 @@ sub generate_makefile &handle_man_pages; &handle_data; &handle_headers; - &handle_subdirs; + handle_subdirs; &handle_tags; &handle_minor_options; &handle_tests; @@ -3714,8 +3714,10 @@ sub handle_dist } +# &handle_subdirs () +# ------------------ # Handle subdirectories. -sub handle_subdirs +sub handle_subdirs () { my $subdirs = var ('SUBDIRS'); return @@ -3768,7 +3770,7 @@ sub handle_subdirs } $output_rules .= &file_contents ('subdirs', new Automake::Location); - rvar ('RECURSIVE_TARGETS')->rdef (TRUE)->{'pretty'} = VAR_PRETTY; # Gross! + rvar ('RECURSIVE_TARGETS')->rdef (TRUE)->{'pretty'} = VAR_SORTED; # Gross! } |