[libvirt] [PATCH] build: fix testing of augeas files in VPATH builds

[Eric Blake]

On 05/29/2012 01:28 PM, Eric Blake wrote:
> Without this fix, a VPATH build fails with messages like:
> 
> make[3]: Entering directory `/home/remote/eblake/libvirt-tmp2/build/daemon'
> ../../build-aux/augeas-gentest.pl libvirtd.conf ../../daemon/test_libvirtd.aug.in test_libvirtd.aug
> cannot read libvirtd.conf: No such file or directory at ../../build-aux/augeas-gentest.pl line 38.
> 
> * daemon/Makefile.am (AUG_GENTEST): Factor out definition.
> (test_libvirtd.aug): Look for correct file.
> * src/Makefile.am (AUG_GENTEST): Use $(PERL).
> (qemu/test_libvirtd_qemu.aug, lxc/test_libvirtd_lxc.aug)
> (locking/test_libvirt_sanlock.aug): Ensure destination dir exists.
> ---
> 
> This is one alternative for a fix for a build-breaker, but I'm not
> pushing it without a review.  In particular, I still have a question:
> 
> Should the various test_*.aug files be in the tarball?  Right now,
> they are listed under EXTRA_DIST (so they are shipped pre-built),
> but also listed under CLEANFILES (so 'make clean' must regenerate
> them).  Generating the files requires perl, which is a non-standard
> requirement.  Either we require end-users to have perl in order to
> build from a libvirt tarball, and change the tarball to exclude
> files that perl can generate; or we fix the use of CLEANFILES to
> instead be DISTCLEANFILES or even MAINTAINERCLEANFILES (end users
> need not have perl if they don't alter any sources, but we should
> then be generating the files into $(srcdir) rather than into the
> build tree).
> 

In fact, 'make check' still expects things to live in $(srcdir), so I
think I'll have to post a v2 of this patch that follows the example here:

> For another example of a perl-generated file, remote_protocol.h is
> currently shipped in the tarball, and requires perl for generation,
> but it is generated into the $(srcdir) and only cleaned by
> MAINTAINERCLEANFILES.

by always generating the files into $(srcdir), and ensuring that 'make
clean' doesn't remove them.

-- 
Eric Blake   eblake at redhat.com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 620 bytes
Desc: OpenPGP digital signature
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20120529/85ae942d/attachment-0001.sig>