From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Sat, 27 Oct 2012 14:31:35 +0000 (+0200)
Subject: Merge branch 'master' into ng/master
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf8b865e19c25d5cb5ccb2def3d5d2d8b8c63d32;p=thirdparty%2Fautomake.git

Merge branch 'master' into ng/master

* master:
  tests: merge, tweak and modernize few test scripts
  tests: move coverage about BUILT_SOURCES
  tests: more meaningful names for some test cases
  tests: merge some grepping tests on Yacc support

+ Extra non-trivial changes:

* t/per-target-flags.sh: Sync with the back-ported version that
is in maint and master, that has several bugfixes over the previous
version in ng/master.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
---

cf8b865e19c25d5cb5ccb2def3d5d2d8b8c63d32
diff --cc t/per-target-flags.sh
index f8b863692,e5278fb27..42853840e
--- a/t/per-target-flags.sh
+++ b/t/per-target-flags.sh
@@@ -17,8 -17,10 +17,10 @@@
  # Test executable-specific and library-specific flags, both with
  # and without dependency tracking.
  
 -. ./defs || Exit 1
 +. ./defs || exit 1
  
+ makefiles='Makefile libMakefile Makefile2 libMakefile2'
+ 
  cat > configure.ac << END
  AC_INIT([$me], [1.0])
  AM_INIT_AUTOMAKE([-Wno-extra-portability])