Hash :
3c66523f
Author :
Date :
2012-01-31T08:31:59
Merge branch 'maint' * maint: tests: do not assume the object file extension is .o tests: avoid spurious failure of 'transform2.test' on Cygwin tests: avoid spurious failure of deleted-am.test with FreeBSD make tests: avoid possibly undeserved PASS from check8.test warnings: more precise category and message for one warning release: revamp rules to tag and upload the releases amversion: add missing dependency hacking: update advice w.r.t. synced files hacking: don't reference ChangeLog anymore + Extra non-trivial edits: * tests/suffix8.tap: Copy in (by hand) the modifications done to 'suffix8.test' on maint, i.e., the addition of an explicit '.y_.obj:' suffix rule to Makefile.am.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402
## Process this file with automake to create Makefile.in
## Makefile for Automake.
# Copyright (C) 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004,
# 2005, 2006, 2007, 2008, 2009, 2010, 2011, 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/>.
## lib goes first, because it builds Config.pm, used by aclocal and
## automake (run in doc, tests, and in the rebuild rules.)
## `.' goes before doc and tests, because the latter two directories
## run aclocal and automake.
SUBDIRS = lib . contrib doc m4 tests
bin_SCRIPTS = automake aclocal
CLEANFILES = $(bin_SCRIPTS)
AUTOMAKESOURCES = automake.in aclocal.in
TAGS_FILES = $(AUTOMAKESOURCES)
EXTRA_DIST = \
GNUmakefile \
syntax-checks.mk \
HACKING \
ChangeLog.96 \
ChangeLog.98 \
ChangeLog.00 \
ChangeLog.01 \
ChangeLog.02 \
ChangeLog.03 \
ChangeLog.04 \
ChangeLog.09 \
ChangeLog.11 \
bootstrap \
$(AUTOMAKESOURCES)
## 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)'`"; \
fv="$$f-$(APIVERSION)"; \
rm -f "$(DESTDIR)$(bindir)/$$fv"; \
echo " $(LN) '$(DESTDIR)$(bindir)/$$f' '$(DESTDIR)$(bindir)/$$fv'"; \
$(LN) "$(DESTDIR)$(bindir)/$$f" "$(DESTDIR)$(bindir)/$$fv"; \
done
uninstall-hook:
@for p in $(bin_SCRIPTS); do \
f="`echo $$p|sed '$(transform)'`"; \
fv="$$f-$(APIVERSION)"; \
rm -f "$(DESTDIR)$(bindir)/$$fv"; \
done
## We can't use configure to do the substitution here; we must do it
## by hand. We use a funny notation here to avoid configure
## substitutions in our text.
do_subst = sed \
-e 's,[@]APIVERSION[@],$(APIVERSION),g' \
-e 's,[@]PACKAGE[@],$(PACKAGE),g' \
-e 's,[@]PACKAGE_BUGREPORT[@],$(PACKAGE_BUGREPORT),g' \
-e 's,[@]PACKAGE_URL[@],$(PACKAGE_URL),g' \
-e 's,[@]PATH_SEPARATOR[@],$(PATH_SEPARATOR),g' \
-e 's,[@]PERL[@],$(PERL),g' \
-e 's,[@]PERL_THREADS[@],$(PERL_THREADS),g' \
-e 's,[@]SHELL[@],$(SHELL),g' \
-e 's,[@]am_AUTOCONF[@],$(am_AUTOCONF),g' \
-e 's,[@]am_AUTOM4TE[@],$(am_AUTOM4TE),g' \
-e 's,[@]VERSION[@],$(VERSION),g' \
-e 's,[@]configure_input[@],Generated from $@.in; do not edit by hand.,g' \
-e 's,[@]datadir[@],$(datadir),g'
## These files depend on Makefile so they are rebuilt if $(VERSION),
## $(datadir) or other do_subst'ituted variables change.
## Use chmod a-w to prevent people from editing the wrong file by accident.
automake: automake.in
aclocal: aclocal.in
automake aclocal: Makefile
$(AM_V_at)rm -f $@ $@-t
$(AM_V_GEN)$(do_subst) $(srcdir)/$@.in >$@-t
$(AM_V_at)chmod a+x,a-w $@-t && mv -f $@-t $@
## 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 $@
# Run the testsuite with the installed aclocal and automake.
installcheck-local:
am_running_installcheck=yes $(MAKE) $(AM_MAKEFLAGS) check
# Convenience proxy target for the test suites.
recheck:
$(am__cd) tests && $(MAKE) $(AM_MAKEFLAGS) $@
.PHONY: recheck
################################################################
##
## Everything past here is useful to the maintainer, but probably not
## to anybody else
##
gitlog_to_changelog_command = $(PERL) $(srcdir)/lib/gitlog-to-changelog
gitlog_to_changelog_options = --since='2011-12-28 00:00:00' \
--no-cluster --format '%s%n%n%b'
# Automatic generation of the ChangeLog from git history.
#
# 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).
#
# We need the apparently useless dependency from another .PHONY target
# `am--changelog-regen-hook' to work around a bug of Solaris make, which
# doesn't execute the recipe of a target named as an existing file, even
# if such target is declared `.PHONY' (yikes!)
#
.PHONY: am--changelog-regen-hook
am--changelog-regen-hook:
ChangeLog: am--changelog-regen-hook
$(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 $@-t \
&& $(gitlog_to_changelog_command) \
$(gitlog_to_changelog_options) >$@-t \
&& chmod a-w $@-t \
&& mv -f $@-t $@ \
|| 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
# Ensure tests are world-executable
dist-hook:
$(am__cd) $(distdir)/tests && chmod a+rx *.test
# 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
$(mkinstalldirs) $(PERL_COVERAGE_DB)
PERL5OPT="$$PERL5OPT $(PERL_COVERAGE_FLAGS)"; export PERL5OPT; \
WANT_NO_THREADS=yes; export WANT_NO_THREADS; unset AUTOMAKE_JOBS; \
$(MAKE) $(AM_MAKEFLAGS) `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) $(AM_MAKEFLAGS) check-coverage-report
recheck-coverage: recheck-coverage-run
$(MAKE) $(AM_MAKEFLAGS) 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
version_rx = ^[1-9][0-9]*\.[0-9][0-9]*(\.[0-9][0-9]*)?
stable_version_rx = $(version_rx)$$
beta_version_rx = $(version_rx)[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_version_rx)'; then \
release_type='Release' dest=ftp; \
elif $(match_version) '$(beta_version_rx)'; then \
release_type='Beta release' dest=alpha; \
else \
fatal "invalid version '$(VERSION)' for a release"; \
fi
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); \
## Make sure the NEWS file is up-to-date.
sed 1q $(srcdir)/NEWS | grep '$(VERSION)' >/dev/null \
|| fatal "NEWS not updated"; \
## 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) $(AM_MAKEFLAGS) dist || exit 1; \
echo Will upload to $$dest: $(DIST_ARCHIVES); \
$(srcdir)/lib/gnupload $(GNUPLOADFLAGS) --to $$dest $(DIST_ARCHIVES)
.PHONY: git-upload-release git-tag-release
## 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 \
&& $(am__cd) tmp \
&& git checkout -q "$$rev" \
&& echo "$@: bootstrapping $$rev" \
&& $(SHELL) ./bootstrap \
&& echo "$@: copying files from $$rev" \
&& makefile_ins=`find . -name Makefile.in` \
&& (tar cf - configure aclocal.m4 $$makefile_ins) | \
(cd .. && $(am__cd) "$$dir" && tar xf -) \
&& cd .. \
&& rm -rf tmp; \
}; \
outdir=$@.dir \
## 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 \
&& $(am__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
## Program to use to fetch files.
WGET = wget
WGET_SV_CVS = $(WGET) http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~/
WGET_SV_GIT_CF = $(WGET) 'http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;hb=HEAD;f='
WGET_SV_GIT_AC = $(WGET) 'http://git.savannah.gnu.org/gitweb/?p=autoconf.git;a=blob_plain;hb=HEAD;f='
WGET_SV_GIT_GL = $(WGET) 'http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=blob_plain;hb=HEAD;f='
## Files that we fetch and which we compare against.
## The 'lib/COPYING' file must still be synced by hand.
FETCHFILES = \
INSTALL \
config.guess \
config.sub \
gnupload \
gitlog-to-changelog \
texinfo.tex
## Fetch the latest versions of files we care about.
fetch:
rm -rf Fetchdir > /dev/null 2>&1
mkdir Fetchdir
## If a get fails then that is a problem.
($(am__cd) Fetchdir && \
$(WGET_SV_GIT_CF)config.guess -O config.guess && \
$(WGET_SV_GIT_CF)config.sub -O config.sub && \
$(WGET_SV_CVS)texinfo/texinfo/doc/texinfo.tex -O texinfo.tex && \
$(WGET_SV_GIT_GL)doc/INSTALL -O INSTALL && \
$(WGET_SV_GIT_GL)build-aux/gnupload -O gnupload && \
$(WGET_SV_GIT_GL)build-aux/gitlog-to-changelog -O gitlog-to-changelog)
## Don't exit after test because we want to give as many errors as
## possible.
@stat=0; for file in $(FETCHFILES); do \
if diff -u $(srcdir)/lib/$$file Fetchdir/$$file \
>>Fetchdir/update.patch 2>/dev/null; then :; \
else \
stat=1; \
echo "Updating $(srcdir)/lib/$$file ..."; \
cp Fetchdir/$$file $(srcdir)/lib/$$file; \
fi; \
done; \
test $$stat = 0 || \
echo "See Fetchdir/update.patch for a log of the changes."; \
exit $$stat
.PHONY: fetch
## Generate release statistics, for the table in automake.texi.
## This has to be run in an up to date build tree, but there must
## be no temp files nor unused other files lying around!
release-stats: ps
$(AM_V_GEN): && \
am=`wc -l < automake` && \
acl=`wc -l < aclocal` && \
pmfiles="lib/Automake/*.pm" && \
if test . != '$(srcdir)'; then pmfiles="$$pmfiles $(srcdir)/lib/Automake/*.pm"; \
else :; fi && \
pm=`cat $$pmfiles | wc -l` && \
dot_am_files=`ls -1 $(srcdir)/lib/am/*.am | grep -v Makefile.am` && \
amf=`echo "$$dot_am_files" | wc -l` && \
aml=`cat $$dot_am_files | wc -l` && \
m4f=`ls -1 $(srcdir)/m4/*.m4 | wc -l` && \
m4l=`cat $(srcdir)/m4/*.m4 | wc -l` && \
doc_text=`$(am__cd) doc && LC_ALL=C pstops 0 automake.ps unused.ps 2>&1` && \
echo "$$doc_text" && \
rm -f doc/unused.ps && \
doc=`echo "$$doc_text" | sed -n 's/.*Wrote \([1-9][0-9]*\) pages.*/\1/p'` && \
tests="tests/*.test"; \
if test . != '$(srcdir)'; then tests="$$tests $(srcdir)/tests/*.test"; \
else :; fi && \
t=`ls -1 $$tests | wc -l` && \
tgen=`grep 'GENERATED AUTOMATICALLY' $$tests | wc -l` && \
today=`date +%Y-%m-%d` && \
echo "add this to the table in doc/automake.texi after verification:" && \
printf '@item %s @tab %-6s @tab %4d @tab %4d @tab %4d @tab %4d %-4s @tab %4d %-4s @tab %3d @tab %d %-4s\n' \
$$today $(VERSION) $$am $$acl $$pm $$aml "($$amf)" $$m4l "($$m4f)" $$doc $$t "($$tgen)"
.PHONY: release-stats