>From cbab9dcb685d2ddb0649c14a16b8a2e54b8528cc Mon Sep 17 00:00:00 2001 From: Ryan Lortie
Date: Sat, 7 Jan 2012 01:08:11 -0500 Subject: [PATCH 2/2] automake: fix VPATH builds for Vala and remove the testcase from XFAIL_TESTS --- automake.in | 4 ++-- tests/Makefile.am | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/automake.in b/automake.in index aa65e56..39876f9 100644 --- a/automake.in +++ b/automake.in @@ -5900,8 +5900,8 @@ sub lang_vala_finish_target ($$) my $silent = silent_flag (); $output_rules .= - "${derived}_vala.stamp: \$(${derived}_SOURCES)\n". - "\t${verbose}${compile} \$(${derived}_SOURCES)\n". + "\$(srcdir)/${derived}_vala.stamp: \$(${derived}_SOURCES)\n". + "\tcd \$(srcdir); ${verbose}${compile} \$(${derived}_SOURCES)\n". "\t${silent}touch address@hidden"; push_dist_common ("${derived}_vala.stamp"); diff --git a/tests/Makefile.am b/tests/Makefile.am index bfd4337..5d5c254 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -52,7 +52,6 @@ pr8365-remake-timing.test \ lex-subobj-nodep.test \ remake-am-pr10111.test \ remake-m4-pr10111.test \ -vala-vpath.test \ txinfo5.test # Some testsuite-influential variables should be overridable from the -- 1.7.7.5