From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Wed, 18 Apr 2012 12:11:22 +0000 (+0200)
Subject: Merge branch 'master' into ng/master
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=99d3c8ae43a45a820024407dd7c4a6ab6733b530;p=thirdparty%2Fautomake.git

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
---

99d3c8ae43a45a820024407dd7c4a6ab6733b530
diff --cc automake.in
index bb475286c,38e09dcad..6ace0522f
--- a/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 abdbd01a0,78665708d..395f8d2bf
--- a/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 t/vala-vpath.sh
index d863c8e92,ae2d792a9..2670cb9ad
--- a/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 199c2941a,4ed1c79e7..407ccac38
--- a/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 641268fa5,bb9bc15d3..b2de400e9
--- a/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