From a7a88083f0c9d83828dc9154c1c053fcd735d9ba Mon Sep 17 00:00:00 2001
From: Matthew Booth <mbooth@redhat.com>
Date: Fri, 20 Nov 2009 18:45:22 +0000
Subject: [PATCH] build: Add missing dependencies in perl directory

make all in the perl directory was missing a check that the library had been
built.

make check in the perl directory was missing a check that the appliance and test
images had been built.
---
 perl/Makefile.am | 13 ++++++++++++-
 subdir-rules.mk  |  5 +++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/perl/Makefile.am b/perl/Makefile.am
index b766244..c192290 100644
--- a/perl/Makefile.am
+++ b/perl/Makefile.am
@@ -39,15 +39,26 @@ 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 $(generator_built)
+all: Makefile-pl src_deps
 	$(MAKE) -f Makefile-pl
 
 Makefile-pl: Makefile.PL
diff --git a/subdir-rules.mk b/subdir-rules.mk
index 70ab8a2..b73fc9d 100644
--- a/subdir-rules.mk
+++ b/subdir-rules.mk
@@ -31,3 +31,8 @@ $(top_builddir)/src/stamp-generator: force
 # The daemon
 $(top_builddir)/daemon/guestfsd: force
 	$(MAKE) -C $(top_builddir)/daemon
+
+# A symbolic rule to regenerate the appliance
+.PHONY: appliance
+appliance: force
+	$(MAKE) -C $(top_builddir)/appliance
-- 
1.8.3.1