On Tue, Jun 28, 2011 at 10:22:17PM -0600, Eric Blake wrote: > EXTRA_DIST is intended for files that must unconditionally be > part of the tarball, so it should be outside HAVE_SANLOCK. > Once that is fixed, then there is no need to cp an unchanged > qemu-sanlock.conf from srcdir to builddir in a VPATH build, > not to mention that $(builddir) is not supported in the automake > in use in RHEL 5. > > * src/Makefile.am ($(builddir)/locking/%-sanlock.conf): Delete. > (BUILT_SOURCES): No need to build qemu-sanlock.conf. > (EXTRA_DIST): Always ship sanlock .aug and .conf files. > --- > > As promised in: > https://www.redhat.com/archives/libvir-list/2011-June/msg01448.html > > I'm starting a 'make distcheck' overnight to fully test this, > but think that it will pass without issues. > > src/Makefile.am | 15 +++++---------- > 1 files changed, 5 insertions(+), 10 deletions(-) > > diff --git a/src/Makefile.am b/src/Makefile.am > index 8f99cc2..bfbaa06 100644 > --- a/src/Makefile.am > +++ b/src/Makefile.am > @@ -1186,6 +1186,10 @@ libvirt_qemu_la_LIBADD = libvirt.la $(CYGWIN_EXTRA_LIBADD) > EXTRA_DIST += $(LIBVIRT_QEMU_SYMBOL_FILE) > > > +EXTRA_DIST += locking/sanlock.conf \ > + locking/libvirt_sanlock.aug \ > + locking/test_libvirt_sanlock.aug > + > if HAVE_SANLOCK > lockdriverdir = $(libdir)/libvirt/lock-driver > lockdriver_LTLIBRARIES = sanlock.la > @@ -1199,20 +1203,11 @@ sanlock_la_LIBADD = -lsanlock \ > augeas_DATA += locking/libvirt_sanlock.aug > augeastest_DATA += locking/test_libvirt_sanlock.aug > > -EXTRA_DIST += locking/sanlock.conf \ > - locking/libvirt_sanlock.aug \ > - locking/test_libvirt_sanlock.aug > - > -$(builddir)/locking/%-sanlock.conf: $(srcdir)/locking/sanlock.conf > - $(AM_V_GEN)mkdir locking ; \ > - cp $< $@ How does 'qemu-sanlock.conf' get created now ? This rule is what actually tells make how to create 'qemu-sanlock.conf' from 'sanlock.conf' Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :| -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list