[libvirt] [PATCH 05/41] build: centralize rule for handling generated config files
Instead of adding generated config files to CLEANFILES and BUILT_SOURCES
in each makefile, add them all at once.
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
src/Makefile.am | 3 +++
src/locking/Makefile.inc.am | 8 --------
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index cf6f920576..dbbb94e7f1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -144,6 +144,9 @@ moddir = $(libdir)/libvirt/connection-driver
confdir = $(sysconfdir)/libvirt
conf_DATA += libvirt.conf libvirt-admin.conf
+CLEANFILES += $(nodist_conf_DATA)
+BUILT_SOURCES += $(nodist_conf_DATA)
+
augeasdir = $(datadir)/augeas/lenses
augeastestdir = $(datadir)/augeas/lenses/tests
diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am
index 24d83fdd80..161410051c 100644
--- a/src/locking/Makefile.inc.am
+++ b/src/locking/Makefile.inc.am
@@ -116,14 +116,10 @@ endif WITH_SASL
if WITH_QEMU
augeastest_DATA += locking/test_libvirt_lockd.aug
nodist_conf_DATA += locking/qemu-lockd.conf
-BUILT_SOURCES += locking/qemu-lockd.conf
-DISTCLEANFILES += locking/qemu-lockd.conf
endif WITH_QEMU
if WITH_LIBXL
nodist_conf_DATA += locking/libxl-lockd.conf
-BUILT_SOURCES += locking/libxl-lockd.conf
-DISTCLEANFILES += locking/libxl-lockd.conf
endif WITH_LIBXL
sbin_PROGRAMS += virtlockd
@@ -171,14 +167,10 @@ augeas_DATA += locking/libvirt_sanlock.aug
if WITH_QEMU
augeastest_DATA += locking/test_libvirt_sanlock.aug
nodist_conf_DATA += locking/qemu-sanlock.conf
-BUILT_SOURCES += locking/qemu-sanlock.conf
-DISTCLEANFILES += locking/qemu-sanlock.conf
endif WITH_QEMU
if WITH_LIBXL
nodist_conf_DATA += locking/libxl-sanlock.conf
-BUILT_SOURCES += locking/libxl-sanlock.conf
-DISTCLEANFILES += locking/libxl-sanlock.conf
endif WITH_LIBXL
libexec_PROGRAMS += libvirt_sanlock_helper
--
2.21.0