X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=perl%2FMakefile.am;h=e1a645595439f0cb57f12eecfc71d3a3daa921ae;hp=9e32969329bf7f00d16349f16c9fde2ba14d29e1;hb=f8ee7869f4836427109959cf20e299a31fa86eaf;hpb=a865795a7edfdc939cf3864ca1b7ea9cdc564dc7

diff --git a/perl/Makefile.am b/perl/Makefile.am
index 9e32969..e1a6455 100644
--- a/perl/Makefile.am
+++ b/perl/Makefile.am
@@ -15,17 +15,22 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, 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,24 +39,38 @@ 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)/images
+
 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
 
 INSTALLDIRS = site
 
-all: Makefile-pl
+all: Makefile-pl src_deps
 	$(MAKE) -f Makefile-pl
 
-Makefile-pl: Makefile.PL
+Makefile-pl: Makefile.PL $(top_srcdir)/src/MAX_PROC_NR
+	cd $(top_srcdir) && ./config.status --recheck
 	perl Makefile.PL INSTALLDIRS=$(INSTALLDIRS) PREFIX=$(prefix)
 
-CLEANFILES = Makefile-pl
+# No!  Otherwise it is deleted before the clean-local rule runs.
+#CLEANFILES = Makefile-pl
 
 clean-local:
 	-$(MAKE) -f Makefile-pl clean
+	rm -f Makefile-pl
 
 install-data-hook:
 	$(MAKE) -f Makefile-pl DESTDIR=$(DESTDIR) install