|
1609491e
|
2010-12-20T18:29:50
|
|
Warnings win over strictness in AUTOMAKE_OPTIONS.
Ensure that, for what concerns the options specified in
AUTOMAKE_OPTIONS, explicitly-defined warnings always take
precedence over implicit strictness-implied warnings.
This finally fixes Automake bug#7669 a.k.a. PR/547.
* automake.in (handle_options): Call 'process_option_list'
only once per set of options.
* lib/Automake/Options.pm (process_global_option_list,
process_option_list): Add sanity checks.
($_options_processed, $_global_options_processed): New
internal variables, used by the sanity checks above.
* tests/warnings-win-over-strictness.test: Extend.
|
|
|
f90a06c1
|
2010-12-20T16:59:08
|
|
Change signature of 'Automake::Options::_process_option_list()'.
This only modifies internal details in the automake implementation,
bearing no externally visible effect, but preparing the way for the
final fix of Automake bug#7669 a.k.a. PR/547.
* lib/Automake/Options.pm (_process_option_list): Now accepts as
arguments a list of hash references with keys 'option' and 'where',
where 'option' is an option as might occur in AUTOMAKE_OPTIONS or
M_INIT_AUTOMAKE, and 'where' is the location where that occurred.
(process_option_list, process_global_option_list): Update.
* automake.in (handle_options, scan_autoconf_traces): Update.
|
|
|
b67240eb
|
2010-12-20T12:10:56
|
|
Warnings win over strictness on command line.
This change ensures that, on the command line at least, explicitly
defined warnings always take precedence over implicit strictness
implied warnings. Related to Automake bug#7669 a.k.a. PR/547.
* automake.in (parse_arguments): Parse warnings only after the
strictness level has been processed.
* tests/gnuwarn.test: Update, plus miscellaneous improvements.
* tests/warnings-win-over-strictness.test: New test.
* tests/Makefile.am (TESTS): Update.
|
|
|
05e77ab5
|
2011-01-11T01:00:13
|
|
Merge branch 'yacc-work'
|
|
|
834dc3a9
|
2011-01-10T15:50:35
|
|
yacc: warn about conditional content in *YFLAGS variables
This commit fixes automake bug#7804.
* automake.in (lang_yacc_target_hook): Warn if any of the relevant
*YFLAGS variables has conditional contents (not only a conditional
definition). Related refactoring.
* NEWS: Updated.
* tests/yflags-conditional.test: Updated and extended.
* tests/yflags-conditional-force.test: New test.
* tests/Makefile.am (TESTS): Updated.
|
|
|
405477b5
|
2011-01-09T16:20:34
|
|
Merge branch 'yacc-work'
|
|
|
3544a43c
|
2011-01-07T21:52:56
|
|
yacc: support variable expansions in *YFLAGS definition.
This change fixes automake bug#7800.
* automake.in (lang_yacc_target_hook): Use 'value_as_list_recursive'
instead of 'variable_value' to get the value of *YFLAGS variables.
Related changes.
($DASH_D_PATTERN): Removed.
* tests/Makefile.am (XFAIL_TESTS): Remove yflags-var-expand.test.
* tests/yacc-clean.test: Remove workaround for now-fixed bug.
* NEWS: Update.
|
|
|
a71a5686
|
2011-01-09T15:30:42
|
|
Merge branch 'maint'
|
|
|
638f21a1
|
2011-01-08T13:04:10
|
|
automake: minor fixes in comments
* automake.in: Some minor fixes and enhancements in comments.
|
|
|
a297a165
|
2011-01-07T22:01:20
|
|
Merge branch 'yacc-clean'
|
|
|
ed2c8bc8
|
2011-01-07T15:44:47
|
|
yacc: "make clean" removes .c and .h files from non-distributed .y
Previously, while automake did *not* distribute C source and header
files derived from non-distributed Yacc sources, it still caused
them to be removed only by "make maintainer-clean" only, and not by
simply "make clean" or "make distclean".
This caused "make distcheck" to fail, unless the developer put
those generated .c and .h files in CLEANFILES or in DISTCLEANFILES
by hand.
This change fixes this issue, by making non-distributed `.c' and
`.h' files generated by non-distributed Yacc sources cleaned by
"make clean".
* tests/automake.in (lang_yacc_target_hook): Make C source and
header files derived from non-distributed Yacc files cleaned by
"make clean", not only by "make maintainer-clean".
* tests/yacc-clean.test: New test.
* tests/Makefile.am (TESTS): Update.
* NEWS: Update.
|
|
3c9e7acc
|
2011-01-02T05:38:18
|
|
Merge branch 'maint'
|
|
|
511ccb16
|
2011-01-02T05:31:41
|
|
Bump copyright years.
* aclocal.in (write_aclocal, version): Bump copyright years.
* automake.in (gen_copyright, version): Likewise.
* doc/automake.texi: Likewise.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
|
|
3fe9baba
|
2010-12-23T21:41:45
|
|
Merge branch 'tests-suffix-extend'
Conflicts:
tests/suffix10.test
|
|
|
20fb9ceb
|
2010-05-14T21:19:32
|
|
Work around a bug in file-inclusion mechanism of Solaris make.
* automake.in (handle_single_transform): In the name of the
dependency file: collapse multiple slash characters into a single
one.
* tests/subobj11a.test: New test.
* tests/subobj11b.test: Likewise.
* tests/subobj11c.test: Likewise.
* tests/depcomp8a.test: Likewise.
* tests/depcomp8b.test: Likewise.
* tests/Makefile.am (TESTS): Updated.
* NEWS: Updated.
Report by Stefano Lattarini, quick fix by Ralf Wildenhues, final
patch and tests by Stefano Lattarini.
|
|
|
bd322a85
|
2010-11-26T16:04:06
|
|
Remove long-deprecated options --Werror and --Wno-error.
These options has been deprecated at least since commit
"Release-1-6-1b-35-gc037f20", dated 2002-07-06.
* automake.in (parse_arguments): Do not recognize anymore options
`--Werror' and `--Wno-error' as synonyms of respectively `-Werror'
and `-Wno-error'.
* tests/werror.test: Update: use `-Werror' instead of `--Werror'.
* NEWS: Update.
|
|
|
b32c26f2
|
2010-11-18T18:09:14
|
|
Code cleanup after removal of option `--output-directory'.
* automake.in ($output_directory): Remove, it's unconditionally
defined to `.' and used only ...
(generate_makefile): ... in this subroutine, which now has been
edited and simplified accordingly.
|
|
|
f4e313b3
|
2010-11-18T17:59:14
|
|
Remove obsolete automake option `--output-directory'.
This option has been deprecated since version 1.7 (2002/2003).
* automake.in ($output_directory): Define to `.' unconditionally.
(parse_arguments): Remove handling of equivalent options `-o' and
`--output-directory'.
* tests/outdir.test: Removed.
* tests/no-outdir-option.test: New test.
* tests/Makefile.am (TESTS): Updated.
* NEWS: Updated.
|
|
|
f7adc0f4
|
2010-11-06T20:32:48
|
|
Merge branch 'maint'
|
|
|
6afea500
|
2010-11-06T18:26:53
|
|
Fix bug in rules for creating vala vapi/header files.
* automake.in (lang_vala_finish_target): Add forgotten "fi" in an
if control structure in a generated make rules. Bug introduced
by previous commit `v1.11-221-gd7c1679', and revealed by failure
of test `vala2.test'.
|
|
|
d7c1679b
|
2010-10-03T12:29:40
|
|
Fix and document rules to not touch the tree with `make -n'.
* doc/automake.texi (Multiple Outputs): Document the problem of
modifications during dry-run execution, propose solution.
* NEWS: Update.
* automake.in (lang_vala_finish_target): Split recipe so the
stamp file is not removed with GNU `make -n'.
(lang_yacc_target_hook): Separate removal of parser output file
and header remaking.
* lib/am/lisp.am ($(am__ELCFILES)): Determine whether -n was
passed to make, take care not to remove any files in that case.
* lib/am/remake-hdr.am (%CONFIG_H%): Separate removal of
%STAMP% file from induced remaking of config header.
* tests/autohdrdry.test, tests/lispdry.test, tests/yaccdry.test:
New tests.
* tests/Makefile.am (TESTS): Update.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
|
|
f19b0764
|
2010-10-02T20:26:47
|
|
Coverage and minor fixes for variable typo detection.
* automake.in (check_typos): Remove `EXTRA_' prefix when
computing canonical name.
* tests/vartypo2.test, tests/vartypos.test: New tests.
* tests/Makefile.am (TESTS): Update.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
|
|
6edafbb5
|
2010-10-02T20:25:53
|
|
Implement EXTRA_maude_DEPENDENCIES for programs and libraries.
* automake.in (handle_programs, handle_libraries)
(handle_ltlibraries): Mark EXTRA_*_DEPENDENCIES as recognized.
* doc/automake.texi (Linking, Program and Library Variables)
(LIBOBJS): Document EXTRA_*_DEPENDENCIES.
* lib/am/library.am (%LIBRARY%): Also depend on
$(EXTRA_%XLIBRARY%_DEPENDENCIES).
* lib/am/ltlibrary.am (%LTLIBRARY%): Also depend on
(%XLTLIBRARY%_DEPENDENCIES).
* lib/am/program.am (%PROGRAM%%EXEEXT%): Also depend on
$(EXTRA_%XPROGRAM%_DEPENDENCIES).
* tests/extradep.test, tests/extradep2.test: New tests.
* tests/Makefile.am (TESTS): Update.
* NEWS: Update.
Suggested by Eric Blake.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
|
|
c3eab9af
|
2010-10-02T18:43:01
|
|
Merge branch 'maint'
|
|
|
9e126f15
|
2010-10-02T18:38:34
|
|
Merge branch 'fix-tests-empty-regression' into maint
* fix-tests-empty-regression:
Revert "parallel-tests: avoid command-line length limit issue."
|
|
|
614b643e
|
2010-09-26T09:21:14
|
|
Revert "parallel-tests: avoid command-line length limit issue."
This reverts commit 24e3b4ee2f8cb9f72dd94a05a893f3d4e88b7835,
because it re-opened the bug fixed by v1.11-10-g218e678.
2010-09-07 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parallel-tests: avoid command-line length limit issue.
* automake.in (handle_tests): New argument $makefile, new
substitution %MAKEFILE%.
(generate_makefile): Adjust.
* lib/am/check.am [%?PARALLEL_TESTS%] (check-TESTS): Pass
sanitized TEST_LOGS value as makefile snippet on standard
input to $(MAKE), to avoid exceeding the command line limit on
w32 (MSYS).
* NEWS: Update.
Report by Bob Friesenhahn.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
|
35597a75
|
2010-09-17T14:17:07
|
|
Merge branch 'maint'
|
|
|
978dfcf5
|
2010-09-17T06:31:33
|
|
Avoid triple-space after period.
* automake.in (handle_single_transform): Avoid 3 spaces at
sentence end.
* ChangeLog.03: Likewise.
* lib/Automake/ChannelDefs.pm: Likewise.
* lib/Automake/Channels.pm (_print_message): Likewise.
* lib/Automake/Rule.pm (rule): Likewise.
* lib/Automake/Variable.pm (var): Likewise.
* lib/am/distdir.am: Likewise.
* tests/insthook.test: Likewise.
Signed-off-by: Eric Blake <eblake@redhat.com>
|
|
|
f60e9ae2
|
2010-09-07T04:58:02
|
|
Merge branch 'maint'
|
|
|
24e3b4ee
|
2010-09-07T04:38:08
|
|
parallel-tests: avoid command-line length limit issue.
* automake.in (handle_tests): New argument $makefile, new
substitution %MAKEFILE%.
(generate_makefile): Adjust.
* lib/am/check.am [%?PARALLEL_TESTS%] (check-TESTS): Pass
sanitized TEST_LOGS value as makefile snippet on standard
input to $(MAKE), to avoid exceeding the command line limit on
w32 (MSYS).
* NEWS: Update.
Report by Bob Friesenhahn.
|
|
|
8426abf3
|
2010-08-09T21:36:32
|
|
Merge branch 'msvc'
* msvc:
Add new auxiliary 'ar-lib' script, wrapping Microsoft lib.
Fix shell pattern negation in compile script.
|
|
9533d1f0
|
2010-08-01T08:38:05
|
|
Add new auxiliary 'ar-lib' script, wrapping Microsoft lib.
* lib/ar-lib: New auxiliary script.
* lib/Makefile.am: Add above.
* tests/ar-lib.test: New test.
* tests/Makefile.am: Add above.
* automake.in (@common_files): Distribute the 'ar-lib' script.
* doc/automake.texi (Auxiliary Programs): Mention the new
'ar-lib' script.
(Optional): Mention 'ar-lib' in AC_CONFIG_AUX_DIR.
* NEWS: Update.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
|
|
f54a09c3
|
2010-06-26T22:23:31
|
|
Merge branch 'maint'
|
|
|
9b72d668
|
2010-06-26T22:10:21
|
|
Update program --help output to match current GCS.
* configure.ac: Set and substitute PACKAGE_URL if AC_PACKAGE_URL
is not defined, for compatibility to Autoconf < 2.64.
* Makefile.am (do_subst): Substitute PACKAGE_BUGREPORT and
PACKAGE_URL.
(sc_diff_automake_in_automake): Update number of diff lines for
additional substitutions.
* aclocal.in (usage): Use PACKAGE_BUGREPORT. Point to Automake
home page and GNU general help page.
* automake.in (usage): Likewise.
* doc/automake.texi: New flag PACKAGE_BUGREPORT, to factor email
address.
(Introduction, Creating amhello, amhello Explained, Options):
Use it throughout.
* lib/Automake/Makefile.am (do_subst): Substitute
PACKAGE_BUGREPORT.
* lib/Automake/Config.in ($PACKAGE_BUGREPORT): New global.
* lib/Automake/ChannelDefs.pm: Use it for footer of fatal
messages.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
|
|
ccea7069
|
2010-06-21T21:08:13
|
|
Merge branch 'sl-yacc-work'
* sl-yacc-work:
Fix minor testsuite issues, update docs, for Yacc/Lex changes.
Bugfix: $(AM_FLAGS)/$(FLAGS) precedence in Yacc/Lex.
New tests, for bugs in Yacc/Lex AM_FLAGS and FLAGS precedence.
|
|
|
65a2059a
|
2010-06-08T16:32:40
|
|
Bugfix: $(AM_FLAGS)/$(FLAGS) precedence in Yacc/Lex.
* automake.in: Fix registration of languages "Lex", "Lex (C++)",
"Yacc" and "Yacc (C++)", so that $(LFLAGS) has precedence over
$(AM_LFLAGS) and $(YFLAGS) has precedence over $(AM_YFLAGS).
* tests/Makefile.am (XFAIL_TESTS): Updated accordingly.
* NEWS: Updated.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
|
|
ce6dfb3b
|
2010-06-06T16:55:08
|
|
More minor message fixes.
* aclocal.in (scan_file): Fix recommended info command line.
* automake.in (handle_lib_objects): No need to prepend function
name to prog_error message.
(handle_tags): Add missing word and missing space in error
message.
(handle_dist): Add missing closing single quote in message.
Line-wrap one long message for readability.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
|
|
97cab581
|
2010-06-06T10:53:03
|
|
Merge branch 'je-silent' into maint
* je-silent:
Relax silent-rules tests to cater to verbose makes.
Fix silent-rules output for disabled dependency tracking.
|
|
|
83d7976f
|
2010-04-25T18:26:14
|
|
Warning and error message formatting cleanups.
* aclocal.in (parse_arguments, main): Remove trailing period or
newline in error or warning messages, avoid capitalization of
the first word of a message.
* automake.in (check_user_variables, handle_languages)
(handle_ltlibraries, scan_aclocal_m4, scan_autoconf_config_files)
(scan_autoconf_files, cond_stack_if, require_file_internal)
(usage, generate_makefile, parse_arguments): Likewise.
* lib/Automake/ChannelDefs.pm (set_strictness): Likewise.
* lib/Automake/Configure_ac.pm (find_configure_ac): Likewise.
* lib/Automake/Options.pm (set_strictness): Likewise.
* lib/Automake/Rule.pm (define): Likewise.
* lib/Automake/Variable.pm (define, variables_dump): Likewise.
* tests/ltinstloc.test, tests/suffix11.test: Adjust expected
error message.
* lib/Automake/Channels.pm (setup_channel): Reword error message
to be the same as in msg.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
|
|
a700fa33
|
2010-04-25T18:44:53
|
|
Fix placing of ellipses in English text and synopses.
* Makefile.am: Be sure to add a space before `...' in natural
language text.
* automake.in (scan_autoconf_traces): Likewise.
* lib/Automake/Rule.pm (define): Likewise.
* lib/Automake/Variable.pm (define): Likewise.
* lib/am/dejagnu.am: Likewise.
* lib/am/progs.am: Likewise.
* lib/gnupload (dprint, upload): Likewise.
* tests/confdeps.test: Likewise.
* tests/location.test: Adjust expected output.
* automake.in (usage): In synopsis, use singular for OPTION,
* remove space before ellipsis.
* aclocal.in (usage): Likewise. Also, fix indentation.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
|
|
d4c5a007
|
2010-04-25T18:49:18
|
|
Merge branch 'maint' into foo
|
|
|
c3d47d57
|
2010-04-25T17:19:13
|
|
Fix leftover call to removed function macros_dump.
* automake.in (read_main_am_file): Call variables_dump, not
macros_dump. Print actual error before list of variables.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
|
|
483b962e
|
2010-04-11T20:49:38
|
|
Fix capitalization of error messages, reword one message.
* lib/Automake/Variable.pm (define): Do not capitalize the first
word in the error message.
* automake.in (require_file_internal): Likewise. Also, reword
and line-wrap for better readability.
* tests/distcom7.test, tests/pluseq5.test, tests/pluseq9.test:
Adjust tests.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
|
|
59e07285
|
2010-03-06T09:35:46
|
|
Merge branch 'maint'
|
|
|
18546c2c
|
2010-03-06T09:14:06
|
|
Formatting cleanups in macro comments.
* automake.in, lib/Automake/Channels.pm,
lib/Automake/FileUtils.pm, lib/Automake/Options.pm,
lib/Automake/Variable.pm, lib/Automake/XFile.pm,
m4/options.m4, m4/substnot.m4: Fix macro comment format.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
|
|
4147afc1
|
2010-02-24T19:56:26
|
|
Merge branch 'lzip-support'
* lzip-support:
Add lzip compression support.
|
|
3c3ff958
|
2010-02-24T19:41:59
|
|
Add lzip compression support.
* automake.in (handle_dist): Recognize dist-lzip.
(make_paragraphs): Map LZIP to dist-lzip.
* doc/automake.texi (Dist): Add dist-lzip.
(Options): Likewise.
* lib/Automake/Options.pm (_process_option_list): Add dist-lzip.
* lib/am/distdir.am
(dist dist-all): Add command to create an lzip-compressed tarball.
(distcheck): Handle lzip-compressed tarballs just like the others.
* tests/defs.in: Test for lzip, too.
* tests/lzip.test: New file, based on nogzip.test.
* tests/Makefile.am (TESTS): Add lzip.test.
* NEWS: Update.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
|
|
335494d7
|
2010-01-24T12:37:36
|
|
Merge branch 'je-silent'
* je-silent:
Fix silent-rules output for disabled dependency tracking.
|
|
|
c150e6c8
|
2010-01-24T12:36:47
|
|
Fix silent-rules output for disabled dependency tracking.
* lib/am/depend2.am [!%FASTDEP%]: Rework silent-rules variable
expansion code to also work in the case where %AMDEP% expands
to FALSE at config.status time, using new substitution string
%VERBOSE-NODEP%.
* automake.in (verbose_nodep_flag): New function, appending
`@am__nodep@' to the verbose-variable name.
(handle_languages): If dependencies are not disabled, use it to
set %VERBOSE-NODEP%.
* m4/depend.m4: Substitute am__nodep as '_no', so the second
verbose-variable will always expand to an empty string, if
dependencies are enabled.
* tests/silent5.test: Also test --disable-dependency-tracking;
also test per-target flags for non-C language files.
* tests/silent9.test: New test, like silent4.test but disable
dependency tracking.
* tests/Makefile.am: Adjust.
* NEWS, THANKS: Update.
Report by Dmitry V. Levin <ldv@altlinux.org>.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
|
|
7f2d6fb3
|
2010-01-17T12:08:50
|
|
Merge branch 'maint'
|
|
|
72c9d14d
|
2010-01-17T12:08:19
|
|
Bump copyright years.
* aclocal.in (write_aclocal, version): Bump copyright years.
* automake.in (gen_copyright, version): Likewise.
* doc/automake.texi: Likewise.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
|
|
b3f8778b
|
2009-12-05T15:11:07
|
|
Merge branch 'maint'
|
|
|
bf1ca571
|
2009-12-05T14:39:15
|
|
Use $DJDIR rather than $DJGPP to detect running on DJGPP.
* automake.in (Language): Use $ENV{'DJDIR'} for the
$ENV{'SHELL'} override.
* bootstrap: Use $DJDIR for setting BOOTSTRAP_SHELL, to fix
bootstrapping under MinGW when $DJGPP has been set.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
|
|
2bee52de
|
2009-12-05T14:13:43
|
|
Do not rely on Perl symlink status, for MSYS perl.
* automake.in (require_file_internal): Ensure presence of
symlink target file; MSYS perl symlink doesn't return an error
status when the file could not be created (copied, on this
system). Fixes symlink.test failure.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
|
|
38064da4
|
2009-12-04T18:15:57
|
|
Remove executable bit from automake.in
File `automake.in' is not meant to be executed (only to be
preprocessed into `automake'), so don't leave it executable.
* automake.in: Remove executable bit.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
|
|
905414f8
|
2009-10-17T10:23:54
|
|
Merge branch 'maint'
|
|
|
8d677911
|
2009-10-17T10:15:18
|
|
Doc and comment typos.
* automake.in (handle_ltlibraries): Fix typo in comment.
* tests/distcom7.test: Likewise.
* tests/lisp5.test: Likewise.
* doc/automake.texi (Usage of Conditionals): Fix typo.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
|
|
2ecb79b7
|
2009-10-06T22:09:27
|
|
Merge branch 'dr-cscope'
* dr-cscope:
Fixups and tests for cscope functionality.
New target to generate cscope database.
|
|
|
2f41d974
|
2009-09-26T10:48:45
|
|
Fixups and tests for cscope functionality.
It seems cscope is not able to take into account relative
file names of included cscope.files files, but it is able to
canonicalize file names containing '../' sequences.
This patch makes the cscope references relative again, and
fixes some corner cases.
* .gitignore: Ignore files generated by `make cscope'.
* NEWS: Reword a bit.
* THANKS: Update.
* automake.in (handle_tags): Use $(am__cd). Provide default
empty rule for the `cscope' target, for empty sources.
* lib/am/tags.am (cscopelist): Construct relative path to files
in $(srcdir) if $(srcdir) is relative.
[TOPDIR_P] (cscope): Do not depend on cscope-clean. Only invoke
$(CSCOPE) if cscope.files is nonemtpy.
(clean-cscope): Rename from ...
(cscopeclean): ... this.
(cscope.files): Depend on clean-cscope.
(distclean-tags) [!TOPDIR_P]: No need to remove cscope files
here.
* tests/cscope.test, tests/cscope2.test, tests/cscope3.test: New
tests.
* tests/Makefile.am: Adjust.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
|
ffad4816
|
2009-09-25T21:39:33
|
|
New target to generate cscope database.
* automake.in (handle_tags): Handle cscope.
* doc/automake.texi (Tags): Document cscope.
* lib/am/tags.am (CSCOPE): New macro.
[TOPDIR_P] (AM_RECURSIVE_TARGETS): Add cscope.
(cscope): New target.
(cscopeclean): Likewise.
(cscope.files): Likewise.
(cscopelist): Likewise.
(distclean-tags): Remove `cscope.out', `cscope.in.out',
`cscope.po.out' and `cscope.files'.
* NEWS: Update.
Based upon earlier patch from Jesse Barnes.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
|
94121099
|
2009-09-22T12:24:04
|
|
Add silent rules support for texinfo outputs.
* automake.in (define_verbose_texinfo): Define several new verbose
tagvars and verbose vars.
(define_verbose_tagvar): Increase spacing to 8 to accommodate
MAKEINFO, TEXI2DVI, TEXI2PDF.
(handle_texinfo): Additional substitution for silencing dvips.
(output_texinfo_build_rules): Additional substitutions for
silencing texi2dvi and texi2pdf.
* lib/am/texibuild.am: Add silencing to makeinfo, makeinfo --html,
texi2dvi and texi2pdf rules.
* lib/am/texinfos.am: Add silencing to .dvi.ps rule.
* tests/Makefile.am: Add silent8.test.
* tests/silent8.test: New test: tests that silent texinfo rules
produce quiet messages.
* NEWS: Update.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
|
|
43ec8aec
|
2009-05-17T15:51:21
|
|
Fix maintainer-check failures.
* automake.in (lang_vala_finish_target): Use `$(am__cd)' instead
of plain `cd'.
* tests/vala2.test: Use `rm -f' instead of `rm'.
|
|
|
fcf2f560
|
2009-05-17T15:32:40
|
|
Revert Automake license to GPLv2+.
Automake will move to GPLv3+ once the Exception statement has
been rewritten to use the new GPLv3 exception language. This
change does not impact the COPYING file that may be installed
by `automake --add-missing'.
* COPYING: Revert to GPLv2. All uses changed.
* NEWS: Update.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
|
1776fe39
|
2009-05-15T15:51:03
|
|
Vala: Use $(srcdir) in rebuild rules.
valac is always run in srcdir as the generated files are distributed.
So srcdir needs to be taken into account in the rebuild rules to not
wrongly trigger a rebuild in the wrong directory.
* automake.in (lang_vala_finish_target): Rebuild files in
$(srcdir).
* tests/vala2.test: Test rebuild rules from VPATH build.
Signed-off-by: Jürg Billeter <j@bitron.ch>
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
|
|
b9d83737
|
2009-05-15T15:50:59
|
|
Vala: Add and test rebuild rules for generated header and vapi files.
valac will generate additional files when using, for example, -H in
VALAFLAGS. We need to recognize these options and add appropriate
rebuild rules to fix parallel build.
* automake.in (lang_vala_finish_target): Recognize -H, -h,
--header, --internal-header, --vapi, --internal-api, --gir flags
to valac and rebuild rules for generated headers; distribute
and maintainer-clean them.
* tests/vala2.test: Test rebuild rules.
Signed-off-by: Jürg Billeter <j@bitron.ch>
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
|
|
b629ff7b
|
2009-05-17T10:14:13
|
|
Vala: Fix build when using per-target VALAFLAGS.
This does not yet implement full per-target support for VALAFLAGS,
however, this change at least fixes building when there is only one
target per source file, which is the most common situation.
* automake.in: Remove `VALAFLAGS' from `flags' in language struct.
(lang_vala_finish_target): Handle `*_VALAFLAGS rewriting' manually
here; check `VALAFLAGS' user variables.
* tests/Makefile.am (XFAIL_TESTS): Remove vala5.test.
* doc/automake.texi (Vala Support): Document per-target flag
limitations.
Signed-off-by: Jürg Billeter <j@bitron.ch>
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
|
|
ebd8c6da
|
2009-04-27T22:26:04
|
|
silent-rules: fix alignment of less verbose output.
* automake.in (define_verbose_var): Define `$silent_var' as
VAR_ASIS, not VAR_PRETTY, to avoid squashing of multiple
adjacent spaces.
* tests/silent.test: Amend test.
Report by Jan Engelhardt.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
|
|
c5635fa6
|
2009-04-19T02:19:20
|
|
Correctly treat all assignments with bogus trailing comments.
Before this patch, automake would silently fail to diagnose and
to copy into the output those variable assignments which are
preceded by a comment, and end in backslash newline comment.
* automake.in (read_am_file): When determining whether an
escaped newline followed by a comment is an error, correctly use
the parser state, not the contents of a saved comment, which
could still be carried over from a comment before an assignment.
* NEWS: Update.
* tests/commen11.test: New test.
* tests/Makefile.am: Update.
Report by Karl Berry.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
|
|
ef895abc
|
2009-04-19T08:50:46
|
|
Merge branch 'next'
* next: (64 commits)
More minor fixups to vala support.
Improve Vala support.
testsuite: do not fail on systems without read permissions.
testsuite: parallel make fixes.
silent-rules reorganization, --enable-silent-rules switch.
manual: Add note about parallelism and tests ordering.
Fix maintainer-check failure.
parallel-tests: more testsuite exposure.
parallel-tests: let VERBOSE=yes output appear before summary.
parallel-tests: `clean recheck' should not rerun all tests.
parallel-tests: Fix driver for nonempty executable extension.
Fix a couple of $(EXEEXT)-related testsuite failure.
Document last change in NEWS.
Fix renamed objects with subdir-objects and other languages.
Do not remove texinfo outputs upon mostlyclean.
testsuite: unset TESTS, TEST_LOGS, to avoid interference.
testsuite: generate $(parallel_tests) just when needed.
Remove superfluous line from recheck recheck-html.
parallel-tests: redo check-html, recheck, recheck-html.
parallel-tests: LOG_COMPILER for tests without known extension.
...
|
|
|
ad9df850
|
2009-04-19T08:09:13
|
|
Merge branch 'mh-vala-support' into next
* mh-vala-support:
More minor fixups to vala support.
Improve Vala support.
Minor fixups for Vala support.
Support Vala in non-recursive builds; more tests and fixes.
Initial support for the vala programming language.
|
|
|
00db1950
|
2009-04-19T08:06:51
|
|
More minor fixups to vala support.
* automake.in (lang_vala_finish_target): Fix typo in comment.
* doc/automake.texi (Vala Support): Fix typo. Declare vala
support as "initial".
* NEWS: Likewise, declare vala support as "initial".
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
|
|
62796cb9
|
2009-04-05T15:16:48
|
|
Improve Vala support.
* automake.in: Update to Vala 0.7.0 semantics, recover from removal
of built sources, support silent-rules, drop _PKGNAME variables
* doc/automake.texi, NEWS: Update.
* lib/am/vala.am: Bump copyright years.
* m4/vala.m4: Likewise.
* tests/vala.test: Remove obsolete grep tests.
* tests/vala1.test: Likewise.
* tests/vala2.test: Test full build, distcheck, and distclean.
* tests/vala3.test: Likewise, also test with subdir-objects.
* tests/vala4.test: Bump copyright years.
* tests/vala5.test: New test for per-target flags, expected to fail.
* tests/Makefile.am: Update.
* THANKS: Update.
Signed-off-by: Jürg Billeter <j@bitron.ch>
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
|
|
6c4b250d
|
2009-04-19T07:59:42
|
|
Merge branch 'next' (early part) into mh-vala-support
* 'next' (early part): (135 commits)
parallel-tests: LOG_COMPILER for tests without known extension.
More node renaming in the manual.
Fix instdir-java.test failure.
Fix testsuite failures due to nonexistent `dirlist' entries.
Fix typo in manual.
Avoid test failure due to paranoid TAR_OPTIONS envvar setting.
Use more common spelling in diagnostic: s/canonic/canonical/.
Post-release version bump.
Version 1.10b.
Minor NEWS update.
Reorganize nodes in the manual.
Update AM_RECURSIVE_TARGETS for parallel-tests.
parallel-tests: New target recheck-html.
Rewrite maintainer-check in separate tests, parallelizable.
Fix maintainer-check failure.
Fix latex warning in manual.
Sync auxiliary files from upstream.
parallel-tests: redo lazy checking: recheck and RECHECK_LOGS.
parallel-tests: do not mark check-TESTS as `.MAKE'.
parallel-tests: warn about $(srcdir), $(top_srcdir) in TESTS.
...
|
|
|
2c74a340
|
2009-04-13T23:17:39
|
|
silent-rules reorganization, --enable-silent-rules switch.
This patch introduces a configure-time option to set the default
verbosity. Since configure now needs to know whether the
`silent-rules' automake option was set, the latter can only be
set within AM_INIT_AUTOMAKE, or with a new AM_SILENT_RULES macro
but not any more through AUTOMAKE_OPTIONS or the automake
command line option `--silent-rules'.
* automake.in (define_verbose_var): Define the default verbose
variable in terms of `$(AM_DEFAULT_VERBOSITY)'.
(handle_configure): Do not pass `--silent-rules' to automake.
(scan_autoconf_traces): Trace `AM_SILENT_RULES'. If seen,
enable global `silent-rules' option.
(usage): Do not document `--silent-rules'.
(parse_arguments): Do not accept `--silent-rules'.
* doc/automake.texi (Options): Overhaul. Document
AM_SILENT_RULES, --enable-silent-rules, --disable-silent-rules,
AM_DEFAULT_VERBOSITY. Show an example for user-added variables
for less verbose output.
(Invoking Automake): Remove documentation for `--silent-rules'.
(Public Macros): Document `AM_SILENT_RULES'.
* NEWS: Update.
* lib/Automake/Options.pm (_process_option_list): Accept
`silent-rules' only as option in configure.ac.
* m4/init.m4 (AM_INIT_AUTOMAKE): If the `silent-rules' option
was enabled, require `AM_SILENT_RULES'; move AM_BACKSLASH
initialization to ...
* m4/silent.m4 (AM_SILENT_RULES): ... this new file, new macro.
Deal with `--enable-silent-rules' switch; define
AM_DEFAULT_VERBOSITY.
* m4/Makefile.am (dist_m4data_DATA): Add silent.m4.
* tests/dollarvar.test: Remove tests for `--silent-rules', use
`AM_SILENT_RULES'.
* tests/flavor.test: Remove test for `--silent-rules'.
* tests/silent.test: Use `AM_SILENT_RULES' instead of
`AUTOMAKE_OPTIONS = silent-rules'; use `--enable-silent-rules'.
* tests/silent2.test: Likewise.
* tests/silent3.test: Likewise.
* tests/silent4.test: Likewise.
* tests/silent5.test: Likewise.
* tests/silent6.test: Likewise. Test `AM_SILENT_RULES' as well
as `AM_INIT_AUTOMAKE([silent-rules])' instead of
`--silent-rules'.
* tests/silent7.test: Use `AM_SILENT_RULES' instead of
`AUTOMAKE_OPTIONS = silent-rules'; ensure the latter is rejected.
Test combinations of --enable-silent-rules and
--disable-silent-rules with `make V=0' and `make V=1'.
Suggestion for configure-time switch by Bob Friesenhahn.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
|
|
12856eb2
|
2009-04-13T13:29:25
|
|
bin_PROGRAMS = $(EXTRA_PROGRAMS) should work.
* automake.in (am_install_var): For `PROGRAMS' primary, strip
`$(EXEEXT)' here already, so the name uniquifying works even
when we look at names repeatedly, with inconsistent executable
extension; through variable references, we might have added
the extension ourselves earlier.
(handle_programs): No need to strip `$(EXEEXT)' here any more.
* tests/extra8.test: New test.
* tests/Makefile.am: Update.
* THANKS: Update.
Report by Daniel Richard G.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
|
610e9c06
|
2009-04-10T16:25:05
|
|
Fix grammar in comments and documentation.
* doc/automake.texi (API versioning): Fix grammar.
* automake.in: Fix grammar in comment.
* lib/Automake/ChannelDefs.pm: Likewise.
* tests/ext2.test: Likewise.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
|
|
1692795d
|
2009-04-09T00:16:35
|
|
parallel-tests: Fix driver for nonempty executable extension.
* automake.in (handle_tests): New substitution `%am__EXEEXT%',
defined as 'FALSE' for non-generic rules, or if no programs are
built at all. Otherwise, define it as configure conditional.
* lib/am/check2.am [%am__EXEEXT%] (%EXT%$(EXEEXT).log): New
conditional generic rule.
* m4/init.m4: Hook an m4_provide of `_AM_COMPILER_EXEEXT' onto
Autoconf's `_AC_COMPILER_EXEEXT' macro.
(AM_INIT_AUTOMAKE): If `_AM_COMPILER_EXEEXT' has been provided
at `AC_CONFIG_COMMANDS_PRE' time, then introduce a conditional
`am__EXEEXT', defined to true iff `$EXEEXT' is nonempty.
* tests/check5.test: Only match `_EXEEXT_[1-9]' here, to avoid
false positives stemming from `@am__EXEEXT_TRUE@'.
* NEWS: Update.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
|
dd8b2944
|
2009-04-07T23:16:01
|
|
Fix renamed objects with subdir-objects and other languages.
* automake.in: Fixed bug when building with renamed objects
and foreign languages.
* tests/suffix13.test: New test.
* tests/Makefile.am: Adjust.
* THANKS: Update.
Reports by Florian Briegel and Stepan Kasal.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
|
|
aea50a7d
|
2009-04-07T22:54:28
|
|
Do not remove texinfo outputs upon mostlyclean.
* lib/am/texinfos.am: New substitutions %MOSTLYCLEAN%,
%MAINTCLEAN%.
(clean-aminfo): New target, remove %TEXICLEAN% if nonemtpy,
declare phony. Hook this target to ...
(clean-am): ... this and ...
(?CYGNUS?clean-info): ... this.
(maintainer-clean-aminfo): Remove %MAINTCLEAN% if nonempty,
for later.
(mostlyclean-aminfo): Remove %MOSTLYCLEAN%.
* automake.in (handle_texinfo_helper): Return three arrays
$MOSTLYCLEAN, $TEXICLEAN, $MAINTCLEAN, instead of one array.
Only put LaTeX helper files in $MOSTLYCLEAN, the rest in
$TEXICLEAN for now.
(handle_texinfo): Accept these, chop off extra newline, and
substitute them in `texinfos.am'.
* NEWS: Update.
* tests/txinfo33.test: New test.
* tests/Makefile.am: Update.
Report by Bruno Haible.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
|
|
80853982
|
2009-04-04T12:14:14
|
|
parallel-tests: LOG_COMPILER for tests without known extension.
* automake.in (handle_tests): If we don't match a known
extension, define `LOG_COMPILER' as `$(LOG_COMPILE)
$(AM_LOG_FLAGS) $(LOG_FLAGS)' and use it as %COMPILE% in check2.
* doc/automake.texi (Simple Tests using parallel-tests):
Document it. In the examples, suggest using the AM_*LOG_FLAGS
flags in Makefile.am rather than the variables without `AM_'
prefix.
* lib/Automake/tests/Makefile.am (AM_PL_LOG_FLAGS): Renamed from
(PL_LOG_FLAGS): ... this variable, intended for the user.
* tests/parallel-tests7.test: Extend test.
* NEWS: Update.
Suggestion by Akim Demaille.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
|
|
8119e99b
|
2009-03-31T21:06:28
|
|
Use more common spelling in diagnostic: s/canonic/canonical/.
* automake.in (check_typos): s/canonic/canonical/.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
|
|
1c503be3
|
2009-03-29T01:21:01
|
|
Merge branch 'ad-parallel-tests' into next
* ad-parallel-tests:
parallel-tests: New target recheck-html.
parallel-tests: redo lazy checking: recheck and RECHECK_LOGS.
parallel-tests: do not mark check-TESTS as `.MAKE'.
parallel-tests: warn about $(srcdir), $(top_srcdir) in TESTS.
check-html: Always create HTML output, note conversion failure.
parallel-tests: per-extension test driver: <EXT>_LOG_COMPILER.
parallel-tests: also record logs of SKIPped tests.
Minor optimization in parallel-tests text box creation.
|
|
|
fe936f64
|
2009-03-29T00:59:46
|
|
Merge branch 'master' into next
* master:
Rewrite maintainer-check in separate tests, parallelizable.
Fix maintainer-check failure.
Fix latex warning in manual.
Sync auxiliary files from upstream.
manual: minor cleanups.
Sane (un)install for empty directory variables.
Ensure that empty directory variables work with empty content variables.
Use --tag=FC with libtool also for .f90 files.
DISTFILES containing a directory and files in that directory.
Fix a documentation typo.
Define AM_RECURSIVE_TARGETS, for gnulib's GNUmakefile.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
|
|
1b67aa70
|
2009-03-28T21:49:02
|
|
parallel-tests: warn about $(srcdir), $(top_srcdir) in TESTS.
* automake.in (handle_tests): Warn about portability issue
concerning generated TESTS files listed with a `$(srcdir)/'
or `$(top_srcdir)/' prefix.
* doc/automake.texi (TESTS): Document this issue. Mention that
the parallel-tests driver is still experimental.
* tests/parallel-tests8.test: New test.
* tests/Makefile.am: Update.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
|
|
66c2dcaa
|
2009-03-11T23:55:26
|
|
parallel-tests: per-extension test driver: <EXT>_LOG_COMPILER.
For test files with extension <ext>, introduce the internal
variable <EXT>_LOG_COMPILE, which expands to
$(<EXT>_LOG_COMPILER) $(AM_<EXT>_LOG_FLAGS) $(<EXT>_LOG_FLAGS).
Turn also the lib/Automake/tests testsuite over to the new
test driver.
* doc/automake.texi (Tests): Document `EXT_LOG_COMPILER' and
`EXT_LOG_FLAGS'.
* lib/am/check2.am: Insert `%COMPILE%' right before test.
* automake.in (handle_tests): Substitute `COMPILE' for check2,
empty for tests without extension, and `$(ext_LOG_COMPILE)' for
extension `ext'. In the latter case, define it from the public
components.
* configure.ac (AM_INIT_AUTOMAKE): Use `parallel-test' globally.
* tests/Makefile.am (AUTOMAKE_OPTIONS): Remove, not needed here
any more.
* lib/Automake/tests/Makefile.am (TESTS_ENVIRONMENT): Split ...
(PL_LOG_COMPILER, PL_LOG_FLAGS): ... into these new variables.
(TESTS_EXTENSIONS): New variable, initialize to `.pl'.
* tests/parallel-tests7.test: New test.
* tests/Makefile.am: Update.
Suggestion by Akim Demaille.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
|
|
5dba7d0a
|
2009-03-23T21:47:19
|
|
Use --tag=FC with libtool also for .f90 files.
* automake.in: Set 'libtool_tag' for language `fc'.
* tests/fort5.test: Grep for the tag.
* THANKS: Update.
Report by John R. Cary.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
|
|
d4cc23b0
|
2009-03-14T11:14:38
|
|
Merge branch 'ad-parallel-tests' into next
* ad-parallel-tests:
Fix LAZY_TEST_SUITE handling and $(TEST_SUITE_LOG) recreation.
Fix parallel-tests with empty $(TESTS) for BSD make.
Mark check-html and check-TESTS as recursive for BSD make.
Match XFAIL_TESTS correctly with Solaris make.
Use append mode to capture parallel test output.
parallel-tests: Fix summary output.
Overhaul of tests/README.
Documentation for the parallel-tests driver.
New tests for `parallel-tests'.
parallel-tests: Ensure backward-compatible semantics.
Parallel test execution: new option `parallel-tests'.
|
|
9aa1e525
|
2009-03-08T11:29:03
|
|
Parallel test execution: new option `parallel-tests'.
* automake.in (handle_tests): Set new conditional PARALLEL_TESTS
when reading check.am. Handle option `parallel-tests' and all
its semantics. Define macros TEST_EXTENSIONS, TEST_SUITE_LOG,
TEST_SUITE_HTML, TEST_LOGS, TEST_LOGS_TMP, suffix rules if
applicable, and per-target rules for other tests. Add all log
files to %clean_files at the `MOSTLY_CLEAN' level.
* lib/Automake/Options.pm (_process_option_list): Accept
`parallel-tests'.
* lib/am/check.am [!PARALLEL_TESTS] (check-TESTS): Move existing
testsuite driver under this new conditional.
[PARALLEL_TESTS]
(am__rst_title, am__rst_section, am__text_box am__sh_e_setup)
(am__check_pre, am__check_post): New internal macros.
($(TEST_SUITE_LOG), check-TESTS, .log.html, check-html): New
rules.
* lib/am/check2.am: New file.
* lib/am/Makefile.am (dist_am_DATA): Add check2.am.
* tests/Makefile.am (AUTOMAKE_OPTIONS): Use `parallel-tests'.
(clean-local): Renamed from distclean-local.
* tests/defs.in: Drop VERBOSE handling, not needed here any more.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
|
|
26147eac
|
2009-03-12T07:40:20
|
|
Rename `silent' mode to `silent-rules' mode.
* automake.in (define_verbose_var, verbose_flag)
(define_verbose_tagvar, handle_options, handle_languages)
(handle_configure, parse_arguments): Rename the `silent' option
to `silent-rules', so it coincides with the `--silent-rules'
command line option; adjust all code and comments.
* lib/Automake/Options.pm (_process_option_list): Likewise.
* doc/automake.texi (Invoking Automake, Libtool Flags, Options):
Likewise.
* NEWS: Adjust.
* tests/dollarvar.test, tests/silent.test, tests/silent2.test,
tests/silent3.test, tests/silent4.test, tests/silent5.test,
tests/silent6.test, tests/silent7.test: Likewise.
Suggestion by Jan Engelhardt.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
|
|
64942dde
|
2009-03-11T20:53:24
|
|
`silent' mode unconditionally overrides portability-recursive.
* automake.in (parse_arguments): Don't handle a global `silent'
option here; instead, ...
(handle_options): ... handle the "normal" `silent' option here.
Override `portability-recursive' here, at the last point we deal
with options, instead ...
* lib/Automake/Options.pm (_process_option_list): ... of here.
* tests/silent6.test: Replace unportable make snippet, remove
FIXME note, add more test cases of options passed in the various
locations.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
|
|
c65e0662
|
2009-03-10T22:59:00
|
|
Keep `--silent-rules' across triggered automake reruns.
* automake.in (usage): Reformat to be a bit clearer.
(handle_configure): Remove substitutions %STRICTNESS% and
%USE-DEPS% in favor of a new substitution %AUTOMAKE-OPTIONS%
that carries over all needed flags.
* lib/am/configure.am (%MAKEFILE-IN%): Adjust rule.
* tests/flavor.test: New test, to ensure --$flavor (gnu,
gnits, foreign, cygnus), --ignore-deps, and --silent-rules are
preserved across automake reruns.
* tests/Makefile.am: Update.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
|
|
bee1af31
|
2009-03-09T21:57:49
|
|
Provide variables for silencing of user rules.
* automake.in (handle_languages): Always define `AM_V_GEN' and
`AM_V_at'.
* doc/automake.texi (Options): Document these flags.
* tests/silent7.test: New test.
* tests/Makefile.am: Update.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
|
|
b0996179
|
2009-03-09T21:45:57
|
|
Redo variable naming for `silent' machinery.
The public variables are named `AM_V_' plus the compiler
short-hand now, e.g.: AM_V_CC, AM_V_CXXLD, AM_V_GEN. The
dispatch variables are internal details and begin with
`am__v_'.
* automake.in (verbose_var): Update comment.
(verbose_private_var): New function. Order functions so that
ones not needed outside this section are listed first.
(verbose_dispatch): Remove, no need to factor this.
(define_verbose_var, define_verbose_libtool): Use
verbose_private_var.
(define_verbose_tagvar): Likewise; and simplify.
Report by Jan Engelhardt.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
|
|
f04bfdf3
|
2009-03-07T16:01:34
|
|
New automake command line option `--silent-rules'.
* automake.in (parse_arguments): Accept `--silent-rules; let it
override command line warning settings.
(usage): Document it.
* doc/automake.texi (Invoking Automake): Document it.
* NEWS: Update.
* tests/dollarvar.test: Also test `--silent-rules'.
* tests/pr300-ltlib.test: Use `$MAKE V=1' to enable verbose
output, which is matched later in the test.
* tests/silent6.test: New test.
* tests/Makefile.am: Update.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
|
e0bd4af1
|
2009-03-07T15:58:07
|
|
Implement `silent' build rules.
* automake.in (ccer): New field in the language structure.
Initialize it for all registered languages.
(verbose_var, verbose_flag, verbose_dispatch)
(silent_flag, define_verbose_var, define_verbose_tagvar)
(define_verbose_libtool): New functions.
(handle_languages, handle_programs, handle_libraries)
(handle_ltlibraries, handle_configure)
(define_compiler_variable, define_linker_variable)
(define_per_target_linker_variable): Use them where appropriate
to define variables to implement the silent output machinery.
* lib/Automake/Options.pm (_process_option_list): Accept
`silent', turning off `portability-recursive'.
* lib/am/depend2.am: Add %VERBOSE% and %SILENT% prefixes where
appropriate.
* lib/am/lex.am: Likewise.
* lib/am/library.am: Likewise.
* lib/am/ltlibrary.am: Likewise.
* lib/am/program.am: Likewise.
* lib/am/yacc.am: Likewise.
* m4/init.m4 (AM_INIT_AUTOMAKE): Substitute, but do not define,
AM_BACKSLASH.
* tests/defs.in: Unset `V', to avoid influencing inner tests.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
|
|
a88a2a27
|
2009-03-07T10:42:34
|
|
Improve NetBSD 'make -n' output for many standard targets.
* automake.in (handle_tags): Let .MAKE depend on
`tags-recursive' and `ctags-recursive' if appropriate.
(handle_all): Likewise for `all'.
(do_check_merge_target): Likewise for `check-am' and `check'.
* lib/am/ansi2knr.am (.MAKE): Depend on %ANSI2KNR-DIR%/ansi2knr.
* lib/am/install.am [%?maybe_BUILT_SOURCES%] (.MAKE): Depend on
`install'.
* tests/maken3.test, tests/maken4.test: New tests.
* tests/Makefile.am: Update.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
|
|
500f6ca7
|
2009-03-03T20:44:42
|
|
Fix `use constant' usage for MSYS Perl 5.6.0.
* automake.in (QUEUE_MESSAGE, QUEUE_CONF_FILE, QUEUE_LOCATION)
(QUEUE_STRING): Define using one `use constant' each; as perl
5.6.0 (on MSYS) does not understand `use constant { ... }'.
* THANKS: Update.
Report by Peter Rosin.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
|
|
d22169ba
|
2009-03-01T16:51:34
|
|
Fix recursive html and install-* doc rules for BSD make.
* automake.in (%required_targets): Add html-am,
install-html-am, install-dvi-am, install-pdf-am, install-ps-am,
install-info-am.
* tests/txinfo32.test: New test.
* tests/Makefile.am: Update.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
|
|
b74717c0
|
2009-01-20T20:58:48
|
|
Bump copyright years.
* aclocal.in (write_aclocal, version): Bump copyright years.
* automake.in (gen_copyright, version): Likewise.
* doc/automake.texi: Likewise.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
|
|
0fb020fa
|
2008-12-21T22:38:37
|
|
Revamp semantics for `missing help2man' and manpage distribution.
Previously, `missing help2man' would create a missing man page
containing an error message, and exit 1. This does not play
well with `make': the next run will see this particular man page
as being up to date, and will only error out on the next
generated man page, if any; repeat until all pages are done.
This patch changes `missing' to exit successfully in this case,
but `make dist' will ensure that no such man pages are packaged.
* lib/missing: Exit successfully even if we create a replacement
page due to missing help2man.
* automake.in (make_paragraphs): Define %HAVE-MANS% to be true
if this makefile deals with man pages.
* lib/am/distdir.am (distdir): If %INSTALL-MAN% and %HAVE-MANS%,
check that no man page in $(MANS) contains the replacement text
from `missing'.
* tests/man4.test: New test.
* tests/Makefile.am: Update.
* NEWS: Reorder a bit, update.
* THANKS: Update.
Report by Werner Lemberg and Karl Berry.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|