build: fix 'make distcheck'

I got these distcheck failures with sanlock enabled:

ERROR: files left in build directory after distclean:
./tools/virt-sanlock-cleanup
./src/locking/qemu-sanlock.conf

* src/Makefile.am (DISTCLEANFILES) [HAVE_SANLOCK]: Clean built
file.
* tools/Makefile.am (DISTCLEANFILES): Likewise.

diff --git a/src/Makefile.am b/src/Makefile.am
index 793f67401943f0071d01777bab41fa623b0dca7f..272dfbfc5a39201f5b447c022885db388b245403 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1328,6 +1328,7 @@ $(builddir)/locking/%-sanlock.conf: $(srcdir)/locking/sanlock.conf
 if WITH_QEMU
 conf_DATA += locking/qemu-sanlock.conf
 BUILT_SOURCES += locking/qemu-sanlock.conf
+DISTCLEANFILES += locking/qemu-sanlock.conf
 endif
 else
 EXTRA_DIST += $(LOCK_DRIVER_SANLOCK_SOURCES)

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 8a8be1a4cbef13e7b4f73f4bc2123fe26b8ac5e2..c96c7d9c3d0e35efd4aa40ce19fab5baaf4587b9 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -28,11 +28,14 @@ EXTRA_DIST = \
        libvirt-guests.init.sh                          \
        libvirt-guests.sysconf
 
+DISTCLEANFILES =
+
 bin_SCRIPTS = virt-xml-validate virt-pki-validate
 bin_PROGRAMS = virsh
 
 if HAVE_SANLOCK
 sbin_SCRIPTS = virt-sanlock-cleanup
+DISTCLEANFILES += virt-sanlock-cleanup
 endif
 
 dist_man1_MANS = virt-xml-validate.1 virt-pki-validate.1 virsh.1
@@ -187,4 +190,4 @@ CLEANFILES = $(bin_SCRIPTS)
 CLEANFILES += *.gcov .libs/*.gcda .libs/*.gcno *.gcno *.gcda *.i *.s
 MAINTAINERCLEANFILES = $(dist_man1_MANS)
 
-DISTCLEANFILES = $(BUILT_SOURCES)
+DISTCLEANFILES += $(BUILT_SOURCES)