summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'micro' into maintStefano Lattarini2013-05-153-55/+69
|\ | | | | | | | | | | | | | | | | | | | | * micro: post-release: micro version bump (1.13.2a) release: stable micro release 1.13.2 vala tests: skip in a cross compiler setup HACKING: miscellaneous fixes, updates and enhancements NEWS: minor improvements to wording (about new versioning scheme) Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
| * post-release: micro version bump (1.13.2a)Stefano Lattarini2013-05-152-3/+3
| | | | | | | | | | | | * configure.ac, m4/amversion.m4: Bump version: 1.13.2 -> 1.13.2a Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
| * release: stable micro release 1.13.2v1.13.2Stefano Lattarini2013-05-152-3/+3
| | | | | | | | | | | | | | * configure.ac (AC_INIT): Bump version number to 1.13.2. * m4/amversion.m4: Likewise (auto-updated by "make bootstrap"). Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
| * vala tests: skip in a cross compiler setupStefano Lattarini2013-05-151-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "vala + pkg-config" doesn't interact well with cross-compilation: <https://mail.gnome.org/archives/vala-list/2012-September/msg00094.html> That is causing annoying failures in our testsuite when it's run in cross-compilation mode. It's not worth trying too be overly smart and work around these problems; just skip the affected tests instead. * t/ax/am-test-lib.sh (require_tool): A new requirement 'valac', telling that the test needs to compile Vala-generated C files. In particular, this causes the test to be skipped when using a cross-compiler. Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
| * HACKING: miscellaneous fixes, updates and enhancementsStefano Lattarini2013-05-151-51/+51
| | | | | | | | Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
| * NEWS: minor improvements to wording (about new versioning scheme)Stefano Lattarini2013-05-151-4/+4
| | | | | | | | Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
* | THANKS: update Akim's e-mail addressStefano Lattarini2013-05-151-1/+1
| | | | | | | | Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
* | tests: less uses of "make -e"; avoid spurious failures in 'check-cc-no-c-o'Stefano Lattarini2013-05-153-19/+35
| | | | | | | | | | | | | | | | | | | | | | That is, when the testsuite is run using a fake C compiler that doesn't grasp the '-c' and '-o' options together. * t/instdir-prog.sh: Adjust. * t/instdir-ltlib.sh: Likewise. * t/python-virtualenv.sh: Likewise. Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
* | build: be more respectful of user-specified verbosityStefano Lattarini2013-05-141-5/+6
| | | | | | | | | | | | | | * t/Makefile.in (check-cc-no-c-o, check-no-trailing-backslash-in-recipes, installcheck-testsuite, perf): Here. Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
* | check-cc-no-c-o: unify initializations in a single placeStefano Lattarini2013-05-142-4/+11
| | | | | | | | | | | | | | | | | | * t/ax/test-defs.in: That is, by setting CC and GNU_CC here, in accord with the value of the variable 'AM_TESTSUITE_SIMULATING_NO_CC_C_O'. * t/Makefile.in (check-cc-no-c-o) : No need to reset CC and GNU_CC any longer in the recursive "make check" invocation. Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
* | check-cc-no-c-o: avoid a spurious failureStefano Lattarini2013-05-143-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | * t/am-prog-cc-c-o.sh: In this test, by relying on the knowledge that we are running under the aegis of the 'check-cc-no-c-o' maintainer-specific target, knowledge given us by ... * t/Makefile.in (check-cc-no-c-o) : ... the new environment variable 'AM_TESTSUITE_SIMULATING_NO_CC_C_O', set to a value of "yes" by this rule. * t/ax/test-defs.in: Initialize the new variable to "no" by default, and add an explanatory comment. Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
* | build: fixup for building in a VPATH setupStefano Lattarini2013-05-141-0/+1
| | | | | | | | | | | | | | | | * bin/Makefile.inc (%D%/automake, %D%/aclocal): Make sure that the directory where the targets scripts are going to be built exists, before trying to create said scripts. Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
* | Use AC_DEFUN_ONCE to define AM_PROG_CC_C_ONick Bowler2013-05-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If AM_PROG_CC_C_O is expanded multiple times, and the compiler does not support -c and -o together, each expansion of the macro will prepend the compile script to CC. This can result in the compile script invoking the compile script, which at best pointless and silly. Fortunately, there does not appear to be any serious problems as the first compile invocation strips out -o options, causing subsequent invocations of the script to merely exec their arguments. Other than fixing the above, this should not normally cause any changes to the resulting configure script, except in the (hopefully rare) case where AM_PROG_CC_C_O is directly expanded (i.e., *not* using AC_REQUIRE) in the body of a macro defined with AC_DEFUN. In that case, the use of AC_DEFUN_ONCE may cause the expansion of AM_PROG_CC_C_O to appear earlier in the configure script. * m4/minuso.m4: Change the definition of AM_PROG_CC_C_O to use AC_DEFUN_ONCE, avoiding problems caused by multiple expansions. Copyright-paperwork-exempt: yes Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
* | compile: avoid AC_PROG_CC messy rewriteStefano Lattarini2013-05-115-64/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead, add an hook to AC_OUTPUT to have AM_PROG_CC_C_O invoked automatically. See also the long-winded discussion about automake bug#13378. * m4/minuso.m4 (AM_PROG_CC_C_O): Bring back the old implementation, from commit v1.13.1-55-g1ab8fb6. * m4/init.m4 (AC_PROG_CC): Remove this horrible, hacky re-write. * (AM_INIT_AUTOMAKE): Arrange for AM_PROG_CC_C_O to be called if necessary. * t/am-prog-cc-c-o.sh: Adjust to avoid spurious failure. * t/subobj.sh: Likewise. Suggested-by: Nick Bowler <nbowler@elliptictech.com> Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
* | options: tiny simplification in dealing with incompatible versionsStefano Lattarini2013-05-111-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * lib/Automake/Options.pm (_process_option_list): Here, when an incompatible version number option is detected, there's no need to call error() with the "uniq_scope => US_GLOBAL" switch. In fact, if the same incompatible version number is specified in AUTOMAKE_OPTIONS in both (say) 'Makefile.am' and 'sub/Makefile.am', we want each such erroneous usage reported separately, rather than just the first time it is encountered (as we'd expect to happen when "uniq_scope => US_GLOBAL" is used). Ideally, this change should have been folded into the similar commit 'v1.13.1d-129-gf7ef16f', but we noticed that too late. Oh well. Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
* | options: try to report as much errors as possibleStefano Lattarini2013-05-111-8/+11
| | | | | | | | | | | | | | | | | | | | For example, if two invalid options are used in AUTOMAKE_OPTIONS, don't report just the first one, but both of them. * lib/Automake/Options.pm (_process_option_list): Do so by avoiding early returns in here. Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
* | Merge branch 'branch-1.13.2' into maintStefano Lattarini2013-05-111-3/+1
|\ \ | |/ | | | | | | * branch-1.13.2: warns: don't tell AM_PROG_MKDIR_P is going to be removed
| * warns: don't tell AM_PROG_MKDIR_P is going to be removedbranch-1.13.2Stefano Lattarini2013-05-101-3/+1
| | | | | | | | | | | | | | | | | | | | | | That is no longer true. For a more extended rationale, see file 'PLANS/obsolete-removed/am-prog-mkdir-p.txt' in the maint branch (as of commit v1.13.1d-132-g90ec3fe). * automake.in (scan_autoconf_traces): So adjust the warning message here. Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
* | refactor: fix few "inverted boolean" usagesStefano Lattarini2013-05-102-15/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some subroutines, we used a return value of 0 to indicate success, and a return status of 1 to indicate failure. That was not very consistent with the perl interpretation of 0 as a false value and 1 as a true value. So we now invert the meaning of the exit statuses. * lib/Automake/Options.pm (_process_option_list): Here. (process_global_option_list, process_option_list): And by reflex, here as well. * bin/automake.in (handle_options): And here. (generate_makefile, scan_autoconf_traces): Adjust. Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
* | options: better name for an internal functionStefano Lattarini2013-05-101-3/+3
| | | | | | | | | | | | | | * lib/Automake/Options.pm (_option_must_be_from_configure): Rename ... (_option_is_from_configure): ... like this. Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
* | options: more consistency in use of return statuses to report errorsStefano Lattarini2013-05-101-2/+6
| | | | | | | | | | | | | | | | * lib/Automake/Options.pm (_option_must_be_from_configure): By giving a proper return status here. (_process_option_list): And using it here. Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
* | options: tiny simplification in dealing with erroneous optsStefano Lattarini2013-05-101-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | * lib/Automake/Options.pm (_process_option_list): Here, when an invalid option is detected, there's no need to call &error with the "uniq_scope => US_GLOBAL" switch. In fact, if the same erroneous option is specified in AUTOMAKE_OPTIONS in both (say) 'Makefile.am' and 'sub/Makefile.am', we want each such erroneous usage reported separately, rather than just the first time it is encountered (as happens when "uniq_scope => US_GLOBAL" is used). Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
* | options: consistently use return statuses to report errorsStefano Lattarini2013-05-101-3/+6
| | | | | | | | | | | | | | | | * lib/Automake/Options.pm (_process_option_list): Here. (process_option_list, process_global_option_list): Remove redundant use of 'return'. Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
* | options: re-enable some sanity checksStefano Lattarini2013-05-101-2/+2
| | | | | | | | | | | | | | | | | | | | They had been unwittingly disabled by a slightly incorrect code ordering. * lib/Automake/Options.pm (process_option_list): Here. (process_global_option_list): And here. Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
* | THANKS: update Eric Blake's e-mail addressStefano Lattarini2013-05-101-1/+1
| | | | | | | | Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
* | NEWS: typofixStefano Lattarini2013-05-101-1/+1
| | | | | | | | | | Reported-by: Eric Blake <eblake@redhat.com> Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
* | news: document new 'subdir-objects' warningStefano Lattarini2013-05-101-0/+10
| | | | | | | | | | | | | | | | | | | | * NEWS: Automake 1.14 will warn if a subdir source file is specified but the 'subdir-objects' option is not given. This is done to smooth the transition to Automake 2.0, which will unconditionally assume the behaviour now given only with the 'subdir-objects' option. Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
* | PLANS: one minor fixlet (mostly cosmetic)Stefano Lattarini2013-05-101-2/+2
| | | | | | | | Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
* | PLANS: we have already dropped support for split info files in masterStefano Lattarini2013-05-101-3/+3
| | | | | | | | Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
* | NEWS: fix a reference to Automake 1.14 where Automake 2.0 was intendedStefano Lattarini2013-05-101-1/+1
| | | | | | | | Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
* | PLANS: fix reference to non-existent 'next' branchStefano Lattarini2013-05-101-1/+1
| | | | | | | | | | | | | | * PLANS/obsolete-removed/configure.in.txt: Here. We should refer to the 'master' branch instead. Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
* | PLANS: fix botched version referenceStefano Lattarini2013-05-101-2/+2
| | | | | | | | | | | | | | | | * PLANS/rm-f-without-args.txt: Here. The probe checking that "rm -f" without arguments works will be introduced in Automake 1.14, not in Automake 1.13.2. Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
* | maintcheck: fix two references to old location of aclocal and automakeStefano Lattarini2013-05-101-2/+2
| | | | | | | | | | | | | | | | * maintainer/syntax-checks.mk (sc_perl_at_substs): Here: it should refer to 'bin/automake' and 'bin/aclocal', not 'automake' and 'alocal'. Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
* | dist: deprecated shar and tar+compress formatsStefano Lattarini2013-05-108-42/+164
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See also discussion about automake wishlist bug#13324. * lib/Automake/Options.pm: Give proper warnings in the 'obsolete' category if the 'dist-shar' or 'dist-tarZ' options are used. * lib/distdir.am: When the 'dist-tarZ' or 'dist-shar' targets are invoked, make them give a non-fatal warning. * doc/automake.texi: Report the new deprecations. * t/dist-shar.sh: New test. * t/dist-tarZ.sh: Likewise. * t/lzma.sh: While at it, rename ... * t/dist-lzma.sh: ... like this, and tweak it to keep more in sync with the new tests. * t/dist-formats.tap: Remove references to deprecated formats. * t/list-of-tests.mk: Adjust. Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
* | Merge branch 'dog-feeding' into maintStefano Lattarini2013-05-1021-670/+812
|\ \ | | | | | | | | | | | | | | | * dog-feeding: build: move automake and aclocal in 'bin' subdir build: break up monolithic Makefile.am in subdir-specific fragments
| * | build: move automake and aclocal in 'bin' subdirStefano Lattarini2013-05-0914-81/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * automake.in: Rename ... * bin/automake.in: ... like this. * aclocal.in: Rename ... * bin/aclocal.in: ... like this. * Makefile.am: Move parts that dealt with the building/distribution of aclocal and Automake .. * bin/Makefile.inc): ... in this new included fragment. Adjust as needed, and make deliberate use of the '%D%' substitution. * lib/gen-perl-protos: Move ... * bin/gen-perl-protos: ... here. * bootstrap.sh, configure.ac, maintainer/rename-tests, t/wrap/aclocal.in, t/wrap/automake.in, doc/Makefile.inc, t/ax/tap-setup.sh, .gitignore: Adjust. * maintainer/syntax-checks.mk: Likewise, and enhance a little. Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
| * | build: break up monolithic Makefile.am in subdir-specific fragmentsStefano Lattarini2013-05-099-592/+704
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'branch-1.13.2' into maintStefano Lattarini2013-05-101-3/+3
|\ \ \ | | |/ | |/| | | | | | | * branch-1.13.2: automake: typofix in comments: s/AC_CONFIG_HEADER/AC_CONFIG_HEADERS/
| * | automake: typofix in comments: s/AC_CONFIG_HEADER/AC_CONFIG_HEADERS/Stefano Lattarini2013-05-101-3/+3
| | | | | | | | | | | | Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
* | | am: prefer a shorter idiom where possibleStefano Lattarini2013-05-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That is, prefer: test -f FILE || do_action over: if test ! -f FILE; then do_action; else :; fi * lib/am/remake-hdr.am (%CONFIG_H%): Here. Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
* | | Merge branch 'branch-1.13.2' into maintStefano Lattarini2013-05-108-10/+13
|\ \ \ | |/ / | | | | | | | | | | | | | | | * branch-1.13.2: cosmetics: fix few typos, grammaros and missing whitespace fixup: remove an obsolete comment docs: we still don't have the promised better Java interface
| * | cosmetics: fix few typos, grammaros and missing whitespaceStefano Lattarini2013-05-106-4/+7
| | | | | | | | | | | | | | | | | | * lib/am/*.am: In comments in some of these files. Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
| * | fixup: remove an obsolete commentStefano Lattarini2013-05-101-2/+1
| | | | | | | | | | | | | | | | | | * lib/am/header-vars.am (am__make_running_with_option): Here. Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
| * | docs: we still don't have the promised better Java interfaceStefano Lattarini2013-05-092-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reported by Michael Zucchi: <http://lists.gnu.org/archive/html/automake/2013-05/threads.html> See also automake bug#9088. * doc/automake.texi (Java): Adjust and clarify. * THANKS: Update. Reported-by: Michael Zucchi <notzed@gmail.com> Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
* | | maint: re-run "make update-copyright" ...Stefano Lattarini2013-05-091-1/+1
| | | | | | | | | | | | | | | | | | | | | * t/lex-multiple.sh: ... which updates the copyright years of this test (they were somehow not bumped in the past). Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
* | | tests: avoid spurious failure with older flex (2.5.4)Stefano Lattarini2013-05-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That old version is unfortunately still relevant, being the one installed on NetBSD 5.1. * t/lex-multiple.sh: Use the '-o' option rather than the longer equivalent '--outfile'. The latter is not supported by older versions of flex (e.g., flex 2.5.4). Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
* | | Merge branch 'branch-1.13.2' into maintStefano Lattarini2013-05-091-1/+5
|\ \ \ | |/ / | | / | |/ |/| * branch-1.13.2: announcement: cater to more flexible NEWS format
| * announcement: cater to more flexible NEWS formatStefano Lattarini2013-05-091-1/+5
| | | | | | | | | | | | | | | | * maint.mk (announcement): Here, be prepared to handle the case in which the first section of the NEWS file is dedicated to report future backward-incompatibilities and/or other warnings. Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
* | maint branch: we are going to become Automake 1.14Stefano Lattarini2013-05-052-4/+4
| | | | | | | | | | | | | | | | * configure.ac (AC_INIT): So adjust beta version in here, from 1.13.2a to 1.13a. * m4/amversion.m4: Regenerate. Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
* | Merge branch 'branch-1.13.2' into maintStefano Lattarini2013-05-051-0/+10
|\ \ | |/ | | | | | | | | | | | | | | * branch-1.13.2: maint: version bump after beta release 1.13.1d release: beta release 1.13.1d (will become 1.13.2) NEWS: document more robust handling/recognition of make options Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
View Lorry Controller Status