The generated source files for dispatching libvirtd RPC messages contain translations and are thus listed in POTFILES. This means they are required in order to build libvirt.pot. Rather than changing the files that go into libvirt.pot dynamically, just unconditionally build the remote driver sources so they are always available for building libvirt.pot. This ensures we don't silently loose translation messages based on configure args. This fixes the mingw build which needs to create libvirt.pot but has libvirtd disabled. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com&gt; --- Pushed to fix mingw build src/remote/Makefile.inc.am | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am index 12600b8bb5..eb8d6feb31 100644 --- a/src/remote/Makefile.inc.am +++ b/src/remote/Makefile.inc.am @@ -81,6 +81,17 @@ EXTRA_DIST += \ remote/libvirtd.sysctl \ $(NULL) +# Needed to build libvirt.pot, so must be listed outside +# the WITH_REMOTE/WITH_LIBVIRTD conditionals +BUILT_SOURCES += \ + $(REMOTE_DRIVER_GENERATED) \ + $(LIBVIRTD_GENERATED) \ + $(NULL) +MAINTAINERCLEANFILES += \ + $(REMOTE_DRIVER_GENERATED) \ + $(LIBVIRTD_GENERATED) \ + $(NULL) + if WITH_REMOTE noinst_LTLIBRARIES += libvirt_driver_remote.la libvirt_la_BUILT_LIBADD += libvirt_driver_remote.la @@ -93,9 +104,6 @@ libvirt_driver_remote_la_CFLAGS = \ libvirt_driver_remote_la_LDFLAGS = $(AM_LDFLAGS) libvirt_driver_remote_la_SOURCES = $(REMOTE_DRIVER_SOURCES) -BUILT_SOURCES += $(REMOTE_DRIVER_GENERATED) -MAINTAINERCLEANFILES += $(REMOTE_DRIVER_GENERATED) - endif WITH_REMOTE if WITH_REMOTE @@ -108,9 +116,6 @@ if WITH_LIBVIRTD sbin_PROGRAMS += libvirtd -BUILT_SOURCES += $(LIBVIRTD_GENERATED) -MAINTAINERCLEANFILES += $(LIBVIRTD_GENERATED) - augeas_DATA += remote/libvirtd.aug augeastest_DATA += test_libvirtd.aug -- 2.14.3