[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Automake-NG] [PATCH 10/14] [ng] refactoring: no "cleaning" rules in com
From: |
Stefano Lattarini |
Subject: |
[Automake-NG] [PATCH 10/14] [ng] refactoring: no "cleaning" rules in compile.am |
Date: |
Thu, 21 Jun 2012 12:32:41 +0200 |
* 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 <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);
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
- [Automake-NG] [PATCH 08/14] [ng] cleanup: remove 'depend.am', (continued)
- [Automake-NG] [PATCH 08/14] [ng] cleanup: remove 'depend.am', Stefano Lattarini, 2012/06/21
- [Automake-NG] [PATCH 11/14] [ng] cleanup: merge '%compile_clean_files' in '%clean_files', Stefano Lattarini, 2012/06/21
- [Automake-NG] [PATCH 09/14] [ng] clean: don't remove object files in '.' unconditionally, Stefano Lattarini, 2012/06/21
- [Automake-NG] [PATCH 07/14] [ng] refactoring: move definition of $(am__mv) in depend2.am, Stefano Lattarini, 2012/06/21
- [Automake-NG] [PATCH 10/14] [ng] refactoring: no "cleaning" rules in compile.am,
Stefano Lattarini <=
- [Automake-NG] [PATCH 12/14] [ng] refactor: prefer '&file_contents' over '&file_contents_internals', Stefano Lattarini, 2012/06/21
- [Automake-NG] [PATCH 14/14] [ng] check: keep cleaning of '.log' and '.trs' files near other rules, Stefano Lattarini, 2012/06/21
- [Automake-NG] [PATCH 13/14] [ng] cleanup: remove 'libtool.am', Stefano Lattarini, 2012/06/21