automake.in


Log

Author Commit Date CI Message
Stefano Lattarini 38e1b39d 2011-11-03T13:50:06 Merge branch 'msvc' into master Commits merged from msvc: - tests: few improvements to some `ar-lib' related tests - warnings: new 'extra-portability' category, for AM_PROG_AR - ar-lib: new 'AM_PROG_AR' macro, triggering the 'ar-lib' script Extra changes required by the testsuite: * tests/instspc-tests.sh: Adjust to new portability requirements due to the new AM_PROG_AR macro. * tests/libobj-basic.test: Likewise. * tests/libobj2.test: Likewise. * tests/libobj15a.test: Likewise. * tests/libobj15b.test: Likewise. * tests/libobj15c.test: Likewise. * tests/libobj16a.test: Likewise. * tests/libobj16b.test: Likewise. * tests/libobj17.test: Likewise. * tests/libobj18.test: Likewise. * tests/libobj19.test: Likewise. * tests/libobj20a.test: Likewise. * tests/libobj20b.test: Likewise. * tests/libobj20c.test: Likewise. * tests/canon6.test: Likewise. * tests/canon6.test: Likewise. * tests/canon7.tests: Likewise. * tests/extra9.test: Likewise. * tests/extradep.test: Likewise. * tests/extradep2.test: Likewise. * tests/posixsubst-ldadd.test: Likewise. * tests/posixsubst-libraries.test: Likewise. * tests/posixsubst-ltlibraries.test: Likewise. * tests/python-virtualenv.test: Likewise. * tests/vartypos.test: Likewise. * tests/vartypo2.test: Likewise. * tests/suffix.test: Update to take into account previous master-only changes. * tests/suffix2.test: Likewise. * tests/libobj7.test: Call automake with the `--add-missing' option, instead of creating a dummy `ar-lib' file, since this test now also runs "./configure" and "make". * tests/suffix5.test: Copy the real `ar-lib' script file, instead of creating a dummy one, since this test now also runs "./configure" and "make". * tests/extra-portability2.test: Fix this test not to rely on the older, faulty semantics of "strictness specification always reset warning level", which has been fixed in commit v1.11-623-g1609491 (see also automake bug#7669 a.k.a. PR/547). Since we are at it, throw inf few other minor unrelated improvements. * tests/extra-portability.test: Explicitly pass `-Wall' to automake calls, for clarity.
Stefano Lattarini 2270535f 2011-11-03T11:39:40 Merge branch 'maint' into msvc * maint: maint-mode: fix botched configure messages fix: regenerate Makefiles info: allow user to inhibit creation/update of '${infodir}/dir' deps: partially revert commit `v1.11-512-geeee551'
Stefano Lattarini 8c695f69 2011-10-25T11:34:11 Merge branch 'maint' * maint: dejagnu: allow the package developer to extend site.exp * THANKS: Fix whitespace issue. deps: partially revert commit `v1.11-512-geeee551' dejagnu: ensure 'srcdir' is defined as a relative directory
Peter Rosin 91ab753b 2011-10-24T09:04:24 Merge branch 'maint' into msvc * tests/subpkg-yacc.test: Adjust to new portability requirements due to the new AM_PROG_AR macro.
Peter Rosin cc2202a6 2011-10-21T00:24:38 warnings: new 'extra-portability' category, for AM_PROG_AR * lib/Automake/ChannelDefs.pm: Register new extra-portability warning channel. (switch_warning): Turn off extra-portability if portability is turned off, and turn on portability if extra-portability is turned on. (set_strictness): Silence extra-portability for --gnits, --gnu and --foreign. * tests/extra-portability2.test: New test, checking that the extra-portability channel is silenced by --gnits, --gnu and --foreign. * doc/automake.texi (Invoking Automake): Document the new warning category and its interaction with the portability category. * tests/extra-portability.test: New test, checking the interaction between the portability and extra-portability warning categories. * automake.in (handle_libraries, handle_ltlibraries): Move the AM_PROG_AR warnings to the new extra-portability channel. * tests/ar2.test: Adjust to the new warning channel. * tests/pr300-lib.test: Likewise. * tests/pr300-ltlib.test: Likewise. * tests/pr307.test: Likewise. * tests/pr401.test: Likewise. * tests/pr401b.test: Likewise. * tests/pr401c.test: Likewise. * tests/pr72.test: Likewise. * NEWS: Likewise. * tests/Makefile.am (TESTS): Update. Signed-off-by: Peter Rosin <peda@lysator.liu.se>
Peter Rosin c7a6a92e 2011-10-21T00:23:34 ar-lib: new 'AM_PROG_AR' macro, triggering the 'ar-lib' script * m4/ar-lib.m4: New macro AM_PROG_AR, which locates an archiver and triggers the auxiliary 'ar-lib' script if needed. * m4/Makefile.am (dist_m4data_DATA): Update. * automake.in ($seen_ar): New variable. (scan_autoconf_traces): Set it. (handle_libraries, handle_ltlibraries): Require AM_PROG_AR for portability. * doc/automake.texi (Public Macros): Mention the new 'AM_PROG_AR' macro. (Subpackages): Add AM_PROG_AR to the example. (A Library): Adjust recommendations for AR given the new AM_PROG_AR macro. * All relevant tests: Adjust to new portability requirements due to the new AM_PROG_AR macro. * tests/ar-lib2.test: New test, checking that AM_PROG_AR triggers install of ar-lib. * tests/ar-lib3.test: New test, checking that lib_LIBRARIES requires AM_PROG_AR. * tests/ar-lib4.test: New test, checking that lib_LTLIBRARIES requires AM_PROG_AR. * tests/ar-lib5a.test: New test, checking that AM_PROG_AR triggers use of ar-lib when the archiver is Microsoft lib. * tests/ar-lib5b.test: New test, checking that AM_PROG_AR triggers use of ar-lib when the archiver is a faked lib. * tests/ar-lib6a.test: New test, checking the ordering of AM_PROG_AR and LT_INIT. * tests/ar-lib6b.test: New test, checking the ordering of AM_PROG_AR and AC_PROG_LIBTOOL. * tests/ar-lib7.test: New test, checking that automake warns if ar-lib is missing. * tests/ar3.test: New test, checking that AR and ARFLAGS may be overridden by the user even if AM_PROG_AR is used. * tests/ar4.test: New test, checking that AM_PROG_AR bails out if it cannot determine the archiver interface. * tests/ar5.test: New test, checking that AM_PROG_AR runs its optional argument if it cannot determine the archiver interface. * tests/defs.in: New required entry 'lib'. * tests/Makefile.am (TESTS): Update. * NEWS: Update. Signed-off-by: Peter Rosin <peda@lysator.liu.se>
Stefano Lattarini 40c34328 2011-10-20T22:25:45 deps: partially revert commit `v1.11-512-geeee551' This change partly reverts commit "Create subdirs for generated sources even when not dep tracking", of 2011-04-02. That commit had caused the bugs #8485 and #8526. Since we are nearing the bug-fixing automake release 1.11.2, the safest policy at the moment is to just revert the problematic hunks: an older, known bug is better than a regression. * automake.in (handle_single_transform): Don't add a dirstamp dependency, even when $object is derived and lands in a subdir. * tests/Makefile.am (XFAIL_TESTS): Add lex-subobj-nodep.test, remove yacc-dist-nobuild-subdir.test.
Stefano Lattarini 579b15b7 2011-10-17T11:38:01 refactor: improve signature of 'check_directory' sub in automake * automake.in (check_directory): Take the relative directory the directory to be checked is expected to be found into as an optional parameter, rather than reading it from the global variable `$relative_dir'. (scan_autoconf_traces, check_directories_in_var): Adjust.
Stefano Lattarini 64aebd61 2011-10-07T13:11:37 Merge branch 'maint' * maint: parallel-tests: warn on conditional TEST_EXTENSIONS definition
Stefano Lattarini ba0c477b 2011-10-07T11:08:15 parallel-tests: warn on conditional TEST_EXTENSIONS definition Before this change, automake would have still bailed out, but with a confusing error message (about an invalid redefinition of TEST_EXTENSIONS). * automake.in (handle_tests): Warn explicitly if TEST_EXTENSIONS has conditional contents. * tests/test-extensions-con.test: New test. * tests/Makefile.am (TESTS): Add it. * NEWS: Update.
Stefano Lattarini 30eb17ff 2011-10-06T21:42:06 Merge branch 'maint'
Stefano Lattarini b9b79d88 2011-10-06T21:30:04 parallel-tests: don't allow @substitutions@ in TEST_EXTENSIONS Even after the last commit `v1.11-476-g90bea64', the checks performed by automake on entries in $(TEST_EXTENSIONS) tried to allow for @substitited@ stuff. This however ends up allowing quite brittle setups, which, most importantly, are of no real practical usefulness anyway. So it's better to just disallow @substitutions@ in TEST_EXTENSIONS altogether, offering a clear error message, instead of risking weird bugs and unexpected behaviors in the generated Makefile.in. * automake.in ($TEST_EXTENSION_PATTERN): Turned from a regular expression ... (is_valid_test_extension): ... into this subroutine. Don't allow generic @substitutions@ anymore (possibly making an exception for `@EXEEXT@' under the proper circumstances). * tests/test-extensions.test: Adjust and extend.
Stefano Lattarini 8b27c5b5 2011-10-06T13:56:49 Merge branch 'maint' * maint: fix: make a test script executable coverage: expose automake bug#9651 parallel-tests: automake error our on invalid TEST_EXTENSIONS fix: regenerate Makefile docs: don't suggest installing `.m4' files in hard-coded location distuninstallcheck: fail also when only one file is left installed
Stefano Lattarini 90bea64b 2011-10-01T21:31:07 parallel-tests: automake error our on invalid TEST_EXTENSIONS This change fixes automake bug#9400. * automake.in (handle_tests): Bail out if a suffix specified in TEST_EXTENSIONS would produce an invalid `xxx_LOG_COMPILER' variable or an invalid suffix rule. Before this change, automake would have issued a confusing error messages (about invalid or non-POSIX variables being defined), and in some situations would have even produced a broken `Makefile.in' file. ($TEST_EXTENSION_PATTERN): New helper variable. * doc/automake.texi (Simple Tests using parallel-tests): Document the limitations on TEST_EXTENSIONS explicitly. * NEWS: Update. * tests/test-extensions.test: New test. * tests/Makefile.am (TESTS): Update.
Stefano Lattarini 8f803645 2011-09-20T20:16:43 Merge branch 'maint' * maint: docs: document planned precedence changes in aclocal search path aclocal: handle ACLOCAL_PATH environment variable tests: fix spurious failure in 'primary-prefix-valid-couples.test' docs: deprecate JAVA primary docs: clearer distinction between `.java' with javac and with gcj java: complain if java_JAVA is used but $(javadir) is undefined
Stefano Lattarini c9dfc368 2011-09-18T23:32:38 java: complain if java_JAVA is used but $(javadir) is undefined Fixes automake bug#8461. * automake.in (handle_java): Remove inappropriate "java" argument from the calls to `&am_install_var' and `&am_primary_prefixes'. * tests/instdir-java.test (Makefile.am): Define `$(javadir)'. * tests/javadir-undefined.test: New test. * tests/Makefile.am (TESTS): Add it. * NEWS: Update.
Stefano Lattarini b52f63c8 2011-09-18T18:21:29 Merge branch 'remove-deansification' * remove-deansification: automake: remove special handling of `ANSI2KNR' make variable
Stefano Lattarini 16912bdf 2011-09-18T16:32:46 Merge branch 'java-work' * java-work: fix: remove duplicated ChangeLog entries java: allow both JAVA and nobase_JAVA in the same Makefile.am java: allow both dist_JAVA and nodist_JAVA in the same Makefile.am fix: regenerate tests/Makefile.in tests defs: use `skip_' for skipping java-related tests java tests: use $PATH_SEPARATOR where appropriate java coverage: test JAVACFLAGS and AM_JAVACFLAGS java coverage: test rebuild rules for java java coverage: try to build and run a java program test defs: new requirement for the default java interpreter java tests: tweak and make stricter a couple of tests java coverage: add test on uninstall with JAVA primary java tests: require java compiler more properly java: allow both JAVA and nobase_JAVA in the same Makefile.am java: allow both dist_JAVA and nodist_JAVA in the same Makefile.am
Stefano Lattarini 76b756f9 2011-09-16T13:41:42 automake: remove special handling of `ANSI2KNR' make variable * automake.in (define_configure_variable): Remove special-cased handling of `ANSI2KNR' variable. Related minor simplifications.
Stefano Lattarini 9a937d21 2011-09-12T11:03:32 java: allow both JAVA and nobase_JAVA in the same Makefile.am * automake.in (handle_java): Also strip `nobase_' from the given prefix, when needed. * tests/java-clean.test: Update and extend. * tests/java-compile-install.test: Likewise. * tests/java-no-duplicate.test: Likewise. * tests/java-sources.test: Likewise. * tests/java-noinst.test: Likewise. * tests/java-mix-dist-nodist.test: Renamed to ... * tests/java-mix.test: ... this, and extended. * tests/java-nobase.test: New test, still xfailing due to unrelated issues. * tests/Makefile.am (TESTS, XFAIL_TESTS): Update. Cherry-picked from v1.11-356-g01dede4
Stefano Lattarini 2990ef35 2011-09-12T10:54:49 java: allow both dist_JAVA and nodist_JAVA in the same Makefile.am Fixes automake bug#8434. * automake.in (handle_java): Strip `dist_' and `nodist_' from the given prefix. Define a new internal Makefile variable `am__java_sources'. Related adjustments. * lib/am/java.am (JAVAC, JAVAROOT, CLASSPATH_ENV): Define only the first time this am file is processed. (class%DIR%.stamp): Stamp file renamed ... (class%NDIR%.stamp): ... to this, so that the `dist_' and `nodist_' prefixes are stripped from the name of the stampfile. Adjust declaration of dependencies by using the new automake-generated internal variable `$(am__java_sources)'. In the rule, use `$@' as the name of the target, rather than hard-coding it. * tests/java.test: Update and extend. * tests/java-no-duplicate.test: New test. * tests/java-mix-dist-nodist.test: Likewise. * tests/java-compile-and-install.test: Likewise. * tests/java-clean.test: Likewise. * tests/java-sources.test: Likewise. * tests/Makefile.am (TESTS): Update. Cherry-picked from commit v1.11-337-gd76b503.
Peter Rosin b07777bd 2011-09-05T16:35:54 Merge branch 'maint' into msvc
Stefano Lattarini 199b9086 2011-09-01T11:02:04 automake: fix regression due to de-ansification support removal The last change `v1.11-947-g136b489' removed code that automake was using to decide whether binary objects were built by the generated Makefile.in, so that it could avoid to emit unneeded code when this was not the case. Re-introduce such code in a less-obfuscated form, and add a test to ensure we don't regress again. * automake.in ($must_handle_compiled_objects): New global variable, telling whether the generated Makefile has to build compiled objects. (initialize_per_input): Reset it. (handle_programs, handle_libraries, handle_ltlibraries): Set it to a true value when required. (handle_compile): Don't generate any code if the variable `$must_handle_compiled_objects' is not set to a true value. * tests/no-extra-makefile-code.test: New test. * tests/Makefile.am (TESTS): Add it.
Stefano Lattarini 136b4899 2011-08-28T22:38:50 automake: cleanups after de-ansification support removal (2) * automake.in ($get_object_extension_was_run): Remove, it's not really needed anymore. (&get_object_extension): Remove, it's a no-op now. All callers adjusted.
Stefano Lattarini 392800a6 2011-08-28T21:11:07 automake: cleanups after de-ansification support removal (1) * automake.in (lang_c_rewrite, handle_single_transform): Rename variable `$nonansi_obj' to `$obj'.
Stefano Lattarini c8d4c3f4 2011-08-28T16:09:50 ansi: remove obsolete code/files for de-ANSI-fication support * lib/ansi2knr.1, lib/ansi2knr.c: Deleted. * lib/Makefile.am (dist_pkgvdata_DATA): Do not list them anymore. * lib/am/ansi2knr.am: Delete. * lib/am/Makefile.am (dist_am_DATA): Do not list it anymore. * lib/Automake/Variable.pm (%_am_macro_for_var): Remove entries for `ANSI2KNR' and `U'. * m4/depout.m4 (_AM_OUTPUT_DEPENDENCY_COMMANDS): Don't care anymore about possible definition of the `$U' variable. * automake.in (@common_files): Drop `ansi2knr.1' and `ansi2knr.c'. (struct): Remove scalar field `ansi'. All callers adjusted. (&lang_c_finish, %de_ansi_files): Remove, they're not required anymore. All callers adjusted. ($get_object_extension_was_run): Fix typo in comment. (&get_object_extension): Drop code dealing with de-ansification; this function basically a no-op now, but is required to properly initialize `$get_object_extension_was_run' variable. (&handle_languages, &handle_compile, &lang_c_rewrite): Drop code dealing with de-ansification.
Stefano Lattarini 4480d9cf 2011-06-28T11:51:17 Merge branch 'maint' into java-work * maint: docs: avoid a footnote, some related rewordings and improvements Revert "docs: parallel-tests is not experimental anymore" docs: minor cosmetic fixes help: improve text about automatically-distributed files refactor: split 'usage' subroutine in automake tests: fix bug in 'autodist.test' maintcheck: extend 'sc_tests_plain_*' checks maintcheck: avoid few spurious failures check: don't use multi-line coloring for the report ansi2knr: deprecate, it will go away in the next major release docs: primary/prefix combination "pkglib_PROGRAMS" is now invalid docs: replace obsolete @vindex entry with a useful one docs: AM_DISTCHECK_CONFIGURE_FLAGS is for corner cases parallel-tests: stricter checks on DISABLE_HARD_ERRORS support docs: parallel-tests is not experimental anymore check: document and test $(TEST_SUITE_LOG) overriding
Stefano Lattarini 1f2e5599 2011-06-23T10:52:08 Merge branch 'maint' * maint: help: improve text about automatically-distributed files refactor: split 'usage' subroutine in automake
Stefano Lattarini c1040a74 2011-01-12T01:27:07 help: improve text about automatically-distributed files This change fixes automake bug#7819. * automake.in (usage): Distinguish between files that are always automatically distributed when found, and those which are only "under certain conditions". * doc/automake.texi (Basics of Distribution): Update accordingly. * tests/autodist-subdir.test: Update. * tests/autodist-no-duplicate.test: Likewise. * tests/autodist.test: Likewise. (configure.in): Remove useless call to AM_MAINTAINER_MODE.
Stefano Lattarini 94785660 2011-01-12T01:06:33 refactor: split 'usage' subroutine in automake This change is related to automake bug#7819. * automake.in (print_autodist_files): New subroutine, extracted from ... (usage): ... this, which now uses it. * tests/autodist-no-duplicate.test: New test. * tests/Makefile.am (TESTS): Update.
Stefano Lattarini afeb921c 2011-06-16T17:10:54 Merge branch 'maint' into java-work * maint: news: update w.r.t. introduction of AM_DISTCHECK_CONFIGURE_FLAGS tests: optimize tests on primary/prefix mismatch for speed Warnings about primary/prefix mismatch fixed and extended. maintcheck: DISTCHECK_CONFIGURE_FLAGS can be defined on make cmdline distcheck: add support for AM_DISTCHECK_CONFIGURE_FLAGS docs: better documentation for silent make rules
Stefano Lattarini 43d62e07 2011-06-16T16:56:36 Merge branch 'maint' * maint: news: update w.r.t. introduction of AM_DISTCHECK_CONFIGURE_FLAGS tests: optimize tests on primary/prefix mismatch for speed Warnings about primary/prefix mismatch fixed and extended. maintcheck: DISTCHECK_CONFIGURE_FLAGS can be defined on make cmdline distcheck: add support for AM_DISTCHECK_CONFIGURE_FLAGS docs: better documentation for silent make rules
Stefano Lattarini 9ca63264 2010-12-16T19:23:06 Warnings about primary/prefix mismatch fixed and extended. * automake.in (%standard_prefix): Add `doc' and `locale'. Rename `pkgdatadir' to `pkgdata'. Similarly for`pkglibdir', `pkgincludedir' and `pkglibexecdir'. (handle_programs): List `pkglibexec', not `pkglib', among the prefixes valid for the `PROGRAMS' primary. (handle_data): List also `doc' among the prefixes valid for the `DATA' primary. This is required by automake's own build system. * tests/dirforbid.test: Test removed, superseded by ... * tests/primary-prefix-invalid-couples.test: ... this new test. * tests/primary-prefix-valid-couples.test: New test. * tests/primary-prefix-documented-valid.test: Likewise. * tests/primary-prefix-force-valid.test: Likewise. * tests/java3.test: Adjusted, and extended a bit. * tests/Makefile.am (TESTS): Updated. * NEWS: Updated. From a report by Eric Blake.
Stefano Lattarini f52e9abd 2011-06-11T12:50:40 Merge branch 'maint' into java-work * maint: test defs: new function 'fatal_', for hard errors maintcheck: fix some failures, extend some checks automake, aclocal: honour configure-time AUTOCONF and AUTOM4TE build: the user can override AUTOM4TE, AUTORECONF and AUTOUPDATE too remake: behave better with non-GNU make in subdirectories tests/README: fix example about `make -e' usage
Stefano Lattarini 3eb05919 2011-05-31T18:03:48 Merge branch 'maint' * maint: automake, aclocal: honour configure-time AUTOCONF and AUTOM4TE build: the user can override AUTOM4TE, AUTORECONF and AUTOUPDATE too tests/README: fix example about `make -e' usage
Stefano Lattarini d235db33 2011-05-29T10:42:00 automake, aclocal: honour configure-time AUTOCONF and AUTOM4TE Currently, the Automake's own configure script allow definition of AUTOCONF and AUTOM4TE, expected to point respectively to an autoconf and autom4te programs. But while these definitions are honoured in the Automake's build systems and test suite, they were *not* honoured in the generated `automake' and `aclocal' scripts. This behaviour, apart from being wrong in that it does not allow the user enough freedom in choosing his tools, also caused inconsistencies in the test suite, brining to spurious failures. Problem reported by Graham Reitz on the automake list; see thread: <http://lists.gnu.org/archive/html/automake/2011-05/msg00022.html> * automake.in ($traces): Use `@am_AUTOCONF', not simply `autoconf'. * aclocal.in ($traces): Use `@am_AUTOM4TE', not simply `autom4te'. * Makefile.am (do_subst): Substitute also `@am_AUTOCONF' and `@am_AUTOM4TE'. * NEWS: Update. * THANKS: Update.
Stefano Lattarini 01dede44 2011-04-23T13:52:40 java: allow both JAVA and nobase_JAVA in the same Makefile.am * automake.in (handle_java): Also strip `nobase_' from the given prefix, when needed. * tests/java-clean.test: Update and extend. * tests/java-compile-install.test: Likewise. * tests/java-no-duplicate.test: Likewise. * tests/java-sources.test: Likewise. * tests/java-noinst.test: Likewise. * tests/java-mix-dist-nodist.test: Renamed to ... * tests/java-mix.test: ... this, and extended. * tests/java-nobase.test: New test, still xfailing due to unrelated issues. * tests/Makefile.am (TESTS, XFAIL_TESTS): Update.
Stefano Lattarini d76b5038 2011-04-18T15:18:08 java: allow both dist_JAVA and nodist_JAVA in the same Makefile.am Fixes automake bug#8434. * automake.in (handle_java): Strip `dist_' and `nodist_' from the given prefix. Define a new internal Makefile variable `am__java_sources'. Related adjustments. * lib/am/java.am (JAVAC, JAVAROOT, CLASSPATH_ENV): Define only the first time this am file is processed. (class%DIR%.stamp): Stamp file renamed ... (class%NDIR%.stamp): ... to this, so that the `dist_' and `nodist_' prefixes are stripped from the name of the stampfile. Adjust declaration of dependencies by using the new automake-generated internal variable `$(am__java_sources)'. In the rule, use `$@' as the name of the target, rather than hard-coding it. * tests/java.test: Update and extend. * tests/java-no-duplicate.test: New test. * tests/java-mix-dist-nodist.test: Likewise. * tests/java-compile-and-install.test: Likewise. * tests/java-clean.test: Likewise. * tests/java-sources.test: Likewise. * tests/Makefile.am (TESTS): Update.
Stefano Lattarini 475fe693 2011-04-09T23:27:48 Merge branch 'maint'
Stefano Lattarini 38f41a03 2011-04-06T18:49:44 java: check_JAVA does not cause compilation by "make all" anymore Fixes automake bug#8234. * automake.in (handle_java): Make stamp of class files built from java sources in $(check_JAVA) a dependency of `check' target, not `all' target. * tests/java-check.test: New test. * tests/Makefile.am (TESTS): Update. * NEWS: Update. * THANKS: Update. Report from Petteri Räty.
Stefano Lattarini d555ae18 2011-04-02T16:00:23 Merge branch 'maint'
Ralf Wildenhues e87c030d 2011-04-02T11:09:10 Create subdirs for generated sources even when not dep tracking. * automake.in (handle_single_transform): If $object is derived and lands in subdir, be sure to output a dirstamp dependency. * tests/yacc5.test: Avoid falsely matching the dirstamp dependency when grepping for a rule. * tests/lex-subobj-nodep.test: New test. * tests/Makefile.am (TESTS): Update. * THANKS: Update. Report by Ignacy Gawedzki. Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini 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.
Stefano Lattarini 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.
Stefano Lattarini 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.
Stefano Lattarini 05e77ab5 2011-01-11T01:00:13 Merge branch 'yacc-work'
Stefano Lattarini 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.
Stefano Lattarini 405477b5 2011-01-09T16:20:34 Merge branch 'yacc-work'
Stefano Lattarini 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.
Stefano Lattarini a71a5686 2011-01-09T15:30:42 Merge branch 'maint'
Stefano Lattarini 638f21a1 2011-01-08T13:04:10 automake: minor fixes in comments * automake.in: Some minor fixes and enhancements in comments.
Stefano Lattarini a297a165 2011-01-07T22:01:20 Merge branch 'yacc-clean'
Stefano Lattarini 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.
Ralf Wildenhues 3c9e7acc 2011-01-02T05:38:18 Merge branch 'maint'
Ralf Wildenhues 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>
Stefano Lattarini 3fe9baba 2010-12-23T21:41:45 Merge branch 'tests-suffix-extend' Conflicts: tests/suffix10.test
Stefano Lattarini 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.
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.
Stefano Lattarini 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.
Stefano Lattarini 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.
Stefano Lattarini f7adc0f4 2010-11-06T20:32:48 Merge branch 'maint'
Stefano Lattarini 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'.
Ralf Wildenhues 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>
Ralf Wildenhues 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>
Ralf Wildenhues 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>
Ralf Wildenhues c3eab9af 2010-10-02T18:43:01 Merge branch 'maint'
Ralf Wildenhues 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."
Ralf Wildenhues 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>
Eric Blake 35597a75 2010-09-17T14:17:07 Merge branch 'maint'
Eric Blake 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>
Ralf Wildenhues f60e9ae2 2010-09-07T04:58:02 Merge branch 'maint'
Ralf Wildenhues 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.
Ralf Wildenhues 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.
Peter Rosin 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>
Ralf Wildenhues f54a09c3 2010-06-26T22:23:31 Merge branch 'maint'
Ralf Wildenhues 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>
Ralf Wildenhues 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.
Stefano Lattarini 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>
Ralf Wildenhues 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>
Ralf Wildenhues 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.
Ralf Wildenhues 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>
Ralf Wildenhues 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>
Ralf Wildenhues d4c5a007 2010-04-25T18:49:18 Merge branch 'maint' into foo
Ralf Wildenhues 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>
Ralf Wildenhues 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>
Ralf Wildenhues 59e07285 2010-03-06T09:35:46 Merge branch 'maint'
Ralf Wildenhues 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>
Ralf Wildenhues 4147afc1 2010-02-24T19:56:26 Merge branch 'lzip-support' * lzip-support: Add lzip compression support.
Antonio Diaz Diaz 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>
Ralf Wildenhues 335494d7 2010-01-24T12:37:36 Merge branch 'je-silent' * je-silent: Fix silent-rules output for disabled dependency tracking.
Ralf Wildenhues 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>
Ralf Wildenhues 7f2d6fb3 2010-01-17T12:08:50 Merge branch 'maint'
Ralf Wildenhues 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>
Ralf Wildenhues b3f8778b 2009-12-05T15:11:07 Merge branch 'maint'
Ralf Wildenhues 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>
Ralf Wildenhues 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>
Stefano Lattarini 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>
Ralf Wildenhues 905414f8 2009-10-17T10:23:54 Merge branch 'maint'
Ralf Wildenhues 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>
Ralf Wildenhues 2ecb79b7 2009-10-06T22:09:27 Merge branch 'dr-cscope' * dr-cscope: Fixups and tests for cscope functionality. New target to generate cscope database.