summaryrefslogtreecommitdiff
path: root/contrib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into ng/masterStefano Lattarini2015-01-055-5/+5
|\ | | | | | | | | | | * master: maint: update copyright years to 2015 (branch 'master') maint: update copyright years to 2015 (branch 'micro')
| * maint: update copyright years to 2015 (branch 'micro')Stefano Lattarini2015-01-0511-11/+11
| | | | | | | | Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
* | Merge branch 'master' into ng/masterStefano Lattarini2014-12-201-0/+563
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Fix stupid typo in test, causing spurious failure sync: update third-part files from upstream Make sure AM_INIT_AUTOMAKE has a trailing newline dist: adjust warning messages about shar and tarZ deprecation docs: improve description of ${PACKAGE}, ${VERSION}, and similar variables Fix dumb logic error preventing $install_sh from being be overridden Automake docs: fix typos and use of British English Expose automake bug#19311 build: fix race in parallel builds build: fix race in parallel builds init: ensure $ac_aux_dir is defined before being used plans: enabling subdir-object by default is blocked on bug#13928 maint: update copyright (for files in 'master' only) maint: update copyright years maint: sync files from upstream ("make fetch") Typofixes in warning messages and manual doc: fix encoding error with UTF-8 characters NEWS: a typofix, and better word wrapping parallel-tests: avoid possible implicit "make all" in test-suite.log rule Allow user to extend .PRECIOUS target cosmetics: remove a couple of extra trailing white spaces tests: fix a spurious failure on Mac OS X docs: make clear the JAVA primary is frozen install-sh: a slightly better diagnostic, and tests enhancements install-sh: be stricter in catching invalid usages tests: more significant names for some tests tests: some cosmetic fixes tests: more significant names for a test docs: drop a few obsolescent FIXME/TODO comments, and associated text testsuite harness: report test exit status in log file TAP driver: no need to invoke AC_PROG_AWK directly TAP driver: remove perl implementation (move it into contrib/) NEWS: stop reporting "new" Automake versioning scheme post-release: micro version bump to 1.14.1a devel version release: stable micro release 1.14.1 HACKING: minor clarification tests: make install-info-dir.sh print more debugging info tests: remove too-brittle test tap-realtime.sh maintainer: am-ft: add option to cater to clock skews sync: update INSTALL, config.guess and config.sub from upstream TAP driver: cosmetic fixes cosmetics: fix typo in a user-facing message in tests automake: account for perl hash order randomization tests: avoid use of intervals to capitalize letters cosmetics: untabify the install-sh script install-sh: assume that "set -f" and "set +f" work... install-sh: assume ${var:-value} works as expected install-sh: assume 'dirname' is available and working correctly distcheck: don't allow overriding of --prefix and --srcdir by the user tests: expose bug#14991 (relates to 'distcheck') tests: fix spurious failure when zip is present but unzip is not tests: fix spurious failure due to localization issues NEWS: update with the changes since v1.14 docs: correct typos in the fix-timestamp.sh script python: byte-compile nobase_*_PYTHON files only once cosmetics: typofix in the 'missing' script test: avoid false positives in 'cc-no-c-o' script test harness: improve catching of usage errors in script 'test-driver' tests: fix a spurious failure on NetBSD-current am-ft: make the environment available earlier NEWS: post-release tweaks (for 1.14.x series) tests: avoid a spurious failure on MacOS X 10.6.8 tests: don't risk hanging on the 'cl' requirement post-release: micro version bump (1.14a) post-release: micro version bump (1.14.0a) release: stable minor release 1.14 Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
| * maint: update copyright yearsStefano Lattarini2014-04-2111-11/+11
| | | | | | | | | | | | We've been in 2014 already for few months now... Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
| * TAP driver: remove perl implementation (move it into contrib/)Stefano Lattarini2013-12-241-0/+563
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That implementation was only meant as a standard against which the portable awk+shell implementation was to be measured. Now, since Automake 1.12, the latter implementation is fully functional and already used in the wild, and in fact feature-par with the perl implementation. So the perl implementation is now just slowing down and complicating our testsuite. Let's move it to 'contrib/' (we don't want to remove it, in case someone is actually using it in the wild). * lib/tap-driver.pl: Move it ... * contrib/tap-driver.pl: ... here. While at it, convert quoting `like this' to quoting 'like this', and remove an obsolescent FIXME comment. * lib/Makefile.inc (dist_script_DATA): Drop '%D%/tap-driver.pl'. * Makefile.am (EXTRA_DIST): Add 'contrib/tap-driver.pl'. * doc/automake.texi: Remove one stray reference to 'tap-driver.pl', and reference 'tap-driver.sh' instead, as intended. * t/ax/am-test-lib.sh ($am_tap_implementation): Delete definition and uses. (fetch_tap_driver): Simplify to unconditionally assume the shell+awk implementation of the TAP driver is used. (get_shell_script): Make more flexible so that it can cater to the needs of 'fetch_tap_driver()'. * t/tap-bad-prog.tap: Likewise. * t/tap-bailout-leading-space.sh: Likewise. * t/tap-signal.tap: Likewise. * t/tap-test-number-0.sh: Likewise. * t/test-driver-cond.sh: Use 'tap-driver.sh' instead of 'tap-driver.pl'. * gen-testsuite-part (%test_generators): Do not generate sister tests that use the perl TAP driver rather than the shell+awk one. * NEWS: Update. Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
| * Merge branch 'micro' into maintStefano Lattarini2013-05-221-4/+4
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * micro: tests: run_make: options to do command redirection tests: only activate 'unset' alias if required tests: better idiom to override make macro defs on the cmdline test-lib: minor style changes test-lib: fix botched function name in an error message Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
| | * tests: better idiom to override make macro defs on the cmdlineStefano Lattarini2013-05-221-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We now do so with a new wrapper shell function 'run_make()', which relies on the use of AM_MAKEFLAGS, avoiding the use of the '-e' make option. The use of that option (that causes the environment variables to take precedence over the macro definitions in the Makefile) has proved to be quite brittle in the past, causing annoying and sometimes problematic spurious failures. This has worsened in some still unpublished work going on in development branches. It's time to solve the issue once and for all. Note that we do not convert all uses of $MAKE in the testsuite right away; we might do so in follow-up changes, with leisure, to avoid a "patch bomb" effect (this commit is already too much of a bomb itself). What we do in this commit is to get rid of all "$MAKE -e" invocations. We admit that the implementation and feature-set of 'run_make()' are far from perfect, but good enough for our current purposes. We'll improve 'run_make()' if and when the need arises. * syntax-checks.mk (sc_tests_no_make_e): New syntax check, guard against the use of "$MAKE -e". (syntax_check_rules): Add it. (sc_tests_overriding_macros_on_cmdline): Adjust. (lint): New, alias for 'maintainer-check', for lazy typists. Idea backported from the 'maint' branch (Automake 1.13a). * t/ax/am-test-lib.sh (run_make): New function. Run $MAKE with the given command-line arguments, handling command-line override of variable definitions in a smart way (using AM_MAKEFLAGS if a non-GNU make implementation is detected to be in use). (useless_vpath_rebuild): Adjust to use 'run_make', to avoid a spurious maintainer check failure. (yl_distcheck): Use 'run_make' rather than bare '$MAKE'. (single_quote, append_single_quoted, is_valid_varname): New auxiliary function, used, directly or indirectly, by it. * Many tests: Adjust to avoid the use of "$MAKE -e", and prefer the use of 'run_make' in few other contexts as well, where it makes sense. Other minor fixlets while at it. Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
* | | update copyright years in all filesStefano Lattarini2014-12-194-4/+4
| | | | | | | | | | | | Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
* | | build: adapt the per-subdir Makefile.inc filesStefano Lattarini2013-05-102-26/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So that they can correctly implement the Automake-NG build system. This has been done with the help of the diffs between the old top-level Makefile.am files from mainline Automake (master branch) and Automake-NG (ng/master branch), obtained with the command: diff -u Makefile.old Makefile.sav > diffs * Makefile.am: Adjust. * bin/Makefile.inc: Likewise. * contrib/t/Makefile.inc: Likewise. * doc/Makefile.inc: Likewise. * lib/Automake/Makefile.inc: Likewise. * lib/Makefile.inc: Likewise. * lib/am/Makefile.inc: Likewise. * m4/Makefile.inc: Likewise. * t/Makefile.inc: Likewise. * contrib/t/local.am: Delete. Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
* | | Merge branch 'master' into tmp-for-master-mergeStefano Lattarini2013-05-101-0/+26
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: automake: typofix in comments: s/AC_CONFIG_HEADER/AC_CONFIG_HEADERS/ build: move automake and aclocal in 'bin' subdir build: break up monolithic Makefile.am in subdir-specific fragments This leaves the tree in a partially-inconsistent state. We will fix the situation with follow-up patches. Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
| * | build: break up monolithic Makefile.am in subdir-specific fragmentsStefano Lattarini2013-05-092-25/+26
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is convenient to do, now that we have improved "relative directory" support with the '%reladir%' (a.k.a. '%D%') and '%canon_reladir%' (a.k.a. '%C%') Automake-time substitutions for included makefile fragments. This move also satisfy our philosophy of using new Automake features in our own build system, as a way of facilitating early discovery of possible bugs or interface warts. * Makefile.am: Break up ... * doc/Makefile.inc, lib/Automake/Makefile.inc, lib/Makefile.inc, lib/am/Makefile.inc, m4/Makefile.inc, t/Makefile.inc): ... in this new included fragments. Adjust as needed, and make deliberate use of the '%D%' substitution. * contrib/t/local.am: Rename ... * contrib/t/Makefile.inc: ... like this. Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
* | Merge branch 'master' into ng/masterStefano Lattarini2012-12-314-4/+4
|\ \ | |/ | | | | | | | | * master: maint: update copyright year for 2013 (in branch master) maint: update copyright year for 2013 (in branch maint)
| * maint: update copyright year for 2013 (in branch maint)Stefano Lattarini2012-12-3110-10/+10
| | | | | | | | Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
* | Merge branch 'master' into ng/masterStefano Lattarini2012-10-272-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | * master: tests: remove spurious leftover use of 'Exit' tests: remove an obsolete, and probably now wrong, comment tests: remove obsolescent references to './defs' tests: prefer including 'test-init.sh' rather than './defs' Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
| * tests: prefer including 'test-init.sh' rather than './defs'Stefano Lattarini2012-10-274-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a follow-up to today's commit v1.12.4-22-g0610fc8, "tests: prepare to move ./defs to t/ax/test-init.sh" * All tests: To run the common setup, use the command: . test-init.sh instead of the older, "historical" one: . ./defs || exit 1 Note that the "|| exit 1" wasn't really useful, since the 'errexit' shell flag is in effect in both './defs' and 'test-init.sh', and all the known shells that are good enough to run the automake testsuite do automatically exit with error when a sourced file cannot be found (at least, they do so in non-interactive mode, which is the only mode that concerns us in the testsuite). * t/ax/tap-summary-aux.sh, t/ax/testsuite-summary-checks.sh: Likewise. * gen-testsuite-part: Do the same in the generated tests. Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
* | [ng] contrib: rewrite and fix 'check-html' and 'recheck-html'Stefano Lattarini2012-08-113-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That has actually been broken for some time, due to the changes done in Automake-NG proper in the meantime. * contrib/check-html.am (.log.html): Re-declare this suffix rule ... (%.html: %.log): ... as a pattern rule. (mostlyclean-check-html): Remove, instead ... (MOSTLYCLEANFILES): ... appending to this variable. Not only this reduce the code size, but will give us resilience against possible exceeded command line length limits for free. (check-html, recheck-html): Rewrite as static pattern rules. Fix the recursive "make check" and "make recheck" invocation to override TESTS, not TEST_LOGS (the latter override is not honoured anymore by the new incarnation of the parallel-test rules). * contrib/t/parallel-tests-html-recursive.sh: Adjust a little, by initializing 'MOSTLYCLEANFILES' (to empty) in all the 'Makefile.am' files that use 'check-html.am'. * contrib/t/parallel-tests-html.sh: Likewise. Also, since the parallel-tests API does not allow command-line overriding of TEST_LOGS anymore, stop doing that. Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
* | [ng] fixup: don't reference non-existing tests on 'multilib'Stefano Lattarini2012-07-021-3/+1
| | | | | | | | | | | | | | | | | | | | | | * contrib/t/local.am (contrib_TESTS): Here. * Makefile.am (EXTRA_DIST): No need to manually add $(contrib_TESTS), we already add $(TESTS) as a whole. (TESTS): Add $(contrib_TESTS) directly in the definition, rather than later with '+='. ($(srcdir)/contrib/t/local.am): Move inclusion of this earlier. Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
* | Merge branch 'master' into ng/masterStefano Lattarini2012-07-024-11/+342
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * master: contrib: check-html: pass flags to rst2html invocations contrib: simple improvements to check-html coverage: check-html can be used recursively tests: tests for stuff in contrib goes in 'contrib/t' recursion: support user-defined recursive targets tests: rename 'recurs*.sh' to 'var-recurs*.sh' tests: minor improvements to 'recurs*.sh' Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
| * contrib: check-html: pass flags to rst2html invocationsStefano Lattarini2012-07-021-1/+2
| | | | | | | | | | | | | | | | | | Related to automake bug#11287. * contrib/t/check-html.am (.log.html): Here, passing $(AM_RST2HTMLFLAGS) and $(RST2HTMLFLAGS) (in that order). Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
| * contrib: simple improvements to check-htmlStefano Lattarini2012-07-021-11/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | Related to automake bug#11287. * contrib/t/check-html.am (.log.html): Do not look for $RST2HTML in the environment, looking for $(RST2HTML) should be enough (also, the pre-existing code was broken, because it single-quoted $RST2HTML). Fix the loop-and-search implementation to be more similar to the one in 'contrib/t/parallel-tests-html.sh'. Prefer 'mv -f' over bare 'mv'. Do not break the recipe in Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
| * coverage: check-html can be used recursivelyStefano Lattarini2012-07-022-0/+164
| | | | | | | | | | | | | | | | | | Addresses the main part of Automake bug#11287. * contrib/t/parallel-tests-html-recursive.sh: New test. * contrib/t/local.am: Add it. Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
| * tests: tests for stuff in contrib goes in 'contrib/t'Stefano Lattarini2012-07-024-0/+360
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * t/help-multilib.sh: Move ... * contrib/t/help-multilib.sh: .. here. Remove a now-obsolete "FIXME" comment. * t/multlib.sh: Move ... * contrib/t/multilib.sh: .. here. Remove a now-obsolete "FIXME" comment. * t/parallel-test2.sh: Move ... * contrib/t/parallel-tests-html.sh: .. here. Remove a now-obsolete "FIXME" comment. * contrib/t/local.am: New, basically defining the list of tests for stuff in 'contrib/'. * t/list-of-tests.mk, Makefile.am: Adjust. * .gitignore: Update. * syntax-checks.mk (xtests): Likewise. Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
* | contrib: drop 'multilib' supportStefano Lattarini2012-06-305-1073/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Its tests are hopelessly failing now, it is complex to debug (and I'm too ignorant about its aims and its implementation to do so), and anyway it should probably be rewritten to take better advantage of GNU make and Automake-NG features. So let's drop it for now, to avoid slowing down the Automake-NG development. Anyone interested in the 'multilib' will send patches re-implementing it after out first Automake-NG beta is out. Probably several months from now. * contrib/multilib/README, contrib/multilib/config-ml.in, * contrib/multilib/multi.m4, contrib/multilib/multilib.am, * contrib/multilib/symlink-tree, t/help-multilib.sh, * t/multlib.sh: Remove. * Makefile.am (EXTRA_DIST): Adjust. Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
* | [ng] mkinstalldirs: remove support for the script and the variableStefano Lattarini2012-05-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to our documentation: mkinstalldirs used to be a wrapper around 'mkdir -p', which is not portable. Now we prefer to use 'install-sh -d' when configure finds that 'mkdir -p' does not work, this makes one less script to distribute. For backward compatibility mkinstalldirs is still used and distributed when automake finds it in a package. But it is no longer installed automatically, and it should be safe to remove it. So we remove the 'mkinstalldirs' as well as its companion $(mkinstalldirs) variable from Automake-NG altogether. * NG-NEWS, doc/automake-ng.texi: Update. * automake.in (handle_configure): Don not require nor distribute the 'mkinstalldirs' script anymore. Do not define the $(mkinstalldirs) variable. (@common_files): Do not report 'mkinstalldirs' anymore. Reformat the array while we are at it, to make it easier to add or remove entries in the future. * lib/mkinstalldirs: Delete this file. * Makefile.am (dist_script_DATA): Remove it. (check-coverage-run, recheck-coverage-run): Use $(MKDIR_P), not $(mkinstalldirs), to create the 'cover_db' directory. * syntax-checks.mk (sc_mkinstalldirs): Adjust to verify we have mo more instances of 'mkinstalldirs'. * contrib/multilib/config-ml.in: Remove comment referencing the 'mkinstalldirs' script. * t/auxdir.sh: Adjust to use 'py-compile' rather than 'mkinstalldirs'. * t/auxdir6.sh: Likewise. * t/auxdir7.sh: Likewise. * t/auxdir8.sh: Likewise. * t/pr9.sh: Adjust comments to avoid spuriously triggering the 'sc_mkinstalldirs' maintainer check. * t/mkinst3.sh: Converted to test 'install-sh -d' rather than 'mkinstalldirs'. * t/subdir.sh: Adjust comments. * t/werror.sh: Use 'am_create_testdir=empty' rather than removing the install-sh, depcomp, missing and mkinstalldirs scripts by hand. * t/mkinstall.sh: Remove as obsolete. * t/instman2.sh: Likewise. Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
* | Merge branch 'master' into ng/masterStefano Lattarini2012-04-111-27/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: vala tests: force the use of automatic dependency tracking tests: avoid spurious failures in tests on C++ and lex tests: avoid spurious failures with non-flex 'lex' programs and C++ tests: avoid a spurious failures for shells with busted 'set -e' maint: simplify generation of files with @substed@ stuff tests: remove redundant requirement tests: make two test scripts executable t/README: update w.r.t. recent overhaul (non-recursive build system) docs: fix names of relevant test cases in comments NEWS: automake build systems avoids make recursion maint: no more make recursion in Automake's build system tests: rename 'tests/' => 't/', '*.test' => '*.sh' tests: remove recipes that run tests with 'prove' tests: move most helper scripts and files into the 'ax' subdirectory maint: remove most recursion in automake's own build system tests: fix a spurious failures with non-GNU make + Extra non-trivial edits: * Makefile.am: Remove new uses of 'AM_MAKEFLAGS' throughout. (dist_automake_ac_DATA): Do not list 'm4/depout.m4' nor 'm4/make.m4'. * syntax-checks.m4: Use '$(xdefs)' instead of hard-coding the older paths of 'defs' and 'defs-static.in'. Use 't/README' instead of 'tests/README'. * t/instdir-no-empty.sh: Remove uses of 'AM_MAKEFLAGS'. * tests/depcomp-recover.test: Renamed ... * t/depcomp-recover.sh: ... to this. * tests/gmake-vars.test: Renamed ... * t/gmake-vars.sh: ... to this. * tests/interp3.test: Renamed ... * t/interp3.sh: ... to this. * tests/objdir.test: Renamed ... * t/objdir.sh: ... to this. * tests/spy-vpath-rewrite.test: Renamed ... * t/spy-vpath-rewrite.sh: ... to this. * tests/vpath-rewrite.test: Renamed ... * t/vpath-rewrite.sh: ... to this. * tests/yacc-subobj-nodep.test: Renamed ... * t/yacc-subobj-nodep.sh: ... to this. * tests/depcomp-shuffle.sh: Renamed ... * t/ax/depcomp-shuffle.sh: ... to this, and removed executable bit. * t/depcomp-shuffle-sub-vpath.sh: Adjust. * t/depcomp-shuffle-sub.sh: Likewise. * t/depcomp-shuffle-vpath.sh: Likewise. * t/depcomp-shuffle.sh: Likewise. * gen-testsuite-part: Likewise. * t/list-of-tests.mk: Do not list tests that had been already removed from the Automake-NG testsuite. Take into account the renames above. Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
| * maint: remove most recursion in automake's own build systemStefano Lattarini2012-04-051-27/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recursive make-based build systems tend to be slower, more fragile and less faithful than "flat" ones. See Peter Miller's article "Recursive Make Considered Harmful" for more a more in-depth discussion: <http://miller.emu.id.au/pmiller/books/rmch/> While in the case of automake this isn't a big problem (given the small size of its build systems), it still creates occasional glitches and annoyances. With this change, the use of recursion in Automake's own build system is eliminated *but for the testsuite*. Converting that is a little more tricky, and better left for a later change (or series of changes). See also commit v1.11-769-gfeeb7f6 of 28-03-2012. * contrib/Makefile.am, lib/Makefile.am, m4/Makefile.am, doc/Makefile.am: Removed, their content merged ... * Makefile.am: ... here, with required adjustments and few other "opportunistic" changes. (SUBDIRS): Update. * configure.ac (AC_CONFIG_FILES): Likewise. * .gitignore: Likewise. Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
* | Merge branch 'master' into ng/masterStefano Lattarini2012-02-211-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (28 commits) tests: "make installcheck" shouldn't run the testsuite twice news: minor fixlets and reorganization cosmetics: few typofixes automake: new option 'serial-tests' tests: fix a timestamp issue, and other minor buglets automake: new option to print location of scripts and data files docs: prefer the awk+sh TAP driver over the perl one tests: be stricter in determining whether "make -jN" works tests: don't trust exit status of "make -k" tests: fix race condition in 'self-check-dir.tap' parallel-tests: fix another BSD parallel make issue tests: avoid FreeBSD make VPATH issues in more tests (see bug#7884) cosmetics: remove extra trailing whitespace in configure.ac tests: avoid spurious failure with FreeBSD make tests: fix broken quoting in the generated yacc grammar fixup: always use correct path for automake/aclocal wrappers tests: fix spurious failure in VPATH build tests: fix many spurious failures in VPATH builds tests: relax a test to cater to NetBSD make dryrun: $(am__dry_run) not confused by metachars in $(MAKEFLAGS) ...
| * cosmetics: few typofixesStefano Lattarini2012-02-211-1/+1
| |
* | [ng] maint: use name "Automake-NG" in more places, bump versionStefano Lattarini2012-02-161-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's time to start renaming this project for good, if we want to avoid nasty confusions with mainstream Automake. But renaming also the 'automake' script to 'automake-ng' could cause gratuitous incompatibilities and unexpected errors, so we prefer to instead bump the version from '1.11a' to '2.0a'. The renaming "Automake" -> "Automake-NG" is mostly for README files and some comments. Doing that for the documentation would be trickier, and might cause extra spurious conflicts when we merge 'master' into 'ng/master', so we leave that move for a later time. * AUTHORS, README, contrib/README, tests/README, doc/amhello/README: Update comments, and, where necessary, the mailing list and bug reporting address. * doc/Makefile.am, GNUmakefile, syntax-checks.mk, m4/init.m4, m4/strip.m4, m4/substnot.m4: Update a few comments. * configure.ac (AC_INIT): Update package name and bug reporting address. Reset Package version to "2.0a". (AM_INIT_AUTOMAKE): Remove minimal required version; we expect to be bootstrapped anyway. Minor updates to comments and messages. * lib/ar-lib: Update the "this file is maintained in Automake" line to read "Automake-NG" instead. Also, update the address where to send patches to (to <automake-ng@gnu.org>), but, at least for the moment, *not* the bug reporting address. * lib/compile: Likewise. * lib/elisp-comp: Likewise. * lib/mdate-sh: Likewise. * lib/mkinstalldirs: Likewise. * lib/py-compile: Likewise. * lib/tap-driver.pl: Likewise. * lib/tap-driver.sh: Likewise. * lib/test-driver: Likewise.
* | Merge branch 'master' into ng/masterStefano Lattarini2012-02-164-7/+4
|\ \ | |/ | | | | With lots of edits to solve *spurious* failures.
| * maint: run "make update-copyright"Stefano Lattarini2012-02-165-10/+5
| |
* | Merge branch 'master' into ng/masterStefano Lattarini2012-02-091-2/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (29 commits) tests: avoid wrong skips in dist-formats.tap tests: few tweakings and cosmetic changes tests: remove a couple of redundant 'set -e' calls tests: check if 'compress' is real or fake depcomp tests: avoid spurious failures with 'dashXmstdout' depmode depcomp: try to prevent whitespace regressions depcomp: recognize tabs as whitespace in the dashmstdout mode depcomp: quote 'like this', not `like this' tests: check the depmodes 'msvisualcpp' and 'msvcmsys' tests: better way to compare lists in Makefile rules tests: improve and rework tests on dependency tracking tests: fix a timestamp-related spurious failures dryrun: fix regression with '$(am__make_dryrun)' test defs: avoid spurious XPASS results with NetBSD make cosmetics: few whitespace fixlets cosmetics: various typofixes cosmetics: convert encoding from ISO-8859 to UTF-8 in some tests test defs: remove obsolete requirement 'rst2html' tests: workaround for shells with broken 'set -e' cosmetics: fix a typo in comments ...
| * cosmetics: few whitespace fixletsStefano Lattarini2012-02-061-2/+1
| |
* | [ng] general: GNU make doesn't support the '.MAKE' special targetStefano Lattarini2012-01-312-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The '.MAKE' special target can be used on NetBSD make to ensure that the recipes for the targets declared as its dependencies are executed also with "make -n". This special target does not work with GNU make though, so it's pointless to use it. To obtain a similar effect on GNU make, one can either prepend a recipe with the '+' modifier, or use the string '$(MAKE)' somewhere in the recipe text). * syntax-checks.mk (sc_no_dotmake_target): New syntax check, ensuring we don't use the '.MAKE' special target. (syntax_check_rules): Add it. * lib/am/install.am: Don't use the '.MAKE' target. * lib/am/subdirs.am: Likewise. * contrib/multilib/multilib.am: Likewise. * contrib/check-html.am: Likewise. * automake.in: Likewise.
* | [ng] maintcheck: fix real and spurious warningsStefano Lattarini2012-01-311-2/+2
| | | | | | | | | | | | | | | | | | * tests/conffile-leading-dot.test ($required): Remove "GNUmake". * tests/gmake-vars.test: Use 'AUTOMAKE_run' instead of redirecting the automake stderr by hand. Use "$MAKE", not bare "make". * Makefile.am, doc/Makefile.am, tests/Makefile.am, contrib/check-html.am: Don't use '$(AM_MAKEFLAGS)' in recursive make invocations.
* | Merge branch 'master' into ng/masterStefano Lattarini2012-01-256-0/+1081
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: multilib: move to contrib tests: improve diagnostics when write(2) fails readme: how to run the testsuite with cross-compilers tests: no need to unset CFLAGS in tests requiring 'gcc' anymore test defs: allow compilers to be auto-selected on user's request test defs: substitute compilers and flags found at configure time test defs: setup `*FLAGS' variables for GNU compilers configure: search generic compilers for use in the tests tests: remove redundant 'set -e' calls tests: fix spurious failure due to autom4te caching dist tests: missing 'compress' program was causing spurious failures vala: fix name of temporary file used in vala rules vala tests: add missing 'valac' requirement, and other minor fixlets news: fix grammaro fixup: distribute 'contrib/multilib/multi.m4' multilib: deprecate, will be moved to contrib fixlet: flags for Fortran77 compiler are in FFLAGS, not F77FLAGS cosmetics: fix a botched comment in a maintainer check + Extra edits: * contrib/multilib/multilib.am: Don't use $(AM_MAKEFLAGS) in recursive make invocations.
| * multilib: move to contribStefano Lattarini2012-01-245-0/+1015
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This follows up on commit v1.11-665-gc5df21e of 2012-01-17, "multilib: deprecate, will be moved to contrib". See also: <http://lists.gnu.org/archive/html/automake-patches/2012-01/msg00109.html> * NEWS: Update. * automake.in ($seen_multilib): Remove. (scan_autoconf_traces): Don't trace 'AM_ENABLE_MULTILIB', and don't handle it anymore. (handle_multilib): Remove. (generate_makefile): Don't call it anymore. * doc/automake.texi: Remove documentation about multilib support, related macros, and helper files. * m4/multi.m4: Delete. * m4/Makefile.am (dist_automake_ac_DATA): Remove it. * lib/am/multilib.am: Delete. * lib/am/Makefile.am (dist_am_DATA): Remove it. * contrib/multilib/multilib.am: New file, adapted from extracts of a Makefile.in generated with automake multilib support. We did this instead of moving and editing 'lib/am/multilib.am' because it allows us to license this file with a liberal license that will permit users to copy-and-paste it in non-GPLed Makefile.am files too). * lib/symlink-tree, lib/config-ml.in: Move ... * contrib/multilib: ... in here. * lib/Makefile.am (dist_script_DATA, dist_pkgvdata_DATA): Update. * contrib/multilib/README: New file. * contrib/Makefile.am (EXTRA_DIST): Add the files created or moved in 'contrib/multlib'. * tests/multilib.test: Update and enhance a little. * tests/help-multilib.test: Likewise.
| * Merge branch 'maint'Stefano Lattarini2012-01-212-0/+66
| |\ |/ / | | | | | | | | | | | | * maint: fixup: distribute 'contrib/multilib/multi.m4' multilib: deprecate, will be moved to contrib fixlet: flags for Fortran77 compiler are in FFLAGS, not F77FLAGS cosmetics: fix a botched comment in a maintainer check
| * fixup: distribute 'contrib/multilib/multi.m4'Stefano Lattarini2012-01-211-1/+3
| | | | | | | | | | | | | | This fix up a blunder in commit v1.11-665-gc5df21e of 2012-01-17, "multilib: deprecate, will be moved to contrib". * contrib/Makefile.am (EXTRA_DIST): Add 'multilib/multi.m4'.
| * multilib: deprecate, will be moved to contribStefano Lattarini2012-01-211-0/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As of 2012-01-17, according to Google codesarch, almost no active package is using the 'multilib' feature offered by automake. The only major exception seems to be GCC... But on a closer look, it become clear that GCC basically carries its own version of multilib support. In fact, Automake syncs its 'config-ml.in' and 'symlink-tree' scripts from GCC; and the GCC repository contains a version of the 'multi.m4' file that is *more* updated than the one in the automake repository (the former having being modified the last time in 2008, the latter only in 2006). The 'multilib' feature was anyway hardly documented at all, only being briefly cited in the manual as an "obscure feature", "still experimental", that was only for users "familiar with multilibs" and which "can debug problems they might encounter". We expect such users to be motivated and knowledgeable enough to make the minor adjustments required to start using the contrib version of multilib, if they really need to. * NEWS (Future backward incompatibility): Update. * doc/automake.texi: Deprecate multilib support. State that it will be removed from automake core in the next major release. * m4/multi.m4 (AM_ENABLE_MULTILIB): Deprecate. If called, now gives a proper warning in the 'obsolete' category (while still retaining its former behaviour for the rest). * tests/multilib.test: Update. * contrib/multilib/multi.m4: New, verbatim copy of the earlier version of multi.m4, without the new deprecation warning. * Makefile.am (fetch): Don't sync the 'config-ml.in' file nor the 'symlink-tree' script from GCC SVN repository anymore. (FETCHFILES): Adjust. (WGET_GCC): Remove, it's not needed anymore.
* | check: move ".log -> .html" conversion in contribStefano Lattarini2012-01-172-1/+62
|/ | | | | | | | | | | | | | | | | | | | | | | | | That feature has been deprecated in the 1.11.x series, and marked for removal from the automake core in the 1.12 release. Here we implement such removal. Reference: <http://lists.gnu.org/archive/html/automake/2012-01/msg00005.html> See also commit 'v1.11-650-g20f2ac9'. * doc/automake.texi, NEWS: Update. * lib/am/check.am: Don't include 'check-html.am' anymore. * lib/am/check-html.am: Move ... * contrib/check-html.am: ... to this, and adjust comments. * lib/am/Makefile.am (dist_am_DATA): Update. * contrib/Makefile.am (EXTRA_DIST): Likewise. * tests/parallel-tests2.test: Adjust. * tests/parallel-tests-dryrun.test: Remove checks on the ".log -> .html" conversion. * tests/test-driver-custom-html.test: Remove as obsolete. * tests/test-driver-custom-no-html.test: Likewise. * tests/tap-html.test: Likewise. * tests/list-of-tests.mk: Don't list removed tests anymore.
* contrib: new, a directory for non-mainstream functionalitiesStefano Lattarini2012-01-172-0/+47
This new 'contrib' hierarchy will be a good place were to move implementation/support for obsolescent features we are not yet ready to remove completely, or were to leave experimental or third-party features to cook before their eventual inclusion in the automake core. * contrib: New directory. * contrib/README: New file. * contrib/Makefile.am: New file. (EXTRA_DIST): Distribute README.
View Lorry Controller Status