Re: [Automake-NG] [PATCH 10/14] [ng] refactoring: no "cleaning" rules in compile.am

[Akim Demaille]

Le 21 juin 2012 à 12:32, Stefano Lattarini a écrit :

> * automake.in (handle_compile): To ensure the compiled objects are
> removed, simply merge the contents of '%compile_clean_files' into
> '%clean_files' here, instead of ...
> * lib/am/compile.am (am__mostlyclean_files): ... appending them to
> this variable here.  While we are at it, remove a stray declaration
> of the already-deleted target 'mostlyclean-compile' as ".PHONY".

I was about to ask, in the previous patch :)

Actually, do you still need %compile_clean_files?

> Signed-off-by: Stefano Lattarini <address@hidden>
> ---
> automake.in       |    5 ++---
> lib/am/compile.am |    4 ----
> 2 files changed, 2 insertions(+), 7 deletions(-)
> 
> diff --git a/automake.in b/automake.in
> index dd9cb25..62206b7 100644
> --- a/automake.in
> +++ b/automake.in
> @@ -2221,12 +2221,11 @@ sub handle_compile ()
> {
>    return if ! $must_handle_compiled_objects;
> 
> -   my @mostly_cleaned = sort keys %compile_clean_files;
> +   %mostly_cleaned = (%compile_clean_files, %mostly_cleaned);

Why not %clean_files => MOSTLY_CLEAN?

>    my ($coms, $vars, $rules) =
>       &file_contents_internal (1, "$libdir/am/compile.am",
>                              new Automake::Location,
> -                            'STDINC' => ! option 'nostdinc',
> -                            'MOSTLY-CLEANED' => "@mostly_cleaned");
> +                            'STDINC' => ! option 'nostdinc');
>     $output_vars .= $vars;
>     $output_rules .= "$coms$rules";
> }
> diff --git a/lib/am/compile.am b/lib/am/compile.am
> index 9447bcc..ceb5c9d 100644
> --- a/lib/am/compile.am
> +++ b/lib/am/compile.am
> @@ -26,7 +26,3 @@ AM_DEFAULT_INCLUDES = \
> else !%?STDINC%
> AM_DEFAULT_INCLUDES =
> endif !%?STDINC%
> -
> -am__mostlyclean_files += %MOSTLY-CLEANED%
> -
> -.PHONY: mostlyclean-compile
> -- 
> 1.7.9.5
> 
>