[libvirt] [PATCH 07/13] build: Group files
Define $(PODFILES) and $(MANINFILES) so that adding a new man
page only requires changes in a few, well defined spots.
---
daemon/Makefile.am | 14 +++++++++++---
src/Makefile.am | 21 ++++++++++++++-------
tools/Makefile.am | 39 ++++++++++++++++++++++++---------------
3 files changed, 49 insertions(+), 25 deletions(-)
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 6a82cc9..9a8b8d1 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -46,6 +46,14 @@ DAEMON_SOURCES = \
LIBVIRTD_CONF_SOURCES = libvirtd-config.c libvirtd-config.h
+PODFILES = \
+ libvirtd.pod \
+ $(NULL)
+
+MANINFILES = \
+ libvirtd.8.in \
+ $(NULL)
+
DISTCLEANFILES =
EXTRA_DIST = \
remote_dispatch.h \
@@ -70,8 +78,8 @@ EXTRA_DIST = \
libvirtd.uml.logrotate.in \
test_libvirtd.aug.in \
THREADS.txt \
- libvirtd.pod \
- libvirtd.8.in \
+ $(PODFILES) \
+ $(MANINFILES) \
$(DAEMON_SOURCES) \
$(LIBVIRTD_CONF_SOURCES) \
$(NULL)
@@ -539,4 +547,4 @@ endif ! WITH_SASL
CLEANFILES += $(BUILT_SOURCES) $(man8_MANS)
CLEANFILES += *.cov *.gcov .libs/*.gcda .libs/*.gcno *.gcno *.gcda
-MAINTAINERCLEANFILES = libvirtd.8.in $(DAEMON_GENERATED)
+MAINTAINERCLEANFILES = $(MANINFILES) $(DAEMON_GENERATED)
diff --git a/src/Makefile.am b/src/Makefile.am
index fcbcd44..73e4026 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2586,25 +2586,32 @@ augeas_DATA += locking/virtlockd.aug logging/virtlogd.aug
augeastest_DATA += test_virtlockd.aug test_virtlogd.aug
endif WITH_LIBVIRTD
-CLEANFILES += test_virtlockd.aug virtlockd.8 \
- test_virtlogd.aug virtlogd.8
-MAINTAINERCLEANFILES += virtlockd.8.in virtlogd.8.in
+PODFILES = \
+ locking/virtlockd.pod \
+ logging/virtlogd.pod \
+ $(NULL)
+
+MANINFILES = \
+ virtlockd.8.in \
+ virtlogd.8.in \
+ $(NULL)
+
+CLEANFILES += test_virtlockd.aug test_virtlogd.aug $(man8_MANS)
+MAINTAINERCLEANFILES += $(MANINFILES)
EXTRA_DIST += \
locking/virtlockd.service.in \
locking/virtlockd.socket.in \
- locking/virtlockd.pod \
- virtlockd.8.in \
locking/virtlockd.aug \
locking/virtlockd.conf \
locking/test_virtlockd.aug.in \
logging/virtlogd.service.in \
logging/virtlogd.socket.in \
- logging/virtlogd.pod \
- virtlogd.8.in \
logging/virtlogd.aug \
logging/virtlogd.conf \
logging/test_virtlogd.aug.in \
+ $(PODFILES) \
+ $(MANINFILES) \
$(NULL)
diff --git a/tools/Makefile.am b/tools/Makefile.am
index dab5958..913689f 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -35,26 +35,32 @@ ICON_FILES = \
libvirt_win_icon_64x64.ico \
virsh_win_icon.rc
+PODFILES = \
+ virt-admin.pod \
+ virt-host-validate.pod \
+ virt-login-shell.pod \
+ virt-pki-validate.pod \
+ virt-sanlock-cleanup.pod \
+ virt-xml-validate.pod \
+ virsh.pod \
+ $(NULL)
+
+MANINFILES = \
+ virt-admin.1.in \
+ virt-host-validate.1.in \
+ virt-login-shell.1.in \
+ virt-pki-validate.1.in \
+ virt-sanlock-cleanup.8.in \
+ virt-xml-validate.1.in \
+ virsh.1.in \
+ $(NULL)
+
EXTRA_DIST = \
$(ICON_FILES) \
$(conf_DATA) \
virt-xml-validate.in \
virt-pki-validate.in \
virt-sanlock-cleanup.in \
- virt-admin.pod \
- virt-host-validate.pod \
- virt-login-shell.pod \
- virt-pki-validate.pod \
- virt-sanlock-cleanup.pod \
- virt-xml-validate.pod \
- virsh.pod \
- virt-admin.1.in \
- virt-host-validate.1.in \
- virt-login-shell.1.in \
- virt-pki-validate.1.in \
- virt-sanlock-cleanup.8.in \
- virt-xml-validate.1.in \
- virsh.1.in \
libvirt-guests.sysconf \
virsh-edit.c \
virsh-domain.c \
@@ -63,7 +69,10 @@ EXTRA_DIST = \
virsh-network.c virsh-nodedev.c \
virsh-nwfilter.c virsh-pool.c \
virsh-secret.c virsh-snapshot.c \
- virsh-volume.c
+ virsh-volume.c \
+ $(PODFILES) \
+ $(MANINFILES) \
+ $(NULL)
CLEANFILES =
--
2.5.5