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.
This commit is contained in:
Matthew Booth
2009-11-20 18:45:22 +00:00
committed by Richard Jones
parent 1b60344e67
commit a7a88083f0
2 changed files with 17 additions and 1 deletions

View File

@@ -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

View File

@@ -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