X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=perl%2FMakefile.am;h=e924cb1d6134af1b7ddbf09b9582793488717f24;hp=4b7ed99377db693787002198c1d61884d7ea8d5d;hb=cd077b8229731e292798f34dd56892cbfa6f1e0e;hpb=811b4a51dc25219e19527304892e7f688867e105

diff --git a/perl/Makefile.am b/perl/Makefile.am
index 4b7ed99..e924cb1 100644
--- a/perl/Makefile.am
+++ b/perl/Makefile.am
@@ -13,19 +13,24 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+include $(top_srcdir)/subdir-rules.mk
+
+generator_built = \
+	Guestfs.xs \
+	lib/Sys/Guestfs.pm \
+	bindtests.pl
 
 EXTRA_DIST = \
+	$(generator_built) \
 	Makefile.PL.in \
-	Guestfs.xs \
 	examples/README \
 	examples/LICENSE \
 	examples/*.pl \
-	lib/Sys/Guestfs.pm \
 	lib/Sys/Guestfs/Lib.pm \
 	run-bindtests \
 	run-perl-tests \
-	bindtests.pl \
 	t/*.t \
 	typemap
 
@@ -34,15 +39,27 @@ if HAVE_PERL
 # Interfacing automake and ExtUtils::MakeMaker known to be
 # a nightmare, news at 11.
 
+# src/ dependencies
+.PHONY: src_deps
+src_deps: $(top_builddir)/src/libguestfs.la $(generator_built)
+
+# Images used by tests
+.PHONY: test_images
+test_images:
+	$(MAKE) -C $(top_builddir)/tests/data
+
 TESTS = run-bindtests run-perl-tests
 
+$(TESTS): src_deps all appliance test_images
+
 TESTS_ENVIRONMENT = \
 	LD_LIBRARY_PATH=$(top_builddir)/src/.libs \
-	LIBGUESTFS_PATH=$(top_builddir)/appliance
+	LIBGUESTFS_PATH=$(top_builddir)/appliance \
+	TMPDIR=$(top_builddir)
 
 INSTALLDIRS = site
 
-all: Makefile-pl
+all: Makefile-pl src_deps
 	$(MAKE) -f Makefile-pl
 
 Makefile-pl: Makefile.PL