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

@@ -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				\
@@ -69,8 +77,8 @@ EXTRA_DIST =						\
 	libvirtd.uml.logrotate.in                       \
 	test_libvirtd.aug.in                             \
 	THREADS.txt					\
-	libvirtd.pod					\
+	$(PODFILES)					\
-	libvirtd.8.in					\
+	$(MANINFILES)					\
 	$(DAEMON_SOURCES)				\
 	$(LIBVIRTD_CONF_SOURCES)			\
 	$(NULL)
@@ -529,4 +537,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)

src/Makefile.am

@@ -2588,25 +2588,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 \
+PODFILES = \
-	      test_virtlogd.aug virtlogd.8
+	locking/virtlockd.pod \
-MAINTAINERCLEANFILES += virtlockd.8.in virtlogd.8.in
+	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)
 
 

tools/Makefile.am

@@ -35,12 +35,7 @@ ICON_FILES = \
 	libvirt_win_icon_64x64.ico \
 	virsh_win_icon.rc
 
-EXTRA_DIST = \
+PODFILES = \
-	$(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 \
@@ -48,6 +43,9 @@ EXTRA_DIST = \
 	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 \
@@ -55,6 +53,14 @@ EXTRA_DIST = \
 	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				\
 	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 =