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.

diff --git a/perl/Makefile.am b/perl/Makefile.am
index b766244..c192290 100644 (file)
--- 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.
 
 # 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 = 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
 
 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
        $(MAKE) -f Makefile-pl
 
 Makefile-pl: Makefile.PL

diff --git a/subdir-rules.mk b/subdir-rules.mk
index 70ab8a2..b73fc9d 100644 (file)
--- 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
 # 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