From: Stefano Lattarini Date: Sun, 26 Aug 2012 11:35:17 +0000 (+0200) Subject: Merge branch 'master' into ng/master X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f75d44b7ade944067ce1ef3abda0fb87616d7131;p=thirdparty%2Fautomake.git Merge branch 'master' into ng/master * master: AM_INIT_AUTOMAKE: allow obsolescent two-args invocation once again docs: don't suggest to use recursive makefile setup tests: fix a timestamp race in python tests tests: fixup: make distcheck-override-infodir pass again sync: update files from upstream with "make fetch" maint: post-release minor version bump release: stable release 1.12.3 maintcheck: fix spurious warnings docs: fix typo: s/make install-info/make uninstall-info/ tests: fixup: make a couple of tests executable Signed-off-by: Stefano Lattarini --- f75d44b7ade944067ce1ef3abda0fb87616d7131 diff --cc doc/automake-ng.texi index 0970069f0,7b62dcb0c..63a1a92a7 --- a/doc/automake-ng.texi +++ b/doc/automake-ng.texi @@@ -416,18 -414,14 +416,16 @@@ the GNU Makefile standards The GNU Makefile Standards Document (@pxref{Makefile Conventions, , , standards, The GNU Coding Standards}) -is long, complicated, and subject to change. The goal of Automake is to -remove the burden of Makefile maintenance from the back of the -individual GNU maintainer (and put it on the back of the Automake +is long, complicated, and subject to change. The goal of Automake-NG +is to remove the burden of Makefile maintenance from the back of the +individual GNU maintainer (and put it on the back of the Automake-NG maintainers). -The typical Automake input file is simply a series of variable definitions. -Each such file is processed to create a @file{Makefile.in}. +The typical Automake-NG input file is simply a series of variable +definitions. Each such file is processed to create a @file{Makefile.in}. - There should generally be one @file{Makefile.am} per directory of a - project. +@cindex Constraints of Automake-NG +@cindex Automake-NG constraints @cindex Constraints of Automake @cindex Automake constraints diff --cc t/backcompat.sh index 000000000,fa8368763..214515d17 mode 000000,100755..100755 --- a/t/backcompat.sh +++ b/t/backcompat.sh @@@ -1,0 -1,64 +1,64 @@@ + #! /bin/sh + # Copyright (C) 2010-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 . + + # Test usage of AM_INIT_AUTOMAKE with two or three arguments, for + # backward-compatibility. + + . ./defs || exit 1 + + cat > Makefile.am <<'END' + .PHONY: test display + + ## Might be useful for debugging. + display: + ## The following should be substituted by AM_INIT_AUTOMAKE. + @echo PACKAGE = $(PACKAGE) + @echo VERSION = $(VERSION) + ## The following should not be substituted, as we used the + ## old form of AC_INIT. + @echo PACKAGE_NAME = $(PACKAGE_NAME) + @echo PACKAGE_VERSION = $(PACKAGE_VERSION) + @echo PACKAGE_TARNAME = $(PACKAGE_TARNAME) + @echo PACKAGE_STRING = $(PACKAGE_STRING) + + test: display + test x'$(PACKAGE)' = x'FooBar' + test x'$(VERSION)' = x'0.7.1' + test x'$(PACKAGE_NAME)' = x + test x'$(PACKAGE_VERSION)' = x + test x'$(PACKAGE_TARNAME)' = x + test x'$(PACKAGE_STRING)' = x + END + + for ac_init in 'AC_INIT' 'AC_INIT([Makefile.am])'; do + for am_extra_args in '' ', []' ', [:]' ', [false]'; do + rm -rf autom4te*.cache config* Makefile.in Makefile - unindent > configure.in < configure.ac <