diff options
| author | Matthew Booth <mbooth@redhat.com> | 2009-11-20 18:45:22 +0000 |
|---|---|---|
| committer | Richard Jones <rjones@redhat.com> | 2009-11-21 21:14:03 +0000 |
| commit | a7a88083f0c9d83828dc9154c1c053fcd735d9ba (patch) | |
| tree | eed4b6771b7884a47a2658d9c9c7c6aaecba5dba | |
| parent | 1b60344e672e4fc233d7fe6b8ecfcda46a40f4d5 (diff) | |
| download | libguestfs-a7a88083f0c9d83828dc9154c1c053fcd735d9ba.tar.gz libguestfs-a7a88083f0c9d83828dc9154c1c053fcd735d9ba.tar.xz libguestfs-a7a88083f0c9d83828dc9154c1c053fcd735d9ba.zip | |
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.
| -rw-r--r-- | perl/Makefile.am | 13 | ||||
| -rw-r--r-- | subdir-rules.mk | 5 |
2 files changed, 17 insertions, 1 deletions
diff --git a/perl/Makefile.am b/perl/Makefile.am index b7662443..c1922900 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 70ab8a27..b73fc9d3 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 |