]> git.ipfire.org Git - thirdparty/automake.git/commitdiff
Merge branch 'master' into ng/master
authorStefano Lattarini <stefano.lattarini@gmail.com>
Tue, 24 Apr 2012 08:52:34 +0000 (10:52 +0200)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Tue, 24 Apr 2012 08:52:34 +0000 (10:52 +0200)
* master:
  coverage: test the internal $(am__relativize) variable
  coverage: parallel make with vala
  vala: configure exit with status 77, not 1, if valac version is too old

1  2 
t/list-of-tests.mk
t/vala-headers.sh
t/vala-libs.sh
t/vala-vpath.sh
t/vala2.sh
t/vala3.sh
t/vala5.sh

index 5c67db56739675410ff34a3066fe2d1a1c126c49,fef716517a798f098491b6dcada6f32b021c7d87..57bb8adbeccb0b1c0f25eb0486d63ef5f5ce2b75
@@@ -1195,8 -1203,9 +1196,9 @@@ t/vala-libs.sh 
  t/vala-vpath.sh \
  t/vala-mix.sh \
  t/vala-mix2.sh \
+ t/vala-parallel.sh \
  t/vars.sh \
 -t/vars3.sh \
 +t/vars-assign.sh \
  t/vartar.sh \
  t/vartypos.sh \
  t/vartypo2.sh \
Simple merge
diff --cc t/vala-libs.sh
Simple merge
diff --cc t/vala-vpath.sh
Simple merge
diff --cc t/vala2.sh
Simple merge
diff --cc t/vala3.sh
Simple merge
diff --cc t/vala5.sh
Simple merge