]> git.ipfire.org Git - thirdparty/automake.git/commitdiff
Merge branch 'master' into ng/master
authorStefano Lattarini <stefano.lattarini@gmail.com>
Sat, 27 Oct 2012 14:31:35 +0000 (16:31 +0200)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Sat, 27 Oct 2012 14:31:35 +0000 (16:31 +0200)
* 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>
1  2 
t/no-spurious-install-recursive.sh
t/per-target-flags.sh
t/suffix-custom-subobj-and-specflg.sh
t/yacc-grepping2.sh
t/yacc-subdir.sh

Simple merge
index f8b8636923c0a3b2ce23cb7277eb3528df2f0412,e5278fb276b9703cdca4630d0bdbeb703ed0f57e..42853840ee095a671ee01263728187269882ffde
  # 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])
Simple merge
Simple merge
Simple merge