search for: src_dep

For convenience you can pull it from the 'build' branch in: git://heisenbug.com/matthew/libguestfs.git Matt

version 2: - Fixed handling of clean & distclean. - Use 'all-local' instead of 'all'. - Don't use abs_* paths in Build.PL.in. Rich.

...fy/Makefile.am | 8 +++++--- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/perl/Makefile.am b/perl/Makefile.am index eff0059..5e29bbd 100644 --- a/perl/Makefile.am +++ b/perl/Makefile.am @@ -40,11 +40,9 @@ if HAVE_PERL # 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 @@ -76,3 +74,5 @@ install-data-hook: $(MAKE) -f Makefile-pl DESTDIR=$(DESTDIR) install endif + +.PHONY: src_deps test_images diff...

Switch from 'ExtUtils::MakeMaker' to 'Module::Build'. There's not really a huge difference here. The interfacing gymnastics that we have to do to make Makefile.am and Module::Build talk to each other is probably a little bit simpler. I compared the output of 'make install' before and after, and there's not much difference. 'perllocal.pod' is not

version 3: - Split requires into configure_requires/etc. - Use lists for extra_compiler_flags, extra_linker_flags. - Suppress .packlist file. - Set the release_status field. Rich.

...$MAKE. --- perl/Makefile.am | 4 +++- perl/run-perl-tests | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/perl/Makefile.am b/perl/Makefile.am index a0ae863..4632719 100644 --- a/perl/Makefile.am +++ b/perl/Makefile.am @@ -41,7 +41,9 @@ TESTS = run-perl-tests $(TESTS): src_deps all -TESTS_ENVIRONMENT = ../run +TESTS_ENVIRONMENT = \ + MAKE=$(MAKE) \ + ../run INSTALLDIRS = site diff --git a/perl/run-perl-tests b/perl/run-perl-tests index 770df94..e36c066 100755 --- a/perl/run-perl-tests +++ b/perl/run-perl-tests @@ -18,4 +18,4 @@ set -e -make -f Makefile-pl t...

...$Config{ccflags} . ' -DGUESTFS_PRIVATE=1 @CFLAGS@', ); diff --git a/perl/Makefile.am b/perl/Makefile.am index 780024f..7b8f5d3 100644 --- a/perl/Makefile.am +++ b/perl/Makefile.am @@ -64,20 +64,10 @@ TESTS_ENVIRONMENT = $(top_builddir)/run --test INSTALLDIRS = site all: Makefile-pl src_deps - $(MAKE) -C $(srcdir) -f $(abs_builddir)/Makefile-pl \ - INST_ARCHLIB=$(abs_builddir)/blib/arch \ - INST_SCRIPT=$(abs_builddir)/blib/script \ - INST_BIN=$(abs_builddir)/blib/bin \ - INST_LIB=$(abs_builddir)/blib/lib \ - INST_MAN1DIR=$(abs_builddir)/blib/man1 \ - INST_MAN3DIR=$(abs_builddir)...

...@abs_builddir@/Makefile-pl', NAME => 'Win::Hivex', VERSION => '@PACKAGE_VERSION@', diff --git a/perl/Makefile.am b/perl/Makefile.am index 22dd98c..ec49192 100644 --- a/perl/Makefile.am +++ b/perl/Makefile.am @@ -42,16 +42,24 @@ TESTS = run-perl-tests $(TESTS): src_deps all TESTS_ENVIRONMENT = \ - LD_LIBRARY_PATH=$(top_builddir)/lib/.libs + LD_LIBRARY_PATH=$(top_builddir)/lib/.libs \ + srcdir=$(abs_srcdir) INSTALLDIRS = site all: Makefile-pl src_deps - $(MAKE) -f Makefile-pl + $(MAKE) -C $(srcdir) -f $(abs_builddir)/Makefile-pl \ + INST_ARCHLIB=$(abs_bu...

Here are some of the patches that I have maintained in the patch queue of my packages that I maintain within the Debian distribution (http://packages.qa.debian.org/libg/libguestfs.html). All of them address FTBFS (fail to build from source) errors that happened with the particular configuration that is used for building the Debian package. Cheers, -Hilko

--- perl/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/perl/Makefile.am b/perl/Makefile.am index 7b8f5d3..1eb0469 100644 --- a/perl/Makefile.am +++ b/perl/Makefile.am @@ -67,6 +67,7 @@ all: Makefile-pl src_deps $(MAKE) -f Makefile-pl Makefile-pl: Makefile.PL + -[ $(srcdir) != $(builddir) ] && cp -rsu $(abs_srcdir)/. $(builddir)/. perl Makefile.PL INSTALLDIRS=$(INSTALLDIRS) PREFIX=$(prefix) # No! Otherwise it is deleted before the clean-local rule runs. -- 1.7.10.4

...TH},:${LD_LIBRARY_PATH},} \ LIBGUESTFS_PATH=$(top_builddir)/appliance \ TMPDIR=$(top_builddir) \ $(VG) diff --git a/perl/Makefile.am b/perl/Makefile.am index 4c78f87..4f86de1 100644 --- a/perl/Makefile.am +++ b/perl/Makefile.am @@ -51,7 +51,7 @@ TESTS = run-bindtests run-perl-tests $(TESTS): src_deps all appliance test_images TESTS_ENVIRONMENT = \ - LD_LIBRARY_PATH=$(top_builddir)/src/.libs \ + LD_LIBRARY_PATH=$(top_builddir)/src/.libs${if ${LD_LIBRARY_PATH},:${LD_LIBRARY_PATH},} \ LIBGUESTFS_PATH=$(top_builddir)/appliance \ TMPDIR=$(top_builddir) diff --git a/resize/Makefile.am b/res...

Here are three patches that fix issues with out-of-tree building and one that uses Ruby's own autoconf stuff for determining how Ruby bindings should be built. Cheers, -Hilko

--- cat/Makefile.am | 6 +++--- df/Makefile.am | 2 +- edit/Makefile.am | 2 +- examples/Makefile.am | 12 ++++++------ fish/Makefile.am | 18 +++++++++--------- fuse/Makefile.am | 2 +- inspector/Makefile.am | 2 +- java/examples/Makefile.am | 6 +++--- ocaml/examples/Makefile.am | 6 +++---

Since v2: - Add perl tests. - Reworked and fixed the tests for virt-builder. - Some further minor bug fixes.

Since v3: - A large number of fixes, especially for running the tests on installed libguestfs. - Fixed EXTRA_DIST rules throughout. - Extra patch 17/17 which is a tidy-up of the generated XML listing guests. Rich.