[ng] refactoring: no "cleaning" rules in compile.am

* 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".

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>

diff --git a/automake.in b/automake.in
index 77f6d134f32405f179fef08ef3048b1333b3d17b..42e6de5f0ed9d4650d62dfe403d43d6c95131508 100644 (file)
--- 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);
    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 9447bcc5940a8d5bbac95ecd895a14433fe03d8d..ceb5c9d38d94dccaea821142a00cc9fd74e19397 100644 (file)
--- 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