[Automake-NG] [FYI] {ng/master} tests: adjust for warnings that have been moved to GNU make runtime

2013-04-30 Thread Stefano Lattarini 
Some of those warnings are given at automake runtime in mainline
Automake, and some tests were relying on that behaviour, thus causing
spurious testsuite failures.

* t/proc-errmsg.sh: Adjust accordingly.

Signed-off-by: Stefano Lattarini 
---
 t/preproc-errmsg.sh | 12 +---
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/t/preproc-errmsg.sh b/t/preproc-errmsg.sh
index 704562d..fd428c1 100755
--- a/t/preproc-errmsg.sh
+++ b/t/preproc-errmsg.sh
@@ -30,7 +30,7 @@ END
 mkdir sub sub/sub2
 
 cat > Makefile.am <<'END'
-%canon_reldir%_x1_SOURCES = bar.c
+%canon_reldir%_UNDEFINED_0 +=
 include sub/local.mk
 END
 
@@ -38,7 +38,7 @@ cat > sub/local.mk <<'END'
 AUTOMAKE_OPTIONS = -Wno-extra-portability
 include %D%/sub2/more.mk
 noinst_LIBRARIES = %reldir%-one.a %D%-two.a
-%C%_x2_SOURCES = foo.c
+%C%_UNDEFINED_1 +=
 END
 
 cat > sub/sub2/more.mk <<'END'
@@ -49,20 +49,18 @@ $ACLOCAL
 AUTOMAKE_fails
 
 cat > expected << 'END'
+Makefile.am:1: UNDEFINED_0 must be set with '=' before using '+='
 sub/sub2/more.mk:1: sub_sub2_UNDEFINED must be set with '=' before using '+='
 Makefile.am:2: 'sub/local.mk' included from here
 sub/local.mk:2: 'sub/sub2/more.mk' included from here
+sub/local.mk:4: sub_UNDEFINED_1 must be set with '=' before using '+='
+Makefile.am:2: 'sub/local.mk' included from here
 sub/local.mk:3: 'sub-one.a' is not a standard library name
 sub/local.mk:3: did you mean 'libsub-one.a'?
 Makefile.am:2: 'sub/local.mk' included from here
 sub/local.mk:3: 'sub-two.a' is not a standard library name
 sub/local.mk:3: did you mean 'libsub-two.a'?
 Makefile.am:2: 'sub/local.mk' included from here
-Makefile.am:1: variable 'x1_SOURCES' is defined but no program or
-Makefile.am:1: library has 'x1' as canonical name (possible typo)
-sub/local.mk:4: variable 'sub_x2_SOURCES' is defined but no program or
-sub/local.mk:4: library has 'sub_x2' as canonical name (possible typo)
-Makefile.am:2: 'sub/local.mk' included from here
 END
 
 # We need to break these substitutions into multiple sed invocations
-- 
1.8.3.rc0.19.g7e6a0cc

[Automake-NG] [FYI] {ng/master} compat: restore support for $(INCLUDES) variable

2013-04-30 Thread Stefano Lattarini 
With the aim of avoiding the introduction of too much unneeded
differences and incompatibilities between Automake-NG and
mainline Automake.

See also commit v1.13.1b-166-g57c7200 (2013-04-19, compat: reinstate
support for obsolete $(INCLUDES) variable) in mainline Automake.

* automake.in (generate_makefile): The definition of the INCLUDES
variable now causes a warning in the 'obsolete' category rather than
a fatal error.
* NG-NEWS: Adjust.

Suggested-by: Peter Rosin
Signed-off-by: Stefano Lattarini 
---
 automake.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/automake.in b/automake.in
index 17e833e..1bd994e 100644
--- a/automake.in
+++ b/automake.in
@@ -6538,8 +6538,8 @@ sub generate_makefile
 }
   if (my $ovar = var ('INCLUDES'))
 {
-  reject_var $ovar,
-  "'INCLUDES' is obsolete; you should use 'AM_CPPFLAGS'"
+  msg_var 'obsolete', $ovar,
+  "'INCLUDES' is deprecated; you should use 'AM_CPPFLAGS'"
   . " (or '*_CPPFLAGS') instead"
 }
 
-- 
1.8.3.rc0.19.g7e6a0cc

[Automake-NG] [FYI] Merge branch 'master' into ng/master

2013-04-30 Thread Stefano Lattarini 
commit e402b325d6d5a58c67a794f9406008ae620a8c1e
Merge: dc33f64 dc4eaab
Author: Stefano Lattarini 
Date:   Tue Apr 30 17:36:41 2013 +0200

Merge branch 'master' into ng/master

* master:
  sync: update files from upstream with "make fetch"
  maintcheck: remove outdated whitelisting
  tar: format 'ustar' cannot support UID/GID longer than 21 bits
  docs: issues with configure substitutions in TESTS
  tests: avoid possible autotools caching issues (automake bug#13832)
  tests: rename some with more descriptive names
  docs: add myself and Ralf Wildenhues as authors
  authors: add myself
  dry-run: don't get confused by '-I' option
  tests: avoid a spurious failure with the Korn Shell
  dry-run: with GNU make, prefer $(MFLAGS) over $(MAKEFLAGS)
  header vars: can determine whether we are running under GNU make
  NEWS: improve wording for automake bug#13514 fix
  NEWS: document fix for automake bug#13514

+ Extra non-trivial changes:

* lib/am/header-vars.am: Ignore all upstream changes, we shouldn't
need them.
* t/make-is-gnu.sh: Remove; our generated makefiles have no need to
test whether they are running under GNU make --- of course they are!

Signed-off-by: Stefano Lattarini