Merge branch 'master' into ng/master

* master:
  maintainer-check: do not hang
  parallel-tests: 'recheck' must depend on 'all'
  vala tests: building libraries, and more on '.vapi' files
  automake: fix botched call to 'check_user_variables'
  vala: cleanup rules are better and more complete now
  vala tests: check headers generation
  vala tests: remove redundant libtool requirements and usages
  vala tests: some enhancements
  vala tests: few adjustments and improvements
  build: use latest help2man, but without locale support

diff --cc automake.in
index bb475286cf99ea005a48a29f77961598b1548c2e,38e09dcad9c6a8f6a7535e18642dec8e260717c6..6ace0522f51caac938e4d76b6638b5e47622167d
--- 1/automake.in
--- 2/automake.in
+++ b/automake.in
@@@ -5731,12 -5826,16 +5731,16 @@@ sub lang_vala_finish_target ($$
    foreach my $vala_file (@vala_sources)
      {
        my $c_file = $vala_file;
-       $output_rules .= "\$(srcdir)/$c_file: \$(srcdir)/${derived}_vala.stamp\n"
-         . "\t\@if test -f \$@; then :; else rm -f \$(srcdir)/${derived}_vala.stamp; fi\n"
-         . "\t\@if test -f \$@; then :; else \\\n"
-         . "\t  \$(MAKE) \$(srcdir)/${derived}_vala.stamp; \\\n"
-         . "\tfi\n"
-         if $c_file =~ s/(.*)\.vala$/$1.c/;
+       if ($c_file =~ s/(.*)\.vala$/$1.c/)
+         {
+           $c_file = "\$(srcdir)/$c_file";
+           $output_rules .= "$c_file: \$(srcdir)/${derived}_vala.stamp\n"
+             . "\t\@if test -f \$@; then :; else rm -f \$(srcdir)/${derived}_vala.stamp; fi\n"
+             . "\t\@if test -f \$@; then :; else \\\n"
 -            . "\t  \$(MAKE) \$(AM_MAKEFLAGS) \$(srcdir)/${derived}_vala.stamp; \\\n"
++            . "\t  \$(MAKE) \$(srcdir)/${derived}_vala.stamp; \\\n"
+             . "\tfi\n";
+         $clean_files{$c_file} = MAINTAINER_CLEAN;
+         }
      }
  
    # Add rebuild rules for generated header and vapi files
@@@ -5749,11 -5848,11 +5753,11 @@@
          if (grep (/$lastflag/, ('-H', '-h', '--header', '--internal-header',
                                  '--vapi', '--internal-vapi', '--gir')))
            {
-             my $headerfile = $flag;
-             $output_rules .= "\$(srcdir)/$headerfile: \$(srcdir)/${derived}_vala.stamp\n"
+             my $headerfile = "\$(srcdir)/$flag";
+             $output_rules .= "$headerfile: \$(srcdir)/${derived}_vala.stamp\n"
                . "\t\@if test -f \$@; then :; else rm -f \$(srcdir)/${derived}_vala.stamp; fi\n"
                . "\t\@if test -f \$@; then :; else \\\n"
 -              . "\t  \$(MAKE) \$(AM_MAKEFLAGS) \$(srcdir)/${derived}_vala.stamp; \\\n"
 +              . "\t  \$(MAKE) \$(srcdir)/${derived}_vala.stamp; \\\n"
                . "\tfi\n";
  
              # valac is not used when building from dist tarballs

diff --cc lib/am/check.am
index abdbd01a09c55149f2b1804dbab5d9f59a6aafca,78665708d03f5ce6738405437de986241cba3968..395f8d2bf82cc2b7a1ca417ffcfd47214e7820f0
--- 1/lib/am/check.am
--- 2/lib/am/check.am
+++ b/lib/am/check.am
@@@ -334,10 -364,11 +334,11 @@@ check-TESTS recheck
          test -z "$$log_list" || rm -f $$log_list; \
          test -z "$$trs_list" || rm -f $$trs_list; \
        fi; \
 -      $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"
 +      $(MAKE) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"
  
  ## Recheck must depend on $(check_SCRIPTS), $(check_PROGRAMS), etc.
- recheck: %CHECK_DEPS%
+ ## It must also depend on the 'all' target.  See automake bug#11252.
+ recheck: all %CHECK_DEPS%
  
  AM_RECURSIVE_TARGETS += check recheck
  

diff --cc syntax-checks.mk
Simple merge

diff --cc t/list-of-tests.mk
Simple merge

diff --cc t/vala-vpath.sh
index d863c8e92b2e1db06fbb678a56a79757e5032116,ae2d792a9f05c10004c93ac60a9e02cfe76ba99f..2670cb9adaa3cd9f88c3afa9bdf08a239d488631
--- 1/t/vala-vpath.sh
--- 2/t/vala-vpath.sh
+++ b/t/vala-vpath.sh
@@@ -17,7 -17,7 +17,7 @@@
  # Test to make sure vala support handles from-scratch VPATH builds.
  # See automake bug#8753.
  
- required=valac
 -required="cc valac GNUmake"
++required="cc valac"
  . ./defs || Exit 1
  
  cat >> configure.ac << 'END'

diff --cc t/vala2.sh
index 199c2941ab97c5f5c9e560faa10cb604ce4bf8e7,4ed1c79e789c4c956fd5ef45f32ed3dfe23a5e96..407ccac3854d4d3d989ba3deb07fe2b13c050960
--- 1/t/vala2.sh
--- 2/t/vala2.sh
+++ b/t/vala2.sh
@@@ -16,7 -16,7 +16,7 @@@
  
  # Test to make sure compiling Vala code really works with recursive make.
  
- required="libtool libtoolize pkg-config valac gcc"
 -required="pkg-config valac gcc GNUmake"
++required="pkg-config valac gcc"
  . ./defs || Exit 1
  
  mkdir src

diff --cc t/vala3.sh
index 641268fa501915097d1c225e71e543440f8b7cec,bb9bc15d3aef622861c7fb4ca608a865e31f6ccd..b2de400e9f6e69686d65098a2722cefd7d68769e
--- 1/t/vala3.sh
--- 2/t/vala3.sh
+++ b/t/vala3.sh
@@@ -16,7 -16,7 +16,7 @@@
  
  # Test to make sure compiling Vala code really works with non-recursive make.
  
- required="libtool libtoolize pkg-config valac gcc"
 -required="pkg-config valac gcc GNUmake"
++required="pkg-config valac gcc"
  . ./defs || Exit 1
  
  mkdir src

diff --cc t/vala5.sh
Simple merge