[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.12b-
|
From: |
Stefano Lattarini |
|
Subject: |
[Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.12b-716-g191e6b1 |
|
Date: |
Fri, 28 Dec 2012 18:50:43 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".
http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=191e6b139c8eabc4639294c8c885a169e56f8a59
The branch, ng/master has been updated
via 191e6b139c8eabc4639294c8c885a169e56f8a59 (commit)
via fe45ffc9ac54db568c65071d9602d639cfbeadb6 (commit)
via 929c20cc15c3188dd3bf7557ab3dad62c6db2178 (commit)
via 31d006502cb4fed4c6c5977630cefdf3b619ec24 (commit)
via 4fd9dcd62759c21ba6324dd6861a49dbfae12fba (commit)
via 72f22d497983b8881cbe277297e2f47dc800f788 (commit)
via 9ebccd05291f99c446908e6485f338f4ea47ecf5 (commit)
via 3b503c42e33b53ae82e160f002289b39152347cb (commit)
via 6179686fe621bfbf542614dfe5eb7a4e6c973393 (commit)
via fb214402c043a70581f19d4856a81362a5a1a0d6 (commit)
via f4eceb86c31f0d9b1cb76aa88d57676ebb48b342 (commit)
via f3d6ca85d3fc962b77d2e0fbe06cab253394a110 (commit)
via a1f9336b9dee4dcb97dd8488f22b1bc684f956f9 (commit)
via fba280d0923da6ef0d55db11edb0944ee1261987 (commit)
via 37ce97010c0c428663a38b270d843c4a4fad52f2 (commit)
via b869415eb63efcea39162fc24a69eb51d94c3c6b (commit)
via f72c2300ef6043e81b38b6d6c3e9dbafca60253d (commit)
via c54fada1452911bfedebf3f170dc5d0fcd03cd8f (commit)
via 28fcb35dc73d363ed2a5fe4eddf26770212496c9 (commit)
via 9ca75479a7b18b2f5f9bfd78ad6168385acf42e9 (commit)
via c20ee33f6a8946abeca1f26671e03d5c1af42599 (commit)
via 93adb7b2c632120646af7863ba07750274127153 (commit)
via b89735306369694f5a88dfa9ffb54c81acf245c9 (commit)
via 2e8b7d956ad143617740e3e3db8003fc89e88f2f (commit)
via 0093d5e3eb56afd4da47cf7b54a68aae3ffddad3 (commit)
via b30799f929c134c0669dc73cf435e0b8aa53b116 (commit)
via fc8abb3385fd341f8b559a66c3a5ec40f3dcb380 (commit)
via 4e9c51959e2124abf4fd61bcfbfa825fd7640e63 (commit)
via b8c7e3f7ebf3ff8841b6bc1d224bbc87d71261ff (commit)
via 454a1acda60854294ca6953621150707c037ee9a (commit)
via 6dc13e5e952dc270b053b8ad1a80028d1810ab60 (commit)
via 43340dfe396f9186267338f787a70b9af23ca126 (commit)
via 89ea805745b63bf954d19786a723a15c667f9b8e (commit)
via f3baf34af641dafad64d4e849e7406013ac7261e (commit)
via 88945834a2272e0a33fd4237b212b3d445acc13f (commit)
via 97947ba47519b21e81f1e6ecd6438060b924c40e (commit)
from a9e5d1e09f534a7e6adef1b80f2b70c92787dd69 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 191e6b139c8eabc4639294c8c885a169e56f8a59
Merge: fe45ffc a9e5d1e
Author: Stefano Lattarini <address@hidden>
Date: Fri Dec 28 19:14:15 2012 +0100
Merge remote-tracking branch 'origin/ng/master' into ng/master
Fix-up a local branch mess-up. Luckily not serious at all.
Still, sorry for the noise.
* origin/ng/master:
[Nothing really to be merged]
commit fe45ffc9ac54db568c65071d9602d639cfbeadb6
Merge: b897353 929c20c
Author: Stefano Lattarini <address@hidden>
Date: Wed Dec 19 13:06:10 2012 +0100
Merge branch 'master' into ng/master
* master:
maint: typofixes in makefile comments
maint: remove extra verbosity from a maintainer rule
NEWS: fix grammaro
maint: version bump after beta release
release: beta release 1.12b (will become 1.13)
cosmetics: comments fixlets in our Makefile
cosmetics: consistency changes in some make recipes
tests: avoid a spurious failure on NetBSD
tests: re-enable some checks disabled by mistake ...
tests: avoid a "grep -E" portability issue
tests: avoid a spurious failure due to a Clang bug
NEWS: start preparing for the 1.13 release
tests: typofix in the shebang line of 't/py-compile-destdir.sh'
HACKING: release process: fixlets about the announcement
maint: post-release minor version bump
release: stable release 1.12.5
tests: avoid errors due to underquoted third-party macros
maintcheck: also consider contrib tests for syntax checks
cosmetics: whitespace fixlets in syntax-checks.mk
Signed-off-by: Stefano Lattarini <address@hidden>
commit b89735306369694f5a88dfa9ffb54c81acf245c9
Author: Stefano Lattarini <address@hidden>
Date: Fri Dec 14 17:48:13 2012 +0100
maint: remove reference to mkinstalldirs from maintainer rules
* maint.mk (files_without_copyright): Here, in the list of files
exempted from the need of having a canonical FSF copyright notice.
That is because that file has already been removed in Automake-NG.
Signed-off-by: Stefano Lattarini <address@hidden>
commit 2e8b7d956ad143617740e3e3db8003fc89e88f2f
Merge: b30799f 0093d5e
Author: Stefano Lattarini <address@hidden>
Date: Fri Dec 14 17:41:48 2012 +0100
Merge branch 'maint' into ng/master
* origin/maint:
maint: prefer $(MKDIR_P) over $(mkinstalldirs) in maintainer rules
commit b30799f929c134c0669dc73cf435e0b8aa53b116
Author: Stefano Lattarini <address@hidden>
Date: Fri Dec 14 17:04:35 2012 +0100
maintcheck: guard against 'mkinstalldir' uses also in maint.mk
* syntax-checks.mk (sc_mkinstalldirs): Here, by adding
'$(srcdir)/maint.mk' to the list in '$files'.
Signed-off-by: Stefano Lattarini <address@hidden>
commit fc8abb3385fd341f8b559a66c3a5ec40f3dcb380
Author: Stefano Lattarini <address@hidden>
Date: Fri Dec 14 16:57:29 2012 +0100
fixup: avoid a spurious failure in self tests
* t/self-check-dir.tap: Grep 'maint.mk', not 'Makefile', for
the "compare-autodiffs" string.
Signed-off-by: Stefano Lattarini <address@hidden>
commit 4e9c51959e2124abf4fd61bcfbfa825fd7640e63
Merge: 8894583 b8c7e3f
Author: Stefano Lattarini <address@hidden>
Date: Fri Dec 14 15:49:40 2012 +0100
Merge branch 'master' into ng/master
Noe that, with this merge, we just discarde the changes done to
the maintainer rules in Makefile.am on the 'ng/master' branch;
now that the 'maint.mk' file from the 'master' branch assumes
GNU make as well, those changes have been either rendered obsolete,
or backported (or planned to be) in the master version of
'maint.mk'.
* master:
sync: update files from upstream with "make fetch"
gitignore: align with recent changes
fixup: add dummy rule for ChangeLog generation in Makefile.am
maint: no longer use AM_MAKEFLAGS in maintainer rules
maint: use more GNU make features in maintainer rules
maint: move maintainer make rules in maint.mk
Signed-off-by: Stefano Lattarini <address@hidden>
commit 88945834a2272e0a33fd4237b212b3d445acc13f
Merge: b961cbe 2674291
Author: Stefano Lattarini <address@hidden>
Date: Fri Dec 14 11:56:06 2012 +0100
Merge branch 'master' into ng/master
* master:
fixup: source 'test-init.sh', not './defs', in a test
docs: fixlet about xz compression levels and command line options
maint: more files excluded in 'update-copyright'
maint: adapt 'update-copyright' recipe to the new $(FETCHFILES) format
HACKING: update instructions to update the manuals at www.gnu.org
maint: add an explicative comment in Makefile
maint: factor out the name of the dir where web manuals are generated
maint: rename rules to build/upload web manuals
cosmetic: minor variable and rules reordering in Makefile.am
docs: build the web manuals for CVS in the builddir, not in the srcdir
release: automate uploading of web manuals in CVS
docs: AM_CFLAGS: remove reference to non-existing "more detailed" desc
tests: avoid two spurious failures on FreeBSD
tests: improve 'pkg-config' requirement
Signed-off-by: Stefano Lattarini <address@hidden>
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 2 +-
GNUmakefile | 1 +
HACKING | 24 ++-
Makefile.am | 494 +++--------------------------------------------
NEWS | 139 ++++++--------
configure.ac | 2 +-
lib/gnupload | 17 +-
m4/amversion.m4 | 6 +-
maint.mk | 464 ++++++++++++++++++++++++++++++++++++++++++++
syntax-checks.mk | 5 +-
t/ltcond2.sh | 14 +-
t/pkg-config-macros.sh | 2 +-
t/py-compile-destdir.sh | 2 +-
t/self-check-dir.tap | 2 +-
t/subpkg-macrodir.sh | 18 +-
t/tags-pr12372.sh | 5 +-
16 files changed, 596 insertions(+), 601 deletions(-)
create mode 100644 maint.mk
diff --git a/.gitignore b/.gitignore
index e387036..e026b3a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,7 +36,7 @@
/doc/amhello/depcomp
/doc/amhello/install-sh
/doc/amhello/missing
-/doc/web-manuals
+/doc/web-manual
/lib/Automake/Config.pm
/test-suite.log
/t/wrap/aclocal-1.*
diff --git a/GNUmakefile b/GNUmakefile
index 83a6a47..9f2b136 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -25,6 +25,7 @@ ifeq ($(wildcard Makefile),)
$(error Fatal Error)
endif
include ./Makefile
+include $(srcdir)/maint.mk
include $(srcdir)/syntax-checks.mk
else # ! bootstrap in $(MAKECMDGOALS)
diff --git a/HACKING b/HACKING
index cf61c44..ec5904a 100644
--- a/HACKING
+++ b/HACKING
@@ -275,23 +275,27 @@
- Check for link errors, fix them, recheck until convergence:
<http://validator.w3.org/checklink>
+* Create an announcement message with "make announcement". Edit the
+ generated 'announcement' file appropriately, in particularly filling
+ in by hand any "TODO" left in there.
+
* Update version number in configure.ac to next alpha number.
Re-run ./bootstrap.sh and commit.
* Don't forget to "git push" your changes so they appear in the public
git tree.
-* Create an announcement message with "make announcement". Edit the
- generated 'announcement' file appropriately, in particularly filling
- in by hand any "TODO" left in there.
-
-* Send the announcement at least to <address@hidden> and
- <address@hidden>. If the release is a stable one, the announcement
- must also go to <address@hidden>; if it is an alpha or beta release,
- announcement should be sent also to <address@hidden>, to
- maximize the possibility of early testing on exotic or proprietary
- systems. Finally, copy the announcement into the NEWS feed at
+* Send the announcement generated in the earlier steps at least to
+ <address@hidden> and <address@hidden>. If the release
+ is a stable one, the announcement must also go to <address@hidden>;
+ if it is an alpha or beta release, announcement should be sent also
+ to <address@hidden>, to maximize the possibility of early
+ testing on exotic or proprietary systems. Finally, copy an abridged
+ version of the announcement into the NEWS feed at:
<https://savannah.gnu.org/projects/automake>.
+ Be sure to link a version to the complete announcement (from
+ the version you sent to the automake list, as get archived on
+ <http://lists.gnu.org/archive/html/automake/>).
-----
diff --git a/Makefile.am b/Makefile.am
index 628de93..0373386 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -60,18 +60,19 @@ EXTRA_DIST += \
$(AUTOMAKESOURCES) \
bootstrap.sh \
GNUmakefile \
+ maint.mk \
syntax-checks.mk \
HACKING \
NG-NEWS \
$(gitlog_to_changelog_fixes)
-## Make versioned links. We only run the transform on the root name;
-## then we make a versioned link with the transformed base name. This
-## seemed like the most reasonable approach.
+# Make versioned links. We only run the transform on the root name;
+# then we make a versioned link with the transformed base name. This
+# seemed like the most reasonable approach.
install-exec-hook:
@$(POST_INSTALL)
@for p in $(bin_SCRIPTS); do \
- f="`echo $$p|sed '$(transform)'`"; \
+ f=`echo $$p | sed '$(transform)'`; \
fv="$$f-$(APIVERSION)"; \
rm -f "$(DESTDIR)$(bindir)/$$fv"; \
echo " $(LN) '$(DESTDIR)$(bindir)/$$f' '$(DESTDIR)$(bindir)/$$fv'"; \
@@ -80,13 +81,13 @@ install-exec-hook:
uninstall-hook:
@for p in $(bin_SCRIPTS); do \
- f="`echo $$p|sed '$(transform)'`"; \
+ f=`echo $$p | sed '$(transform)'`; \
fv="$$f-$(APIVERSION)"; \
rm -f "$(DESTDIR)$(bindir)/$$fv"; \
done
-## These files depend on Makefile so they are rebuilt if $(VERSION),
-## $(datadir) or other do_subst'ituted variables change.
+# These files depend on Makefile so they are rebuilt if $(VERSION),
+# $(datadir) or other do_subst'ituted variables change.
automake aclocal: %: %.in Makefile
$(AM_V_at)rm -f $@ address@hidden
$(AM_V_GEN)$(do_subst)
@@ -95,9 +96,9 @@ automake aclocal: %: %.in Makefile
## comments, and that is perfectly legit.
$(AM_V_at)chmod a+x,a-w address@hidden && mv -f address@hidden $@
-## The master location for INSTALL is lib/INSTALL.
-## This is where "make fetch" will install new versions.
-## Make sure we also update this copy.
+# The master location for INSTALL is lib/INSTALL.
+# This is where "make fetch" will install new versions.
+# Make sure we also update this copy.
INSTALL: lib/INSTALL
$(AM_V_GEN)cp $(srcdir)/lib/INSTALL $@
@@ -106,6 +107,11 @@ INSTALL: lib/INSTALL
maintainer-clean-local:
rm -rf .autom4te.cache
+# So that automake won't complain about the missing ChangeLog.
+# The real rule for ChangeLog generation is now in maint.mk (as
+# it is maintainer-specific).
+ChangeLog:
+
## -------------------------------------------------------------------- ##
## Auxiliary scripts and files for use with "automake --add-missing". ##
@@ -116,9 +122,9 @@ dist_pkgvdata_DATA = \
lib/INSTALL \
lib/texinfo.tex
-## These must all be executable when installed. However, if we use
-## _SCRIPTS, then the program transform will be applied, which is not
-## what we want. So we make them executable by hand.
+# These must all be executable when installed. However, if we use
+# _SCRIPTS, then the program transform will be applied, which is not
+# what we want. So we make them executable by hand.
dist_script_DATA = \
lib/config.guess \
lib/config.sub \
@@ -392,9 +398,9 @@ AM_TESTS_ENVIRONMENT += \
# Automatically-computed dependencies for tests.
include $(srcdir)/testsuite-autodeps.am
-## The dependencies declared here are not truly complete, but such
-## completeness would cause more issues than it would solve. See
-## automake bug#11347.
+# The dependencies declared here are not truly complete, but such
+# completeness would cause more issues than it would solve. See
+# automake bug#11347.
$(srcdir)/testsuite-autodeps.am: $(srcdir)/gen-testsuite-part
$(AM_V_at)rm -f $(@F)-t $@
$(AM_V_GEN)$(PERL) $< --srcdir $(srcdir) > $(@F)-t
@@ -431,7 +437,8 @@ EXTRA_DIST += t/ax/test-defs.in
CLEANFILES += t/ax/test-defs.sh
nodist_noinst_DATA = t/ax/test-defs.sh
-noinst_SCRIPTS = # Will be updated soon.
+## Will be updated soon.
+noinst_SCRIPTS =
t/ax/shell-no-trail-bslash: t/ax/shell-no-trail-bslash.in Makefile
$(AM_V_at)rm -f $@ address@hidden
@@ -642,456 +649,3 @@ EXTRA_DIST += \
EXTRA_DIST += \
$(addprefix old/ChangeLog., 96 98 00 01 02 03 04 09 11) \
old/ChangeLog-tests old/TODO
-
-
-##########################################################################
-
-## Everything past here is useful to the maintainer, but probably not
-## to anybody else.
-
-##########################################################################
-
-
-## --------------------------------------------------------- ##
-## Automatic generation of the ChangeLog from git history. ##
-## --------------------------------------------------------- ##
-
-gitlog_to_changelog_command = $(PERL) $(srcdir)/lib/gitlog-to-changelog
-gitlog_to_changelog_fixes = $(srcdir)/.git-log-fix
-gitlog_to_changelog_options = --amend=$(gitlog_to_changelog_fixes) \
- --since='2011-12-28 00:00:00' \
- --no-cluster --format '%s%n%n%b'
-
-EXTRA_DIST += lib/gitlog-to-changelog
-EXTRA_DIST += $(gitlog_to_changelog_fixes)
-
-# When executed from a git checkout, generate the ChangeLog from the git
-# history. When executed from an extracted distribution tarball, just
-# copy the distributed ChangeLog in the build directory (and if this
-# fails, or if no distributed ChangeLog file is present, complain and
-# give an error).
-.PHONY: ChangeLog
-ChangeLog:
- $(AM_V_GEN)set -e; set -u; \
-## The ChangeLog should be regenerated unconditionally when working from
-## checked-out sources; otherwise, if we're working from a distribution
-## tarball, we expect the ChangeLog to be distributed, so check that it
-## is indeed present in the source directory.
- if test -d $(srcdir)/.git; then \
- rm -f address@hidden \
- && $(gitlog_to_changelog_command) \
- $(gitlog_to_changelog_options) >address@hidden \
- && chmod a-w address@hidden \
- && mv -f address@hidden $@ \
- || exit 1; \
- elif test ! -f $(srcdir)/$@; then \
- echo "Source tree is not a git checkout, and no pre-existent" \
- "$@ file has been found there" >&2; \
- exit 1; \
- fi
-
-
-## --------------------------- ##
-## Perl coverage statistics. ##
-## --------------------------- ##
-
-PERL_COVERAGE_DB = $(abs_top_builddir)/cover_db
-PERL_COVERAGE_FLAGS =
-MDevel::Cover=-db,$(PERL_COVERAGE_DB),-silent,on,-summary,off
-PERL_COVER = cover
-
-check-coverage-run recheck-coverage-run: all
- $(MKDIR_P) $(PERL_COVERAGE_DB)
- PERL5OPT="$$PERL5OPT $(PERL_COVERAGE_FLAGS)"; export PERL5OPT; \
- $(MAKE) `echo $@ | sed 's/-coverage-run//'`
-
-check-coverage-report:
- @if test ! -d "$(PERL_COVERAGE_DB)"; then \
- echo "No coverage database found in '$(PERL_COVERAGE_DB)'." >&2; \
- echo "Please run \"make check-coverage\" first" >&2; \
- exit 1; \
- fi
- $(PERL_COVER) $(PERL_COVER_FLAGS) "$(PERL_COVERAGE_DB)"
-
-# We don't use direct dependencies here because we'd like to be able
-# to invoke the report even after interrupted check-coverage.
-check-coverage: check-coverage-run
- $(MAKE) check-coverage-report
-recheck-coverage: recheck-coverage-run
- $(MAKE) check-coverage-report
-
-clean-coverage:
- rm -rf "$(PERL_COVERAGE_DB)"
-clean-local: clean-coverage
-
-.PHONY: check-coverage recheck-coverage check-coverage-run \
- recheck-coverage-run check-coverage-report clean-coverage
-
-
-## ---------------------------------------------------- ##
-## Tagging and/or uploading stable and beta releases. ##
-## ---------------------------------------------------- ##
-
-GIT = git
-
-EXTRA_DIST += lib/gnupload
-
-base_version_rx = ^[1-9][0-9]*\.[0-9][0-9]*
-stable_major_version_rx = $(base_version_rx)$$
-stable_minor_version_rx = $(base_version_rx)\.[0-9][0-9]*$$
-beta_version_rx = $(base_version_rx)(\.[0-9][0-9]*)?[bdfhjlnprtvxz]$$
-match_version = echo "$(VERSION)" | $(EGREP) >/dev/null
-
-## Check that we don't have uncommitted or unstaged changes.
-## TODO: Maybe the git suite already offers a shortcut to verify if the
-## TODO: working directory is "clean" or not? If yes, use that instead
-## TODO: of duplicating the logic here.
-git_must_have_clean_workdir = \
- $(GIT) rev-parse --verify HEAD >/dev/null \
- && $(GIT) update-index -q --refresh \
- && $(GIT) diff-files --quiet \
- && $(GIT) diff-index --quiet --cached HEAD \
- || fatal "you have uncommitted or unstaged changes"
-
-determine_release_type = \
- if $(match_version) '$(stable_major_version_rx)'; then \
- release_type='Major release'; \
- announcement_type='major release'; \
- dest=ftp; \
- elif $(match_version) '$(stable_minor_version_rx)'; then \
- release_type='Minor release'; \
- announcement_type='maintenance release'; \
- dest=ftp; \
- elif $(match_version) '$(beta_version_rx)'; then \
- release_type='Beta release'; \
- announcement_type='test release'; \
- dest=alpha; \
- else \
- fatal "invalid version '$(VERSION)' for a release"; \
- fi
-
-# Help the debugging of $(determine_release_type) and related code.
-print-release-type:
- @set -e -u \
- && fatal () { echo "$@: $$*"; exit 0; } \
- && $(determine_release_type) \
- && echo "$$release_type $(VERSION);" \
- "it will be announced as a $$announcement_type"
-
-git-tag-release: maintainer-check
- @set -e; set -u; \
- fatal () { echo "$@: $$*; not tagging" >&2; exit 1; }; \
- case '$(AM_TAG_DRYRUN)' in \
- ""|[nN]|[nN]o|NO) run="";; \
- *) run="echo Running:";; \
- esac; \
- $(determine_release_type); \
- $(git_must_have_clean_workdir); \
-## If all was successful, tag the release in the local repository.
- $$run $(GIT) tag -s "v$(VERSION)" -m "$$release_type $(VERSION)"
-
-git-upload-release:
- @set -e; set -u; \
- fatal () { echo "$@: $$*; not releasing" >&2; exit 1; }; \
- $(determine_release_type); \
- dest=$$dest.gnu.org:automake; \
- $(git_must_have_clean_workdir); \
-## Check that we are releasing from a valid tag.
- tag=`$(GIT) describe` \
- && case $$tag in "v$(VERSION)") true;; *) false;; esac \
- || fatal "you can only create a release from a tagged version"; \
-## Build and upload the distribution tarball(s).
- $(MAKE) dist || exit 1; \
- echo Will upload to $$dest: $(DIST_ARCHIVES); \
- $(srcdir)/lib/gnupload $(GNUPLOADFLAGS) --to $$dest $(DIST_ARCHIVES)
-
-.PHONY: print-release-type git-upload-release git-tag-release
-
-
-## ------------------------------------------------------------------ ##
-## Explore differences of autogenerated files in different commits. ##
-## ------------------------------------------------------------------ ##
-
-## Visually comparing differences between the Makefile.in files in
-## automake's own build system as generated in two different branches
-## might help to catch bugs and blunders. This has already happened a
-## few times in the past, when we used to version-control Makefile.in.
-autodiffs:
- @set -u; \
- NEW_COMMIT=$${NEW_COMMIT-"HEAD"}; \
- OLD_COMMIT=$${OLD_COMMIT-"HEAD~1"}; \
- am_gitdir='$(abs_top_srcdir)/.git'; \
- get_autofiles_from_rev () \
- { \
- rev=$$1 dir=$$2 \
- && echo "$@: will get files from revision $$rev" \
- && $(GIT) clone -q --depth 1 "$$am_gitdir" tmp \
- && cd tmp \
- && $(GIT) checkout -q "$$rev" \
- && echo "$@: bootstrapping $$rev" \
- && $(SHELL) ./bootstrap.sh \
- && echo "$@: copying files from $$rev" \
- && makefile_ins=`find . -name Makefile.in` \
- && (tar cf - configure aclocal.m4 $$makefile_ins) | \
- (cd .. && cd "$$dir" && tar xf -) \
- && cd .. \
- && rm -rf tmp; \
- }; \
- address@hidden \
-## Before proceeding, ensure the specified revisions truly exist.
- && $(GIT) --git-dir="$$am_gitdir" describe $$OLD_COMMIT >/dev/null \
- && $(GIT) --git-dir="$$am_gitdir" describe $$NEW_COMMIT >/dev/null \
- && rm -rf $$outdir \
- && mkdir $$outdir \
- && cd $$outdir \
- && mkdir new old \
- && get_autofiles_from_rev $$OLD_COMMIT old \
- && get_autofiles_from_rev $$NEW_COMMIT new \
- && exit 0
-
-## With lots of eye candy; we like our developers pampered and spoiled :-)
-compare-autodiffs: autodiffs
- @set -u; \
- : $${COLORDIFF=colordiff} $${DIFF=diff}; \
- dir=autodiffs.dir; \
- if test ! -d "$$dir"; then \
- echo "$@: $$dir: Not a directory" >&2; \
- exit 1; \
- fi; \
- mydiff=false mypager=false; \
- if test -t 1; then \
- if ($$COLORDIFF -r . .) </dev/null >/dev/null 2>&1; then \
- mydiff=$$COLORDIFF; \
- mypager="less -R"; \
- else \
- mypager=less; \
- fi; \
- else \
- mypager=cat; \
- fi; \
- if test "$$mydiff" = false; then \
- if ($$DIFF -r -u . .); then \
- mydiff=$$DIFF; \
- else \
- echo "$@: no good-enough diff program specified" >&2; \
- exit 1; \
- fi; \
- fi; \
- st=0; $$mydiff -r -u $$dir/old $$dir/new | $$mypager || st=$$?; \
- rm -rf $$dir; \
- exit $$st
-.PHONY: autodiffs compare-autodiffs
-
-## ---------------------------------------------- ##
-## Help writing the announcement for a release. ##
-## ---------------------------------------------- ##
-
-PACKAGE_MAILINGLIST = address@hidden
-
-announcement: NEWS
- $(AM_V_GEN): \
- && rm -f $@ address@hidden \
- && fatal () { echo "$@: $$*" >&2; exit 1; } \
- && $(determine_release_type) \
- && ftp_base="ftp://$$dest.gnu.org/gnu/$(PACKAGE)" \
- && X () { printf '%s\n' "$$*" >> address@hidden; } \
- && X "We are pleased to announce the $(PACKAGE_NAME) $(VERSION)" \
- "$$announcement_type." \
- && X \
- && X "**TODO** Brief description of the release here." \
- && X \
- && X "**TODO** This description can span multiple paragraphs." \
- && X \
- && X "See below for the detailed list of changes since the" \
- && X "previous version, as summarized by the NEWS file." \
- && X \
- && X "Download here:" \
- && X \
- && X " $$ftp_base/$(PACKAGE)-$(VERSION).tar.gz" \
- && X " $$ftp_base/$(PACKAGE)-$(VERSION).tar.xz" \
- && X \
- && X "Please report bugs and problems to" \
- "<$(PACKAGE_BUGREPORT)>," \
- && X "and send general comments and feedback to" \
- "<$(PACKAGE_MAILINGLIST)>." \
- && X \
- && X "Thanks to everyone who has reported problems, contributed" \
- && X "patches, and helped testing Automake!" \
- && X \
- && X "-*-*-*-" \
- && X \
- && sed -n -e '/^~~~/q' -e p $(srcdir)/NEWS >> address@hidden \
- && mv -f address@hidden $@
-.PHONY: announcement
-CLEANFILES += announcement
-
-## --------------------------------------------------------------------- ##
-## Synchronize third-party files that are committed in our repository. ##
-## --------------------------------------------------------------------- ##
-
-# Program to use to fetch files.
-WGET = wget
-
-# Some repositories we sync files from.
-SV_CVS = 'http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~/'
-SV_GIT_CF =
'http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;hb=HEAD;f='
-SV_GIT_AC =
'http://git.savannah.gnu.org/gitweb/?p=autoconf.git;a=blob_plain;hb=HEAD;f='
-SV_GIT_GL =
'http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=blob_plain;hb=HEAD;f='
-
-# Files that we fetch and which we compare against.
-# Note that the 'lib/COPYING' file must still be synced by hand.
-FETCHFILES = \
- $(SV_GIT_CF)config.guess \
- $(SV_GIT_CF)config.sub \
- $(SV_CVS)texinfo/texinfo/doc/texinfo.tex \
- $(SV_CVS)texinfo/texinfo/util/gendocs.sh \
- $(SV_CVS)texinfo/texinfo/util/gendocs_template \
- $(SV_GIT_GL)build-aux/gitlog-to-changelog \
- $(SV_GIT_GL)build-aux/gnupload \
- $(SV_GIT_GL)build-aux/update-copyright \
- $(SV_GIT_GL)doc/INSTALL
-
-# Fetch the latest versions of few scripts and files we care about.
-fetch:
- $(AM_V_at)rm -rf Fetchdir
- $(AM_V_at)mkdir Fetchdir
- $(AM_V_GEN)set -e; \
- if $(AM_V_P); then wget_opts=; else wget_opts=-nv; fi; \
- for url in $(FETCHFILES); do \
- file=`printf '%s\n' "$$url" | sed 's|^.*/||; s|^.*=||'`; \
-## A retrieval failure usually means a serious problem. Just bail out.
- $(WGET) $$wget_opts "$$url" -O Fetchdir/$$file || exit 1; \
- if cmp Fetchdir/$$file $(srcdir)/lib/$$file >/dev/null; then \
- : Nothing to do; \
- else \
- echo "$@: updating file $$file"; \
-## Ditto for a copying failure.
- cp Fetchdir/$$file $(srcdir)/lib/$$file || exit 1; \
- fi; \
- done
- $(AM_V_at)rm -rf Fetchdir
-.PHONY: fetch
-
-## ---------------------------------------------------------------------- ##
-## Generate and upload manuals in several formats, for the GNU website. ##
-## ---------------------------------------------------------------------- ##
-
-web_manual_dir = doc/web-manual
-
-RSYNC = rsync
-CVS = cvs
-CVSU = cvsu
-CVS_USER = $${USER}
-WEBCVS_ROOT = cvs.savannah.gnu.org:/web
-
-web-manual:
- $(AM_V_at)rm -rf $(web_manual_dir)
- $(AM_V_GEN)address@hidden \
- && rm -rf $$tmp \
- && mkdir $$tmp \
- && $(am__cd) $$tmp \
- && GENDOCS_TEMPLATE_DIR='$(abs_srcdir)/lib' \
- && export GENDOCS_TEMPLATE_DIR \
-## Needed to pacify extra checks from gendocs.sh.
- && $(LN_S) '$(abs_srcdir)/doc/$(PACKAGE).texi' . \
-## Try to respect silent rules.
- && if $(AM_V_P); then :; else exec >/dev/null 2>&1; fi \
-## Finally generate the manual in several formats.
- && $(SHELL) '$(abs_srcdir)/lib/gendocs.sh' \
- -I '$(abs_srcdir)/doc' --email $(PACKAGE_BUGREPORT) \
- $(PACKAGE) '$(PACKAGE_NAME)'
- $(AM_V_at)address@hidden \
- && mkdir $(web_manual_dir) \
- && mv -f $$tmp/manual/* $(web_manual_dir) \
- && rm -rf $$tmp \
- && { ! $(AM_V_P) || ls -l $(web_manual_dir); }
-.PHONY: web-manual
-
-web-manual-update:
- $(AM_V_at)fatal () { echo "$@: $$*" >&2; exit 1; }; \
- $(determine_release_type); \
- case $$release_type in \
- [Mm]ajor\ release|[Mm]inor\ release);; \
- *) echo "Cannot upload manuals from a \"$$release_type\"" >&2; \
- exit 1;; \
- esac
- $(AM_V_at)test -f $(web_manual_dir)/$(PACKAGE).html || { \
- echo 'You have to run "$(MAKE) web-manuals" before' \
- 'invoking "$(MAKE) $@"' >&2; \
- exit 1; \
- }
- $(AM_V_GEN): \
- && CVS_RSH=ssh && export CVS_RSH=ssh \
- && address@hidden \
- && rm -rf $$tmp \
- && mkdir $$tmp \
- && $(am__cd) $$tmp \
- && $(CVS) -z3 -d :ext:$(CVS_USER)@$(WEBCVS_ROOT)/$(PACKAGE) \
- co $(PACKAGE) \
- && cd .. \
-## According to the rsync manpage, "a trailing slash on the source [...]
-## avoids creating an additional directory level at the destination".
-## So the trailing '/' after '$(web_manual_dir)' below is intended.
- && $(RSYNC) -avP $(web_manual_dir)/ $$tmp/$(PACKAGE)/manual \
- && ( \
- cd $$tmp/$(PACKAGE)/manual \
- && new_files=`$(CVSU) --types='?'` \
- && new_files=`echo "$$new_files" | sed s/^..//` \
- && { test -z "$$new_files" || $(CVS) add -ko $$new_files; } \
- && $(CVS) ci -m $(VERSION) \
- ) \
- && rm -rf $$tmp
-.PHONY: web-manual-update
-
-clean-web-manual:
- $(AM_V_at)rm -rf $(web_manual_dir)
-.PHONY: clean-web-manual
-clean-local: clean-web-manual
-
-EXTRA_DIST += lib/gendocs.sh lib/gendocs_template
-
-## ------------------------------------------------ ##
-## Update copyright years of all committed files. ##
-## ------------------------------------------------ ##
-
-EXTRA_DIST += lib/update-copyright
-
-update_copyright_env = \
- UPDATE_COPYRIGHT_FORCE=1 \
- UPDATE_COPYRIGHT_USE_INTERVALS=2
-
-# In addition to the several README files, these as well are
-# not expected to have a copyright notice.
-files_without_copyright = \
- .autom4te.cfg \
- .git-log-fix \
- .gitattributes \
- .gitignore \
- INSTALL \
- COPYING \
- AUTHORS \
- THANKS \
- lib/INSTALL \
- lib/COPYING
-
-# This script is in the public domain.
-files_without_copyright += lib/mkinstalldirs
-
-# This script has an MIT-style license
-files_without_copyright += lib/install-sh
-
-.PHONY: update-copyright
-update-copyright:
- $(AM_V_GEN)set -e; \
- current_year=`date +%Y` && test -n "$$current_year" \
- || { echo "$@: cannot get current year" >&2; exit 1; }; \
- sed -i "/^RELEASE_YEAR=/s/=.*$$/=$$current_year/" \
- bootstrap.sh configure.ac; \
- excluded_re=`( \
- for url in $(FETCHFILES); do echo "$$url"; done \
- | sed -e 's!^.*/!!' -e 's!^.*=!!' -e 's!^!lib/!' \
- && for f in $(files_without_copyright); do echo $$f; done \
- ) | sed -e '$$!s,$$,|,' | tr -d '\012\015'`; \
- $(GIT) ls-files \
- | grep -Ev '(^|/)README$$' \
- | grep -Ev "^($$excluded_re)$$" \
- | $(update_copyright_env) xargs $(srcdir)/lib/$@
diff --git a/NEWS b/NEWS
index 982233f..e23396e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,23 +1,61 @@
New in 1.13:
+* WARNING: Future backward-incompatibilities!
+
+ - Automake 1.14 will likely require Autoconf 2.70 or later (which is
+ still unreleased at the moment of writing, but is planned to be
+ released before Automake 1.14 is).
+
+ - Automake 1.14 will likely drop support for the long-deprecated
+ 'configure.in' name for the Autoconf input file. You are advised
+ to use the recommended name 'configure.ac' instead.
+
+ - The long-obsolete (since automake 1.10) AM_PROG_MKDIR m4 macro will
+ be removed in Automake 1.14. The $(mkdir_p) make variable and the
+ @mkdir_p@ substitution will still remain available (as aliases of
+ $(MKDIR_P)) for the moment, for better backward compatibility; but
+ you are advised to stop using ASAP.
+
+ - The ACLOCAL_AMFLAGS special make variable will be fully deprecated
+ in Automake 1.14 (where it will raise warnings in the "obsolete"
+ category). You are advised to start relying on the new Automake
+ support for AC_CONFIG_MACRO_DIRS instead (which is introduced with
+ this release; see below for more information).
+
+ - Support for IRIX and the SGI C/C++ compilers will be removed in
+ Automake 1.14: they have seen their last release in 2006, and SGI
+ is expected to retire support from them in December 2013; see
+ <http://www.sgi.com/services/support/irix_mips_support.html> for
+ more information.
+
+ - Support for the long-deprecated INCLUDES variable will be removed
+ altogether in Automake 1.14. The AM_CPPFLAGS variable should be
+ used instead.
+
+ - Automake-provided scripts and makefile recipes might (finally!)
+ start assuming a POSIX shell in Automake 1.14.
+
+ - Starting from Automake 1.14, third-party m4 files located in the
+ system-wide aclocal directory, as well as in any directory listed
+ in the ACLOCAL_PATH environment variable, will take precedence
+ over "built-in" Automake macros. For example (assuming Automake
+ is installed in the /usr/local hierarchy), a definition of the
+ AM_PROG_VALAC macro found in '/usr/local/share/aclocal/my-vala.m4'
+ should take precedence over the same-named automake-provided macro
+ (defined in '/usr/local/share/aclocal-1.14/vala.m4').
+
* Version requirements:
- - Autoconf 2.65 or greater is required.
+ - Autoconf 2.65 or greater is now required.
- The rules to build PDF and DVI output from Texinfo input now
- requires Texinfo 4.9 or later.
+ require Texinfo 4.9 or later.
+
+* Obsolete features:
- Support for the "Cygnus-style" trees (once enabled by the 'cygnus'
option) has been removed. See discussion about automake bug#11034
- for more background.
-
- - The automake-provided '@mkdir_p@' configure substitution and
- AM_PROG_MKDIR m4 macro have been removed. They had been obsolete
- since automake 1.10, and actively deprecated since Automake 1.12.1.
- However, to maintain a degree of backward-compatibility, the make
- variable '$(mkdir_p)' is still defined (now simple as an alias to
- '$(MKDIR_P)'). It will probably be removed in future major versions
- of Automake (probably 1.14).
+ for more background: <debbugs.gnu.org/11034>.
- The deprecated aclocal option '--acdir' has been removed. You
should use the options '--automake-acdir' and '--system-acdir'
@@ -39,8 +77,6 @@ New in 1.13:
- All the "old alias" macros in 'm4/obsolete.m4' have been removed.
-* Obsolescent features:
-
- Use of the long-deprecated two- and three-arguments invocation forms
of the AM_INIT_AUTOMAKE is no longer documented. It's still supported
though (albeit with a warning in the 'obsolete' category), to cater
@@ -100,6 +136,9 @@ New in 1.13:
* Texinfo Support:
+ - The rules to build PDF and DVI files from Texinfo input now require
+ Texinfo 4.9 or later.
+
- The rules to build PDF and DVI files from Texinfo input now use the
'--build-dir' option, to keep the auxiliary files used by texi2dvi
and texi2pdf around without cluttering the build directory, and to
@@ -110,8 +149,8 @@ New in 1.13:
- The 'missing' script no longer tries to update the timestamp of
out-of-date files that require a maintainer-specific tool to be
remade, in case the user lacks such a tool (or has a too-old version
- of it). It just give a useful warning, and in some cases also a tip
- about how to obtain such a tool.
+ of it). It just gives a useful warning, and in some cases also a
+ tip about how to obtain such a tool.
- The missing script has thus become useless as a (poor) way to work
around the sketched-timestamps issues that can happen for projects
@@ -139,10 +178,9 @@ New in 1.13:
* Improvements to aclocal and related rebuilds rules:
- Autoconf-provided macros AC_CONFIG_MACRO_DIR and AC_CONFIG_MACRO_DIRS
- (the latter of which will only be present since Autoconf 2.70) are
- now traced by aclocal, and can be used to declare the local m4 include
- directories. Formerly, one had to specify it with an explicit '-I'
- option to the 'aclocal' invocation.
+ are now traced by aclocal, and can be used to declare the local m4
+ include directories. Formerly, one had to specify it with an explicit
+ '-I' option to the 'aclocal' invocation.
- The special make variable ACLOCAL_AMFLAGS is deprecated; future
Automake versions will warn about its use, and later version will
@@ -165,69 +203,6 @@ New in 1.13:
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-New in 1.12.6:
-
-* WARNING: Future backward-incompatibilities!
-
- - Future versions of Automake will likely drop support for the
- long-deprecated 'configure.in' name for the Autoconf input file.
- You are advised to use the recommended name 'configure.ac' instead.
-
- - Support for the "Cygnus-style" trees (as enabled by the 'cygnus'
- option) will be removed in the next major Automake release (1.13).
-
- - The long-obsolete (since automake 1.10) AM_PROG_MKDIR m4 macro will
- be removed in Automake 1.14. The $(mkdir_p) make variable and the
- @mkdir_p@ substitution will still remain available (as aliases of
- $(MKDIR_P)) for the moment, for better backward compatibility.
-
- - Autoconf 2.65 or later will be required by the next major Automake
- version (1.13). Until now, Automake has required Autoconf version
- 2.62 or later.
-
- - Starting from the next major Automake version (1.13), the rules
- to build pdf, ps and dvi output from Texinfo input will use the
- '--build-dir' option by default. Since such an option was only
- introduced in Texinfo 4.9, this means that Makefiles generated by
- future Automake versions will require at least that version of
- Texinfo.
-
- - Starting from the next major Automake version (1.13), the parallel
- testsuite harness (previously only enabled by the 'parallel-tests'
- option) will become the default one; the older serial testsuite
- harness will still be available through the use of the 'serial-tests'
- option.
-
- - The following long-obsolete m4 macros will be removed in the
- next major Automake version (1.13):
-
- AM_PROG_CC_STDC: superseded by AC_PROG_CC since October 2002
- fp_PROG_CC_STDC: broken alias for AM_PROG_CC_STDC
- fp_WITH_DMALLOC: old alias for AM_WITH_DMALLOC
- AM_CONFIG_HEADER: superseded by AC_CONFIG_HEADERS since July 2002
- ud_PATH_LISPDIR: old alias for AM_PATH_LISPDIR
- jm_MAINTAINER_MODE: old alias for AM_MAINTAINER_MODE
- ud_GNU_GETTEXT: old alias for AM_GNU_GETTEXT
- gm_PROG_LIBTOOL: old alias for AC_PROG_LIBTOOL
- fp_C_PROTOTYPES: old alias for AM_C_PROTOTYPES (which was part
- of the now-removed automatic de-ANSI-fication
- support of Automake)
-
- - All the "old alias" macros in 'm4/obsolete.m4' will be removed in
- the next major Automake version (1.13).
-
- - The '--acdir' option of aclocal is deprecated, and will probably
- be removed in the next major Automake release (1.13). You should
- use the options '--automake-acdir' and '--system-acdir' instead
- (which have been introduced in Automake 1.11.2).
-
- - The 'missing' script will no longer try to update the timestamp
- of out-of-date files that require a maintainer-specific tool to be
- remade, in case the user lacks such a tool (or has a too-old version
- of it). In fact, starting from Automake 1.13, all it'll do will be
- giving more useful warnings than a bare "command not found" from a
- make recipe would.
-
Bugs fixed in 1.12.6:
* Python-related bugs:
diff --git a/configure.ac b/configure.ac
index 24976c9..a9d26e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
AC_PREREQ([2.69])
-AC_INIT([GNU Automake-NG], [1.12a], address@hidden)
+AC_INIT([GNU Automake-NG], [1.12c], address@hidden)
AC_CONFIG_SRCDIR([automake.in])
AC_CONFIG_AUX_DIR([lib])
diff --git a/lib/gnupload b/lib/gnupload
index 186d2ad..f6b999b 100755
--- a/lib/gnupload
+++ b/lib/gnupload
@@ -1,7 +1,7 @@
#!/bin/sh
# Sign files and upload them.
-scriptversion=2012-06-11.00; # UTC
+scriptversion=2012-12-11.16; # UTC
# Copyright (C) 2004-2012 Free Software Foundation, Inc.
#
@@ -242,6 +242,8 @@ fi
# Make sure passphrase is not exported in the environment.
unset passphrase
+unset passphrase_fd_0
+GNUPGHOME=${GNUPGHOME:-$HOME/.gnupg}
# Reset PATH to be sure that echo is a built-in. We will later use
# 'echo $passphrase' to output the passphrase, so it is important that
@@ -249,12 +251,13 @@ unset passphrase
# listings with their arguments...).
# Remember this script runs with 'set -e', so if echo is not built-in
# it will exit now.
-if $dry_run; then :; else
+if $dry_run || grep -q "^use-agent" $GNUPGHOME/gpg.conf; then :; else
PATH=/empty echo -n "Enter GPG passphrase: "
stty -echo
read -r passphrase
stty echo
echo
+ passphrase_fd_0="--passphrase-fd 0"
fi
if test $# -ne 0; then
@@ -262,7 +265,7 @@ if test $# -ne 0; then
do
echo "Signing $file ..."
rm -f $file.sig
- echo "$passphrase" | $dbg $GPG --passphrase-fd 0 -ba -o $file.sig $file
+ echo "$passphrase" | $dbg $GPG $passphrase_fd_0 -ba -o $file.sig $file
done
fi
@@ -320,12 +323,12 @@ upload ()
case $dest in
alpha.gnu.org:*)
mkdirective "$destdir" "$base" "$file" "$stmt"
- echo "$passphrase" | $dbg $GPG --passphrase-fd 0 --clearsign
$base.directive
+ echo "$passphrase" | $dbg $GPG $passphrase_fd_0 --clearsign
$base.directive
$dbg ncftpput ftp-upload.gnu.org /incoming/alpha $files
$base.directive.asc
;;
ftp.gnu.org:*)
mkdirective "$destdir" "$base" "$file" "$stmt"
- echo "$passphrase" | $dbg $GPG --passphrase-fd 0 --clearsign
$base.directive
+ echo "$passphrase" | $dbg $GPG $passphrase_fd_0 --clearsign
$base.directive
$dbg ncftpput ftp-upload.gnu.org /incoming/ftp $files $base.directive.asc
;;
savannah.gnu.org:*)
@@ -344,7 +347,7 @@ upload ()
destdir_p1=`echo "$destdir" | sed 's,^[^/]*/,,'`
destdir_topdir=`echo "$destdir" | sed 's,/.*,,'`
mkdirective "$destdir_p1" "$base" "$file" "$stmt"
- echo "$passphrase" | $dbg $GPG --passphrase-fd 0 --clearsign
$base.directive
+ echo "$passphrase" | $dbg $GPG $passphrase_fd_0 --clearsign
$base.directive
for f in $files $base.directive.asc
do
echo put $f
@@ -353,7 +356,7 @@ upload ()
/*)
dest_host=`echo "$dest" | sed 's,:.*,,'`
mkdirective "$destdir" "$base" "$file" "$stmt"
- echo "$passphrase" | $dbg $GPG --passphrase-fd 0 --clearsign
$base.directive
+ echo "$passphrase" | $dbg $GPG $passphrase_fd_0 --clearsign
$base.directive
$dbg cp $files $base.directive.asc $dest_host
;;
*)
diff --git a/m4/amversion.m4 b/m4/amversion.m4
index 368cd64..3e87447 100644
--- a/m4/amversion.m4
+++ b/m4/amversion.m4
@@ -12,10 +12,10 @@
# generated from the m4 files accompanying Automake X.Y.
# (This private macro should not be called outside this file.)
AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.12a'
+[am__api_version='1.12c'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.12a], [],
+m4_if([$1], [1.12c], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -31,7 +31,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.12a])dnl
+[AM_AUTOMAKE_VERSION([1.12c])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff --git a/maint.mk b/maint.mk
new file mode 100644
index 0000000..c0921c5
--- /dev/null
+++ b/maint.mk
@@ -0,0 +1,464 @@
+# Maintainer makefile rules for Automake.
+#
+# Copyright (C) 1995-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# Avoid CDPATH issues.
+unexport CDPATH
+
+# --------------------------------------------------------- #
+# Automatic generation of the ChangeLog from git history. #
+# --------------------------------------------------------- #
+
+gitlog_to_changelog_command = $(PERL) $(srcdir)/lib/gitlog-to-changelog
+gitlog_to_changelog_fixes = $(srcdir)/.git-log-fix
+gitlog_to_changelog_options = --amend=$(gitlog_to_changelog_fixes) \
+ --since='2011-12-28 00:00:00' \
+ --no-cluster --format '%s%n%n%b'
+
+EXTRA_DIST += lib/gitlog-to-changelog
+EXTRA_DIST += $(gitlog_to_changelog_fixes)
+
+# When executed from a git checkout, generate the ChangeLog from the git
+# history. When executed from an extracted distribution tarball, just
+# copy the distributed ChangeLog in the build directory (and if this
+# fails, or if no distributed ChangeLog file is present, complain and
+# give an error).
+#
+# The ChangeLog should be regenerated unconditionally when working from
+# checked-out sources; otherwise, if we're working from a distribution
+# tarball, we expect the ChangeLog to be distributed, so check that it
+# is indeed present in the source directory.
+ChangeLog:
+ $(AM_V_GEN)set -e; set -u; \
+ if test -d $(srcdir)/.git; then \
+ rm -f address@hidden \
+ && $(gitlog_to_changelog_command) \
+ $(gitlog_to_changelog_options) >address@hidden \
+ && chmod a-w address@hidden \
+ && mv -f address@hidden $@ \
+ || exit 1; \
+ elif test ! -f $(srcdir)/$@; then \
+ echo "Source tree is not a git checkout, and no pre-existent" \
+ "$@ file has been found there" >&2; \
+ exit 1; \
+ fi
+.PHONY: ChangeLog
+
+
+# --------------------------- #
+# Perl coverage statistics. #
+# --------------------------- #
+
+PERL_COVERAGE_DB = $(abs_top_builddir)/cover_db
+PERL_COVERAGE_FLAGS =
-MDevel::Cover=-db,$(PERL_COVERAGE_DB),-silent,on,-summary,off
+PERL_COVER = cover
+
+check-coverage-run recheck-coverage-run: %-coverage-run: all
+ $(MKDIR_P) $(PERL_COVERAGE_DB)
+ PERL5OPT="$$PERL5OPT $(PERL_COVERAGE_FLAGS)"; export PERL5OPT; \
+ WANT_NO_THREADS=yes; export WANT_NO_THREADS; unset AUTOMAKE_JOBS; \
+ $(MAKE) $*
+
+check-coverage-report:
+ @if test ! -d "$(PERL_COVERAGE_DB)"; then \
+ echo "No coverage database found in '$(PERL_COVERAGE_DB)'." >&2; \
+ echo "Please run \"make check-coverage\" first" >&2; \
+ exit 1; \
+ fi
+ $(PERL_COVER) $(PERL_COVER_FLAGS) "$(PERL_COVERAGE_DB)"
+
+# We don't use direct dependencies here because we'd like to be able
+# to invoke the report even after interrupted check-coverage.
+check-coverage: check-coverage-run
+ $(MAKE) check-coverage-report
+
+recheck-coverage: recheck-coverage-run
+ $(MAKE) check-coverage-report
+
+clean-coverage:
+ rm -rf "$(PERL_COVERAGE_DB)"
+clean-local: clean-coverage
+
+.PHONY: check-coverage recheck-coverage check-coverage-run \
+ recheck-coverage-run check-coverage-report clean-coverage
+
+
+# ---------------------------------------------------- #
+# Tagging and/or uploading stable and beta releases. #
+# ---------------------------------------------------- #
+
+GIT = git
+
+EXTRA_DIST += lib/gnupload
+
+base_version_rx = ^[1-9][0-9]*\.[0-9][0-9]*
+stable_major_version_rx = $(base_version_rx)$$
+stable_minor_version_rx = $(base_version_rx)\.[0-9][0-9]*$$
+beta_version_rx = $(base_version_rx)(\.[0-9][0-9]*)?[bdfhjlnprtvxz]$$
+match_version = echo "$(VERSION)" | $(EGREP) >/dev/null
+
+# Check that we don't have uncommitted or unstaged changes.
+# TODO: Maybe the git suite already offers a shortcut to verify if the
+# TODO: working directory is "clean" or not? If yes, use that instead
+# TODO: of duplicating the logic here.
+git_must_have_clean_workdir = \
+ $(GIT) rev-parse --verify HEAD >/dev/null \
+ && $(GIT) update-index -q --refresh \
+ && $(GIT) diff-files --quiet \
+ && $(GIT) diff-index --quiet --cached HEAD \
+ || { echo "$@: you have uncommitted or unstaged changes" >&2; exit 1; }
+
+determine_release_type = \
+ if $(match_version) '$(stable_major_version_rx)'; then \
+ release_type='Major release'; \
+ announcement_type='major release'; \
+ dest=ftp; \
+ elif $(match_version) '$(stable_minor_version_rx)'; then \
+ release_type='Minor release'; \
+ announcement_type='maintenance release'; \
+ dest=ftp; \
+ elif $(match_version) '$(beta_version_rx)'; then \
+ release_type='Beta release'; \
+ announcement_type='test release'; \
+ dest=alpha; \
+ else \
+ echo "$@: invalid version '$(VERSION)' for a release" >&2; \
+ exit 1; \
+ fi
+
+# Help the debugging of $(determine_release_type) and related code.
+print-release-type:
+ @$(determine_release_type); \
+ echo "$$release_type $(VERSION);" \
+ "it will be announced as a $$announcement_type"
+
+git-tag-release: maintainer-check
+ @set -e -u; \
+ case '$(AM_TAG_DRYRUN)' in \
+ ""|[nN]|[nN]o|NO) run="";; \
+ *) run="echo Running:";; \
+ esac; \
+ $(determine_release_type); \
+ $(git_must_have_clean_workdir); \
+ $$run $(GIT) tag -s "v$(VERSION)" -m "$$release_type $(VERSION)"
+
+git-upload-release:
+ @# Check this is a version we can cut a release (either test
+ @# or stable) from.
+ @$(determine_release_type)
+ @# The repository must be clean.
+ @$(git_must_have_clean_workdir)
+ @# Check that we are releasing from a valid tag.
+ @tag=`$(GIT) describe` \
+ && case $$tag in "v$(VERSION)") true;; *) false;; esac \
+ || { echo "$@: you can only create a release from a tagged" \
+ "version" >&2; \
+ exit 1; }
+ @# Build the distribution tarball(s).
+ $(MAKE) dist
+ @# Upload it to the correct FTP repository.
+ @$(determine_release_type) \
+ && dest=$$dest.gnu.org:automake \
+ && echo "Will upload to $$dest: $(DIST_ARCHIVES)" \
+ && $(srcdir)/lib/gnupload $(GNUPLOADFLAGS) --to $$dest \
+ $(DIST_ARCHIVES)
+
+.PHONY: print-release-type git-upload-release git-tag-release
+
+
+# ------------------------------------------------------------------ #
+# Explore differences of autogenerated files in different commits. #
+# ------------------------------------------------------------------ #
+
+# Visually comparing differences between the Makefile.in files in
+# automake's own build system as generated in two different branches
+# might help to catch bugs and blunders. This has already happened a
+# few times in the past, when we used to version-control Makefile.in.
+autodiffs:
+ @set -u; \
+ NEW_COMMIT=$${NEW_COMMIT-"HEAD"}; \
+ OLD_COMMIT=$${OLD_COMMIT-"HEAD~1"}; \
+ am_gitdir='$(abs_top_srcdir)/.git'; \
+ get_autofiles_from_rev () \
+ { \
+ rev=$$1 dir=$$2 \
+ && echo "$@: will get files from revision $$rev" \
+ && $(GIT) clone -q --depth 1 "$$am_gitdir" tmp \
+ && cd tmp \
+ && $(GIT) checkout -q "$$rev" \
+ && echo "$@: bootstrapping $$rev" \
+ && $(SHELL) ./bootstrap.sh \
+ && echo "$@: copying files from $$rev" \
+ && makefile_ins=`find . -name Makefile.in` \
+ && (tar cf - configure aclocal.m4 $$makefile_ins) | \
+ (cd .. && cd "$$dir" && tar xf -) \
+ && cd .. \
+ && rm -rf tmp; \
+ }; \
+ address@hidden \
+ && : Before proceeding, ensure the specified revisions truly exist. \
+ && $(GIT) --git-dir="$$am_gitdir" describe $$OLD_COMMIT >/dev/null \
+ && $(GIT) --git-dir="$$am_gitdir" describe $$NEW_COMMIT >/dev/null \
+ && rm -rf $$outdir \
+ && mkdir $$outdir \
+ && cd $$outdir \
+ && mkdir new old \
+ && get_autofiles_from_rev $$OLD_COMMIT old \
+ && get_autofiles_from_rev $$NEW_COMMIT new \
+ && exit 0
+
+# With lots of eye candy; we like our developers pampered and spoiled :-)
+compare-autodiffs: autodiffs
+ @set -u; \
+ : $${COLORDIFF=colordiff} $${DIFF=diff}; \
+ dir=autodiffs.dir; \
+ if test ! -d "$$dir"; then \
+ echo "$@: $$dir: Not a directory" >&2; \
+ exit 1; \
+ fi; \
+ mydiff=false mypager=false; \
+ if test -t 1; then \
+ if ($$COLORDIFF -r . .) </dev/null >/dev/null 2>&1; then \
+ mydiff=$$COLORDIFF; \
+ mypager="less -R"; \
+ else \
+ mypager=less; \
+ fi; \
+ else \
+ mypager=cat; \
+ fi; \
+ if test "$$mydiff" = false; then \
+ if ($$DIFF -r -u . .); then \
+ mydiff=$$DIFF; \
+ else \
+ echo "$@: no good-enough diff program specified" >&2; \
+ exit 1; \
+ fi; \
+ fi; \
+ st=0; $$mydiff -r -u $$dir/old $$dir/new | $$mypager || st=$$?; \
+ rm -rf $$dir; \
+ exit $$st
+.PHONY: autodiffs compare-autodiffs
+
+# ---------------------------------------------- #
+# Help writing the announcement for a release. #
+# ---------------------------------------------- #
+
+PACKAGE_MAILINGLIST = address@hidden
+
+announcement: NEWS
+ $(AM_V_GEN): \
+ && rm -f $@ address@hidden \
+ && $(determine_release_type) \
+ && ftp_base="ftp://$$dest.gnu.org/gnu/$(PACKAGE)" \
+ && X () { printf '%s\n' "$$*" >> address@hidden; } \
+ && X "We are pleased to announce the $(PACKAGE_NAME) $(VERSION)" \
+ "$$announcement_type." \
+ && X \
+ && X "**TODO** Brief description of the release here." \
+ && X \
+ && X "**TODO** This description can span multiple paragraphs." \
+ && X \
+ && X "See below for the detailed list of changes since the" \
+ && X "previous version, as summarized by the NEWS file." \
+ && X \
+ && X "Download here:" \
+ && X \
+ && X " $$ftp_base/$(PACKAGE)-$(VERSION).tar.gz" \
+ && X " $$ftp_base/$(PACKAGE)-$(VERSION).tar.xz" \
+ && X \
+ && X "Please report bugs and problems to" \
+ "<$(PACKAGE_BUGREPORT)>," \
+ && X "and send general comments and feedback to" \
+ "<$(PACKAGE_MAILINGLIST)>." \
+ && X \
+ && X "Thanks to everyone who has reported problems, contributed" \
+ && X "patches, and helped testing Automake!" \
+ && X \
+ && X "-*-*-*-" \
+ && X \
+ && sed -n -e '/^~~~/q' -e p $(srcdir)/NEWS >> address@hidden \
+ && mv -f address@hidden $@
+.PHONY: announcement
+CLEANFILES += announcement
+
+# --------------------------------------------------------------------- #
+# Synchronize third-party files that are committed in our repository. #
+# --------------------------------------------------------------------- #
+
+# Program to use to fetch files.
+WGET = wget
+
+# Some repositories we sync files from.
+SV_CVS = 'http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~/'
+SV_GIT_CF =
'http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;hb=HEAD;f='
+SV_GIT_AC =
'http://git.savannah.gnu.org/gitweb/?p=autoconf.git;a=blob_plain;hb=HEAD;f='
+SV_GIT_GL =
'http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=blob_plain;hb=HEAD;f='
+
+# Files that we fetch and which we compare against.
+# Note that the 'lib/COPYING' file must still be synced by hand.
+FETCHFILES = \
+ $(SV_GIT_CF)config.guess \
+ $(SV_GIT_CF)config.sub \
+ $(SV_CVS)texinfo/texinfo/doc/texinfo.tex \
+ $(SV_CVS)texinfo/texinfo/util/gendocs.sh \
+ $(SV_CVS)texinfo/texinfo/util/gendocs_template \
+ $(SV_GIT_GL)build-aux/gitlog-to-changelog \
+ $(SV_GIT_GL)build-aux/gnupload \
+ $(SV_GIT_GL)build-aux/update-copyright \
+ $(SV_GIT_GL)doc/INSTALL
+
+# Fetch the latest versions of few scripts and files we care about.
+# A retrieval failure or a copying failure usually mean serious problems,
+# so we'll just bail out if 'wget' or 'cp' fail.
+fetch:
+ $(AM_V_at)rm -rf Fetchdir
+ $(AM_V_at)mkdir Fetchdir
+ $(AM_V_GEN)set -e; \
+ if $(AM_V_P); then wget_opts=; else wget_opts=-nv; fi; \
+ for url in $(FETCHFILES); do \
+ file=`printf '%s\n' "$$url" | sed 's|^.*/||; s|^.*=||'`; \
+ $(WGET) $$wget_opts "$$url" -O Fetchdir/$$file || exit 1; \
+ if cmp Fetchdir/$$file $(srcdir)/lib/$$file >/dev/null; then \
+ : Nothing to do; \
+ else \
+ echo "$@: updating file $$file"; \
+ cp Fetchdir/$$file $(srcdir)/lib/$$file || exit 1; \
+ fi; \
+ done
+ $(AM_V_at)rm -rf Fetchdir
+.PHONY: fetch
+
+# ---------------------------------------------------------------------- #
+# Generate and upload manuals in several formats, for the GNU website. #
+# ---------------------------------------------------------------------- #
+
+web_manual_dir = doc/web-manual
+
+RSYNC = rsync
+CVS = cvs
+CVSU = cvsu
+CVS_USER = $${USER}
+WEBCVS_ROOT = cvs.savannah.gnu.org:/web
+CVS_RSH = ssh
+export CVS_RSH
+
+.PHONY: web-manual web-manual-update
+web-manual web-manual-update: t = address@hidden
+
+# Build manual in several formats. Note to the recipe:
+# 1. The symlinking of automake.texi into the temporary directory is
+# required to pacify extra checks from gendocs.sh.
+# 2. The redirection to /dev/null before the invocation of gendocs.sh
+# is done to better respect silent rules.
+web-manual:
+ $(AM_V_at)rm -rf $(web_manual_dir) $t
+ $(AM_V_at)mkdir $t
+ $(AM_V_at)$(LN_S) '$(abs_srcdir)/doc/$(PACKAGE).texi' '$t/'
+ $(AM_V_GEN)cd $t \
+ && GENDOCS_TEMPLATE_DIR='$(abs_srcdir)/lib' \
+ && export GENDOCS_TEMPLATE_DIR \
+ && if $(AM_V_P); then :; else exec >/dev/null 2>&1; fi \
+ && $(SHELL) '$(abs_srcdir)/lib/gendocs.sh' \
+ -I '$(abs_srcdir)/doc' --email $(PACKAGE_BUGREPORT) \
+ $(PACKAGE) '$(PACKAGE_NAME)'
+ $(AM_V_at)mkdir $(web_manual_dir)
+ $(AM_V_at)mv -f $t/manual/* $(web_manual_dir)
+ $(AM_V_at)rm -rf $t
+ @! $(AM_V_P) || ls -l $(web_manual_dir)
+
+# Upload manual to www.gnu.org, using CVS (sigh!)
+web-manual-update:
+ $(AM_V_at)$(determine_release_type); \
+ case $$release_type in \
+ [Mm]ajor\ release|[Mm]inor\ release);; \
+ *) echo "Cannot upload manuals from a \"$$release_type\"" >&2; \
+ exit 1;; \
+ esac
+ $(AM_V_at)test -f $(web_manual_dir)/$(PACKAGE).html || { \
+ echo 'You have to run "$(MAKE) web-manuals" before' \
+ 'invoking "$(MAKE) $@"' >&2; \
+ exit 1; \
+ }
+ $(AM_V_at)rm -rf $t
+ $(AM_V_at)mkdir $t
+ $(AM_V_at)cd $t \
+ && $(CVS) -z3 -d :ext:$(CVS_USER)@$(WEBCVS_ROOT)/$(PACKAGE) \
+ co $(PACKAGE)
+ @# According to the rsync manpage, "a trailing slash on the
+ @# source [...] avoids creating an additional directory
+ @# level at the destination". So the trailing '/' after
+ @# '$(web_manual_dir)' below is intended.
+ $(AM_V_at)$(RSYNC) -avP $(web_manual_dir)/ $t/$(PACKAGE)/manual
+ $(AM_V_GEN): \
+ && cd $t/$(PACKAGE)/manual \
+ && new_files=`$(CVSU) --types='?'` \
+ && new_files=`echo "$$new_files" | sed s/^..//` \
+ && { test -z "$$new_files" || $(CVS) add -ko $$new_files; } \
+ && $(CVS) ci -m $(VERSION)
+ $(AM_V_at)rm -rf $t
+.PHONY: web-manual-update
+
+clean-web-manual:
+ $(AM_V_at)rm -rf $(web_manual_dir)
+.PHONY: clean-web-manual
+clean-local: clean-web-manual
+
+EXTRA_DIST += lib/gendocs.sh lib/gendocs_template
+
+# ------------------------------------------------ #
+# Update copyright years of all committed files. #
+# ------------------------------------------------ #
+
+EXTRA_DIST += lib/update-copyright
+
+update_copyright_env = \
+ UPDATE_COPYRIGHT_FORCE=1 \
+ UPDATE_COPYRIGHT_USE_INTERVALS=2
+
+# In addition to the several README files, these as well are
+# not expected to have a copyright notice.
+files_without_copyright = \
+ .autom4te.cfg \
+ .git-log-fix \
+ .gitattributes \
+ .gitignore \
+ INSTALL \
+ COPYING \
+ AUTHORS \
+ THANKS \
+ lib/INSTALL \
+ lib/COPYING
+
+# This script has an MIT-style license
+files_without_copyright += lib/install-sh
+
+.PHONY: update-copyright
+update-copyright:
+ $(AM_V_GEN)set -e; \
+ current_year=`date +%Y` && test -n "$$current_year" \
+ || { echo "$@: cannot get current year" >&2; exit 1; }; \
+ sed -i "/^RELEASE_YEAR=/s/=.*$$/=$$current_year/" \
+ bootstrap.sh configure.ac; \
+ excluded_re=`( \
+ for url in $(FETCHFILES); do echo "$$url"; done \
+ | sed -e 's!^.*/!!' -e 's!^.*=!!' -e 's!^!lib/!' \
+ && for f in $(files_without_copyright); do echo $$f; done \
+ ) | sed -e '$$!s,$$,|,' | tr -d '\012\015'`; \
+ $(GIT) ls-files \
+ | grep -Ev '(^|/)README$$' \
+ | grep -Ev "^($$excluded_re)$$" \
+ | $(update_copyright_env) xargs $(srcdir)/lib/$@
diff --git a/syntax-checks.mk b/syntax-checks.mk
index bc2faf8..d0a54f3 100644
--- a/syntax-checks.mk
+++ b/syntax-checks.mk
@@ -115,7 +115,7 @@ sc_diff_automake sc_diff_aclocal: sc_diff_% :
sc_no_brace_variable_expansions:
@if grep -v '^ *#' $(ams) | grep -F '$${' | grep -F -v '$$$$'; then \
echo "Found too many uses of '\$${' in the lines above." 1>&2; \
- exit 1; \
+ exit 1; \
else :; fi
## Make sure 'rm' is called with '-f'.
@@ -125,7 +125,7 @@ sc_rm_minus_f:
| grep -E '\<rm ([^-]|\-[^f ]*\>)'; \
then \
echo "Suspicious 'rm' invocation." 1>&2; \
- exit 1; \
+ exit 1; \
else :; fi
## Never use something like "for file in $(FILES)", this doesn't work
@@ -163,6 +163,7 @@ sc_mkinstalldirs:
$(ams) \
$(srcdir)/automake.in \
$(srcdir)/doc/*.texi \
+ $(srcdir)/maint.mk \
"; \
if grep 'mkinstalldirs' $$files; then \
echo "Found use of mkinstalldirs; that is obsolete" 1>&2; \
diff --git a/t/ltcond2.sh b/t/ltcond2.sh
index a16a7cf..48edede 100755
--- a/t/ltcond2.sh
+++ b/t/ltcond2.sh
@@ -56,25 +56,19 @@ check-local:
END
cat > hello-linux.c <<'END'
-const char* str (void)
-{
- return "hello-linux";
-}
+const char* str = "hello-linux";
END
cat > hello-generic.c <<'END'
-const char* str (void)
-{
- return "hello-generic";
-}
+const char* str = "hello-generic";
END
cat > hello-common.c <<'END'
#include <stdio.h>
-const char* str (void);
+extern const char* str;
void print (void)
{
- puts (str ());
+ puts (str);
}
END
diff --git a/t/pkg-config-macros.sh b/t/pkg-config-macros.sh
index e2bf638..c0ebf9f 100755
--- a/t/pkg-config-macros.sh
+++ b/t/pkg-config-macros.sh
@@ -68,7 +68,7 @@
XT_ACLOCAL_PATH=$XT_ACLOCAL_PATH${ACLOCAL_PATH+":$ACLOCAL_PATH"}
# Try once again to fetch the pkg-config macros.
mkdir m4
-ACLOCAL_PATH=$XT_ACLOCAL_PATH $ACLOCAL --install -I m4
+ACLOCAL_PATH=$XT_ACLOCAL_PATH $ACLOCAL -Wno-syntax --install -I m4
if test -f m4/pkg.m4 && have_pkg_config_macros; then
echo "ACLOCAL_PATH='$(pwd)/m4':\$ACLOCAL_PATH" >> get.sh
echo "export ACLOCAL_PATH" >> get.sh
diff --git a/t/py-compile-destdir.sh b/t/py-compile-destdir.sh
index c26175f..f8dce2b 100755
--- a/t/py-compile-destdir.sh
+++ b/t/py-compile-destdir.sh
@@ -1,4 +1,4 @@
- #! /bin/sh
+#! /bin/sh
# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
diff --git a/t/self-check-dir.tap b/t/self-check-dir.tap
index 60d9216..abc02c1 100755
--- a/t/self-check-dir.tap
+++ b/t/self-check-dir.tap
@@ -65,7 +65,7 @@ do_check 'do not pre-populate testdir' \
do_check 'do not create nor chdir in testdir' \
'am_create_testdir=no' \
'test ! -e t/_self.dir || exit 1
- grep "compare-autodiffs" Makefile || exit 1
+ grep "compare-autodiffs" maint.mk || exit 1
case $(pwd) in '"$cwd"') : ;; *) exit 1;; esac'
:
diff --git a/t/subpkg-macrodir.sh b/t/subpkg-macrodir.sh
index a16f42b..189df06 100755
--- a/t/subpkg-macrodir.sh
+++ b/t/subpkg-macrodir.sh
@@ -38,14 +38,13 @@ AC_DEFUN([AX_FOO], [
EOF
cat > m4/bar.m4 <<'EOF'
-AC_DEFUN([AX_BAR], [AC_SUBST([WHOMAI], [SuperPkg])])
+AC_DEFUN([AX_BAR], [AC_SUBST([WHOAMI], [SuperPkg])])
EOF
cat > Makefile.am << 'END'
-test-whomai:
+test-whoami:
test '$(WHOAMI)' = SuperPkg
-check-local: test
-.PHONY: test
+check-local: test-whoami
END
mkdir pkg
@@ -60,14 +59,13 @@ END
mkdir pkg/macros
cat > pkg/macros/zardoz.m4 << 'END'
-AC_DEFUN([AX_BAR], [AC_SUBST([WHOMAI], [sub-pkg])])
+AC_DEFUN([AX_BAR], [AC_SUBST([WHOAMI], [sub-pkg])])
END
cat > pkg/Makefile.am << 'END'
-test-whomai:
+test-whoami:
test '$(WHOAMI)' = sub-pkg
-check-local: test
-.PHONY: test
+check-local: test-whomai
END
AUTOMAKE=$AUTOMAKE ACLOCAL=$ACLOCAL AUTOCONF=$AUTOCONF $AUTORECONF -vi
@@ -79,8 +77,8 @@ $FGREP 'm4_include([macros/zardoz.m4])' pkg/aclocal.m4
./configure
-$MAKE test
-(cd pkg && $MAKE test) || exit 1
+$MAKE test-whoami
+(cd pkg && $MAKE test-whoami) || exit 1
$MAKE distcheck
diff --git a/t/tags-pr12372.sh b/t/tags-pr12372.sh
index b1dc9e5..1cc1971 100755
--- a/t/tags-pr12372.sh
+++ b/t/tags-pr12372.sh
@@ -23,6 +23,9 @@ required='cc etags'
cat >> configure.ac <<'END'
AC_PROG_CC
AC_CONFIG_FILES([sub/Makefile])
+# Fake linking. Help avoid possible spurious errors from make
+# or from the linker; errors that are irrelevant to this test.
+AC_SUBST([LINK], ['echo $(CCLD) $(CFLAGS) $(LDFLAGS) -o $@'])
AC_OUTPUT
END
@@ -33,7 +36,6 @@ all-local: tags
$(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) -c $*.c
rm -f $*.c
-LINK = $(CCLD) $(CFLAGS) $(LDFLAGS) -o $@
noinst_PROGRAMS = foo
foo_SOURCES = foo-main.pc barbar.c
SUBDIRS = sub
@@ -47,7 +49,6 @@ all-local: tags
$(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) -c $*.c
rm -f $*.c
-LINK = $(CCLD) $(CFLAGS) $(LDFLAGS) -o $@
noinst_PROGRAMS = zap
zap_SOURCES = zardoz.pc
END
hooks/post-receive
--
GNU Automake
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.12b-716-g191e6b1,
Stefano Lattarini <=