* automake.in (handle_compile): Compiled objects are always to be
removed upon make mostlyclean, and not (not even sometimes) upon
make distclean. Simplify accordingly, removing the checks for a
condition that was never true.
* am/compile.am: Simplify accordingly, and do not bother cleaning
Similar to the '%clean_files' variable, but it will allow us to declare
directories (rather than regular files) that are to be cleaned by the
four flavours of cleaning targets ('mostlyclean', 'clean', 'distclean',
'maintainer-clean'). This will be especially useful in later changes.
*
No need to keep them separated anymore.
* automake.in (%compile_clean_files): Delete.
(initialize_per_input): Don't reset it.
(handle_compile): Don't merge '%compile_clean_files'
contents into '%clean_files'.
(handle_single_transform): Update '%clean_files', not
'%compile_clean_files'.
Do that only if some source file is actually present in the current
directory (which might not be the case for, say, projects that use
a non-recursive make setup and have all sources in the 'src' and 'lib'
subdirectories).
* lib/am/compile.am (am__mostlyclean_files): Don't append '*.$(OBJEXT)'
A tiny refactoring only needed by the subsequent change.
* lib/am/depend.am (am__mv): Move definition ...
* lib/am/depend2.am [%?FIRST%]: ... here, with a new explicative
comment.
Signed-off-by: Stefano Lattarini stefano.lattar...@gmail.com
---
lib/am/depend.am |1 -
lib/am/depend2.am |
Le 21 juin 2012 à 12:32, Stefano Lattarini a écrit :
OK.
+my @mostly_rms = map { \t-rm -f $_ } sort keys %compile_clean_files;
my ($coms, $vars, $rules) =
file_contents_internal (1, $libdir/am/compile.am,
new Automake::Location,
-
Le 21 juin 2012 à 12:32, Stefano Lattarini a écrit :
This change it introduces eight new internal variables, which our
all
can been appended to by our Makefile fragments to declare stuff that
should be cleaned upon the various make *clean targets; these new
variables are:
-
Le 21 juin 2012 à 12:32, Stefano Lattarini a écrit :
It's so small and dumb that it's easier and cleaner to just inline
it in the automake script.
* lib/am/depend.am: Delete.
* Makefile.am (dist_am_DATA): Remove it.
* automake.in (handle_languages): Just add the list of all the '.deps'
Le 21 juin 2012 à 12:32, Stefano Lattarini a écrit :
No need to keep them separated anymore.
* automake.in (%compile_clean_files): Delete.
(initialize_per_input): Don't reset it.
(handle_compile): Don't merge '%compile_clean_files'
contents into '%clean_files'.
(handle_single_transform):
Le 21 juin 2012 à 12:32, Stefano Lattarini a écrit :
+ foreach my $dir (%libtool_clean_directories)
+{
+ # '.libs' is for Unix, '_libs' for DOS.
+ $clean_dirs{$dir/.libs} = CLEAN;
+ $clean_dirs{$dir/_libs} = CLEAN;
[._]libs?
+}
+
+ if ($relative_dir eq '.')
+
Le 21 juin 2012 à 12:32, Stefano Lattarini a écrit :
* lib/am/parallel-tests.am: Add $(am__test_results), $(am__test_logs)
and $(TEST_SUITE_LOGS) to the list of files removed by make mostlyclean
here ...
* automake.in (handle_tests): ... rather than here.
Good too.
Nice cleaning job.
Le 20 juin 2012 à 16:44, Stefano Lattarini a écrit :
* syntax-checks.mk (sc_tests_makefile_variable_order): Remove. This
rule checked that all variables definitions were listed before rules
in the automake-generated Makefile.in files; but this invariant is not
guaranteed anymore by
On Thu, Jun 21, 2012 at 10:32 UTC, Stefano Lattarini wrote:
* automake.in (handle_compile): Compiled objects are always to be
removed upon make mostlyclean, and not (not even sometimes) upon
make distclean.
This is awkward. I suggest:
Compiled objects must be removed by make mostlyclean, but
On Thu, Jun 21, 2012 at 10:32 AM, Stefano Lattarini wrote:
* lib/am/depend.am: Since in Automake-NG the generated Makefile calls
'-include' (not 'include') on the dependency tracking '.Po' files, we
can remove them at any time without causing any 'make' call to fail.
I assume you already
On Thu, Jun 21, 2012 at 10:32 AM, Stefano Lattarini
stefano.lattar...@gmail.com wrote:
Possible culprits have been identified with the command git grep '-rm\b'.
* NG-NEWS: Update.
* lib/am/tags.am, lib/am/distdir.am, lib/am/dejagnu.am, lib/am/clean.am: Do
not invoke rm when the - recipe
On Thu, Jun 21, 2012 at 10:32 UTC, Stefano Lattarini wrote:
This change it introduces eight new internal variables, which our
s/ our//
The rest looks good.
Cheers,
Dave Hart
Hi Dave, thanks for the review.
On 06/21/2012 07:16 PM, Dave Hart wrote:
On Thu, Jun 21, 2012 at 10:32 AM, Stefano Lattarini wrote:
* lib/am/depend.am: Since in Automake-NG the generated Makefile calls
'-include' (not 'include') on the dependency tracking '.Po' files, we
can remove them at
Hi Akim.
On 06/21/2012 02:35 PM, Akim Demaille wrote:
Le 21 juin 2012 à 12:32, Stefano Lattarini a écrit :
OK.
+my @mostly_rms = map { \t-rm -f $_ } sort keys %compile_clean_files;
my ($coms, $vars, $rules) =
file_contents_internal (1, $libdir/am/compile.am,
On Thu, Jun 21, 2012 at 18:29 UTC, Stefano Lattarini wrote:
Hi Dave, thanks for the review.
On 06/21/2012 07:16 PM, Dave Hart wrote:
On Thu, Jun 21, 2012 at 10:32 AM, Stefano Lattarini wrote:
* lib/am/depend.am: Since in Automake-NG the generated Makefile calls
'-include' (not 'include') on
On 06/21/2012 02:49 PM, Akim Demaille wrote:
Le 21 juin 2012 à 12:32, Stefano Lattarini a écrit :
This change it introduces eight new internal variables, which our
all
Thanks, fixed (our was a leftover from a previous, alternative wording).
can been appended to by our Makefile
On 06/21/2012 02:59 PM, Akim Demaille wrote:
Le 21 juin 2012 à 12:32, Stefano Lattarini a écrit :
Do that only if some source file is actually present in the current
directory (which might not be the case for, say, projects that use
a non-recursive make setup and have all sources in the
* automake.in (handle_libtool): Do not bother cleaning '_libs'
directories, they are only used by Libtool on MS-DOS (and we
don't support that anymore).
Signed-off-by: Stefano Lattarini stefano.lattar...@gmail.com
---
automake.in |2 --
1 file changed, 2 deletions(-)
diff --git
No need to keep them separated anymore.
* automake.in (%libtool_clean_directories): Delete.
(initialize_per_input): Don't reset it.
(handle_compile): Don't merge '%libtool_clean_directories' (after
proper editing) into '%clean_dirs'.
(handle_ltlibraries, handle_programs, handle_single_transform):
Hi Dave.
On 06/21/2012 12:33 AM, Dave Hart wrote:
I had no idea missing would monkey with timestamps like that. I'm
wholeheartedly in favor of removing that capability in the name of
predictably correct results.
Glad you agree :-)
While I agree fix-timestamps.sh might be a clearer name,
* doc/automake-history.texi: Use '@item' instead of '@itemx' where
appropriate.
Signed-off-by: Stefano Lattarini stefano.lattar...@gmail.com
---
doc/automake-history.texi |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/doc/automake-history.texi
commit 488de31efa525d864ad56cd023f3b33c83101088
Merge: 7c6310c d0dc448
Author: Stefano Lattarini stefano.lattar...@gmail.com
Date: Thu Jun 21 13:15:05 2012 +0200
Merge branch 'maint'
* maint:
docs: avoid failures with development version of Texinfo (4.13.90)
typofix: s/test
On 06/21/2012 05:44 PM, Dave Hart wrote:
On Thu, Jun 21, 2012 at 9:54 AM, Stefano Lattarini
stefano.lattar...@gmail.com wrote:
On 06/21/2012 12:33 AM, Dave Hart wrote:
While I agree fix-timestamps.sh might be a clearer name, using the
name bootstrap for the clone-from-VCS
On 06/14/2012 09:55 PM, Stefano Lattarini wrote:
This is as far as I got in my line-by-line review in the time I have
today; if you want to wait for another few days, I can resume my review
in time for your initial push. Or you can go ahead and push, and I can
report any further issues for
On Thu, Jun 21, 2012 at 9:54 AM, Stefano Lattarini
stefano.lattar...@gmail.com wrote:
On 06/21/2012 12:33 AM, Dave Hart wrote:
While I agree fix-timestamps.sh might be a clearer name, using the
name bootstrap for the clone-from-VCS before-first-configure step.
NTP tarballs carry a bootstrap
[Adding the Automake list in CC:]
On 06/20/2012 09:57 PM, Jeff King wrote:
On Wed, Jun 20, 2012 at 02:45:31PM -0500, Jonathan Nieder wrote:
Jeff King wrote:
Did you read the argument in patch 2? They are almost certainly not
helping anyone, anyway.
Yes, I read patch 2. I hacked on git
Hello
I have automake 1.11.1 (on CentOS 6.2 x86_64), and a Makefile.am like this:
AM_YFLAGS=-d
BUILT_SOURCES=position.hh location.hh code-formatter-parser.hh stack.hh
bin_PROGRAMS=code-formatter
code_formatter_SOURCES=code-formatter-parser.yy code-formatter-lexer.ll\
31 matches
Mail list logo
