X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=perl%2FMakefile.am;h=b7662443fe095005eb3b11f57265110bdbe24fe6;hb=1b60344e672e4fc233d7fe6b8ecfcda46a40f4d5;hp=24548ed9e73e82cd09e7bf87ef0c1fe8a30822c9;hpb=b5ff6816face6f8c1700d4f1df752c710620ff95;p=libguestfs.git

diff --git a/perl/Makefile.am b/perl/Makefile.am
index 24548ed..b766244 100644
--- a/perl/Makefile.am
+++ b/perl/Makefile.am
@@ -15,29 +15,51 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-EXTRA_DIST = \
-	Makefile.PL.in \
+include $(top_srcdir)/subdir-rules.mk
+
+generator_built = \
 	Guestfs.xs \
-	typemap \
 	lib/Sys/Guestfs.pm \
+	bindtests.pl
+
+EXTRA_DIST = \
+	$(generator_built) \
+	Makefile.PL.in \
 	examples/README \
 	examples/LICENSE \
 	examples/*.pl \
-	t/*.t
+	lib/Sys/Guestfs/Lib.pm \
+	run-bindtests \
+	run-perl-tests \
+	t/*.t \
+	typemap
 
 if HAVE_PERL
 
 # Interfacing automake and ExtUtils::MakeMaker known to be
 # a nightmare, news at 11.
 
-TESTS = run-perl-tests
+TESTS = run-bindtests run-perl-tests
+
+TESTS_ENVIRONMENT = \
+	LD_LIBRARY_PATH=$(top_builddir)/src/.libs \
+	LIBGUESTFS_PATH=$(top_builddir)/appliance
 
 INSTALLDIRS = site
 
-all:
-	perl Makefile.PL INSTALLDIRS=$(INSTALLDIRS) PREFIX=$(prefix)
+all: Makefile-pl $(generator_built)
 	$(MAKE) -f Makefile-pl
 
+Makefile-pl: Makefile.PL
+	perl Makefile.PL INSTALLDIRS=$(INSTALLDIRS) PREFIX=$(prefix)
+
+# 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