From: Daniel P. Berrangé <berrange(a)redhat.com&gt; Historically we've allowed builds in the main src dir, but meson does not support this. Explicitly force separate build dir in autotools to align with meson. We must re-enable dependency tracking which the RPM %configure macro turns off. Without this, the build dir doesn't get the source directory tree mirrored. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com&gt; --- Notes: New in v2. configure.ac | 6 ++++++ libvirt.spec.in | 10 +++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 8b53b6ada9..476bba2800 100644 --- a/configure.ac +++ b/configure.ac @@ -17,6 +17,12 @@ dnl License along with this library. If not, see dnl <http://www.gnu.org/licenses/>;. AC_INIT([libvirt], [5.9.0], [libvir-list(a)redhat.com], [], [https://libvirt.org]) + +if test $srcdir = "." +then + AC_MSG_ERROR([Build directory must be different from source directory]) +fi + AC_CONFIG_SRCDIR([src/libvirt.c]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_HEADERS([config.h]) diff --git a/libvirt.spec.in b/libvirt.spec.in index dcad08cb5f..723ced3535 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1163,7 +1163,13 @@ export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/%{name}.spec) %endif rm -f po/stamp-po -%configure --with-runstatedir=%{_rundir} \ + +%define _configure ../configure +mkdir %{_vpath_builddir} +cd %{_vpath_builddir} + +%configure --enable-dependency-tracking \ + --with-runstatedir=%{_rundir} \ %{?arg_qemu} \ %{?arg_openvz} \ %{?arg_lxc} \ @@ -1232,6 +1238,7 @@ rm -fr %{buildroot} export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/%{name}.spec) +cd %{_vpath_builddir} %make_install %{?_smp_mflags} SYSTEMD_UNIT_DIR=%{_unitdir} V=1 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la @@ -1313,6 +1320,7 @@ mv $RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvirt_qemu_probes.stp \ %endif %check +cd %{_vpath_builddir} if ! make %{?_smp_mflags} check VIR_TEST_DEBUG=1 then cat test-suite.log || true -- 2.21.0

Commit <22d8e27ccd5faf48ee2bf288a1b9059aa7ffd28b> introduced our syntax-check.mk file based on gnulib rules. However, the rule was completely ignored as we don't have POTFILES.in file. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com&gt; --- Notes: New in v2. build-aux/syntax-check.mk | 2 +- po/POTFILES | 37 +++++++++++++++++++++++++++++++++++-- 2 files changed, 36 insertions(+), 3 deletions(-) diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk index 033eaf70c4..5890f4737f 100644 --- a/build-aux/syntax-check.mk +++ b/build-aux/syntax-check.mk @@ -1974,7 +1974,7 @@ perl_translatable_files_list_ = \ # Verify that all source files using _() (more specifically, files that # match $(_gl_translatable_string_re)) are listed in po/POTFILES.in. -po_file ?= $(srcdir)/po/POTFILES.in +po_file ?= $(srcdir)/po/POTFILES generated_files ?= $(srcdir)/lib/*.[ch] _gl_translatable_string_re ?= \b(N?_|gettext *)\([^)"]*("|$$) sc_po_check: diff --git a/po/POTFILES b/po/POTFILES index 04eba73725..51317d38b0 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -29,6 +29,7 @@ src/conf/netdev_vport_profile_conf.c src/conf/network_conf.c src/conf/networkcommon_conf.c src/conf/node_device_conf.c +src/conf/node_device_util.c src/conf/numa_conf.c src/conf/nwfilter_conf.c src/conf/nwfilter_params.c @@ -38,9 +39,14 @@ src/conf/snapshot_conf.c src/conf/storage_adapter_conf.c src/conf/storage_conf.c src/conf/virchrdev.c +src/conf/virdomainmomentobjlist.c src/conf/virdomainobjlist.c src/conf/virnetworkobj.c +src/conf/virnetworkportdef.c src/conf/virnodedeviceobj.c +src/conf/virnwfilterbindingdef.c +src/conf/virnwfilterbindingobj.c +src/conf/virnwfilterbindingobjlist.c src/conf/virnwfilterobj.c src/conf/virsavecookie.c src/conf/virsecretobj.c @@ -60,6 +66,7 @@ src/esx/esx_storage_backend_vmfs.c src/esx/esx_storage_driver.c src/esx/esx_stream.c src/esx/esx_util.c +src/esx/esx_util.h src/esx/esx_vi.c src/esx/esx_vi_methods.c src/esx/esx_vi_types.c @@ -128,16 +135,22 @@ src/phyp/phyp_driver.c src/qemu/qemu_agent.c src/qemu/qemu_alias.c src/qemu/qemu_block.c +src/qemu/qemu_blockjob.c src/qemu/qemu_capabilities.c src/qemu/qemu_cgroup.c +src/qemu/qemu_checkpoint.c src/qemu/qemu_command.c src/qemu/qemu_conf.c +src/qemu/qemu_dbus.c src/qemu/qemu_domain.c src/qemu/qemu_domain_address.c src/qemu/qemu_driver.c +src/qemu/qemu_extdevice.c +src/qemu/qemu_firmware.c src/qemu/qemu_hostdev.c src/qemu/qemu_hotplug.c src/qemu/qemu_interface.c +src/qemu/qemu_interop_config.c src/qemu/qemu_migration.c src/qemu/qemu_migration_cookie.c src/qemu/qemu_migration_params.c @@ -146,12 +159,15 @@ src/qemu/qemu_monitor_json.c src/qemu/qemu_monitor_text.c src/qemu/qemu_process.c src/qemu/qemu_qapi.c +src/qemu/qemu_slirp.c +src/qemu/qemu_tpm.c +src/qemu/qemu_vhost_user.c +src/qemu/qemu_vhost_user_gpu.c src/remote/remote_client_bodies.h src/remote/remote_daemon.c src/remote/remote_daemon_config.c src/remote/remote_daemon_dispatch.c src/remote/remote_daemon_dispatch_stubs.h -src/remote/remote_daemon_dispatch_qemu_stubs.h src/remote/remote_daemon_stream.c src/remote/remote_driver.c src/rpc/virkeepalive.c @@ -170,11 +186,13 @@ src/rpc/virnetsocket.c src/rpc/virnetsshsession.c src/rpc/virnettlscontext.c src/secret/secret_driver.c +src/secret/secret_util.c src/security/security_apparmor.c src/security/security_dac.c src/security/security_driver.c src/security/security_manager.c src/security/security_selinux.c +src/security/security_util.c src/security/virt-aa-helper.c src/storage/parthelper.c src/storage/storage_backend.c @@ -182,6 +200,7 @@ src/storage/storage_backend_disk.c src/storage/storage_backend_fs.c src/storage/storage_backend_gluster.c src/storage/storage_backend_iscsi.c +src/storage/storage_backend_iscsi_direct.c src/storage/storage_backend_logical.c src/storage/storage_backend_mpath.c src/storage/storage_backend_rbd.c @@ -190,6 +209,8 @@ src/storage/storage_backend_sheepdog.c src/storage/storage_backend_vstorage.c src/storage/storage_backend_zfs.c src/storage/storage_driver.c +src/storage/storage_file_fs.c +src/storage/storage_file_gluster.c src/storage/storage_util.c src/test/test_driver.c src/util/iohelper.c @@ -201,6 +222,10 @@ src/util/virauthconfig.c src/util/virbitmap.c src/util/virbuffer.c src/util/vircgroup.c +src/util/vircgroupbackend.c +src/util/vircgroupbackend.h +src/util/vircgroupv1.c +src/util/vircgroupv2.c src/util/virclosecallbacks.c src/util/vircommand.c src/util/virconf.c @@ -215,6 +240,7 @@ src/util/virfdstream.c src/util/virfile.c src/util/virfilecache.c src/util/virfirewall.c +src/util/virfirewalld.c src/util/virfirmware.c src/util/virhash.c src/util/virhook.c @@ -232,6 +258,7 @@ src/util/virlockspace.c src/util/virlog.c src/util/virmacmap.c src/util/virmdev.c +src/util/virmodule.c src/util/virnetdev.c src/util/virnetdevbandwidth.c src/util/virnetdevbridge.c @@ -266,15 +293,18 @@ src/util/virstoragefile.c src/util/virstoragefilebackend.c src/util/virstring.c src/util/virsysinfo.c +src/util/virsystemd.c src/util/virthreadjob.c src/util/virthreadpool.c src/util/virtime.c src/util/virtpm.c +src/util/virtypedparam-public.c src/util/virtypedparam.c src/util/viruri.c src/util/virusb.c src/util/virutil.c src/util/virvhba.c +src/util/virvsock.c src/util/virxml.c src/vbox/vbox_MSCOMGlue.c src/vbox/vbox_XPCOMCGlue.c @@ -294,6 +324,7 @@ src/vz/vz_utils.h tests/virpolkittest.c tools/libvirt-guests.sh.in tools/virsh-checkpoint.c +tools/virsh-completer-host.c tools/virsh-console.c tools/virsh-domain-monitor.c tools/virsh-domain.c @@ -309,12 +340,14 @@ tools/virsh-snapshot.c tools/virsh-util.c tools/virsh-volume.c tools/virsh.c +tools/virsh.h tools/virt-admin.c tools/virt-host-validate-bhyve.c tools/virt-host-validate-common.c tools/virt-host-validate-lxc.c tools/virt-host-validate-qemu.c tools/virt-host-validate.c -tools/virt-login-shell.c +tools/virt-login-shell-helper.c +tools/vsh-table.c tools/vsh.c tools/vsh.h -- 2.21.0

Move generated_files variable closer to the sc_po_check rule and remove non-existent gnulib internal path. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com&gt; --- Notes: New in v2. build-aux/syntax-check.mk | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk index 6acda4eea3..985739b373 100644 --- a/build-aux/syntax-check.mk +++ b/build-aux/syntax-check.mk @@ -134,15 +134,6 @@ syntax-check: $(local-check) # We use .gnulib, not gnulib. gnulib_dir = $(srcdir)/.gnulib -# List of additional files that we want to pick up in our POTFILES.in -# This is all gnulib files, as well as generated files for RPC code. -generated_files = \ - $(srcdir)/src/*/{remote_daemon,admin_server,log_daemon,lock_daemon}_dispatch_*stubs.h \ - $(srcdir)/src/lxc/{lxc_monitor,lxc_controller}_dispatch.h \ - $(srcdir)/src/remote/*_client_bodies.h \ - $(srcdir)/src/*/*_protocol.[ch] \ - $(srcdir)/gnulib/lib/*.[ch] - # We haven't converted all scripts to using gnulib's init.sh yet. _test_script_regex = \<\(init\|test-lib\)\.sh\> @@ -1978,7 +1969,16 @@ perl_translatable_files_list_ = \ # Verify that all source files using _() (more specifically, files that # match $(_gl_translatable_string_re)) are listed in po/POTFILES.in. po_file ?= $(srcdir)/po/POTFILES -generated_files ?= $(srcdir)/lib/*.[ch] + +# List of additional files that we want to pick up in our POTFILES.in +# This is all gnulib files, as well as generated files for RPC code. +generated_files = \ + $(srcdir)/src/*/{remote_daemon,admin_server,log_daemon,lock_daemon}_dispatch_*stubs.h \ + $(srcdir)/src/lxc/{lxc_monitor,lxc_controller}_dispatch.h \ + $(srcdir)/src/remote/*_client_bodies.h \ + $(srcdir)/src/*/*_protocol.[ch] \ + $(srcdir)/gnulib/lib/*.[ch] + _gl_translatable_string_re ?= \b(N?_|gettext *)\([^)"]*("|$$) # sc_po_check can fail if generated files are not built first -- 2.21.0

There was no need to handle files for translation from build directory but that will change with following patches where we will stop generating source files into source directory. In order to have them included for translation we have to prefix each file with SRCDIR or BUILDDIR. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com&gt; --- Notes: Changes in v2: - add builddir paths for sc_po_check to detect generated source files and generate correct diff if the check fails build-aux/syntax-check.mk | 8 +- po/Makefile.am | 14 +- po/POTFILES | 353 -------------------------------------- po/POTFILES.in | 353 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 368 insertions(+), 360 deletions(-) delete mode 100644 po/POTFILES create mode 100644 po/POTFILES.in diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk index 985739b373..75993ee284 100644 --- a/build-aux/syntax-check.mk +++ b/build-aux/syntax-check.mk @@ -56,6 +56,7 @@ VC_LIST_ALWAYS_EXCLUDE_REGEX ?= ^$$ # when $(srcdir) is a pathological name like "....", the leading sed command # removes only the intended prefix. _dot_escaped_srcdir = $(subst .,\.,$(srcdir)) +_dot_escaped_builddir = $(subst .,\.,$(builddir)) # Post-process $(VC_LIST) output, prepending $(srcdir)/, but only # when $(srcdir) is not ".". @@ -1968,11 +1969,13 @@ perl_translatable_files_list_ = \ # Verify that all source files using _() (more specifically, files that # match $(_gl_translatable_string_re)) are listed in po/POTFILES.in. -po_file ?= $(srcdir)/po/POTFILES +po_file ?= $(srcdir)/po/POTFILES.in # List of additional files that we want to pick up in our POTFILES.in # This is all gnulib files, as well as generated files for RPC code. generated_files = \ + $(builddir)/src/*.[ch] \ + $(builddir)/src/*/*.[ch] \ $(srcdir)/src/*/{remote_daemon,admin_server,log_daemon,lock_daemon}_dispatch_*stubs.h \ $(srcdir)/src/lxc/{lxc_monitor,lxc_controller}_dispatch.h \ $(srcdir)/src/remote/*_client_bodies.h \ @@ -1989,7 +1992,8 @@ sc_po_check: gen_source_files { $(VC_LIST_EXCEPT); echo $(generated_files); } \ | xargs perl $(perl_translatable_files_list_) \ | xargs $(GREP) -E -l '$(_gl_translatable_string_re)' \ - | $(SED) 's|^$(_dot_escaped_srcdir)/||' \ + | $(SED) 's|^$(_dot_escaped_srcdir)|@SRCDIR@|' \ + | $(SED) 's|^$(_dot_escaped_builddir)|@BUILDDIR@|' \ | sort -u > $@-2; \ diff -u -L $(po_file) -L $(po_file) $@-1 $@-2 \ || { printf '$(ME): '$(fix_po_file_diag) 1>&2; exit 1; }; \ diff --git a/po/Makefile.am b/po/Makefile.am index f3510e6d59..01f27a6e23 100644 --- a/po/Makefile.am +++ b/po/Makefile.am @@ -15,16 +15,21 @@ LANGS := \ uk ur vi wba yo zh_CN zh_HK zh_TW zu -POTFILE_DEPS := $(shell $(SED) 's,^,$(top_srcdir)/,' $(srcdir)/POTFILES) +POTFILES_IN = $(srcdir)/POTFILES.in +POTFILES: $(POTFILES_IN) + $(AM_V_GEN) cat $(POTFILES_IN) | \ + $(SED) 's|[@]SRCDIR[@]|$(top_srcdir)|' | \ + $(SED) 's|[@]BUILDDIR[@]|$(top_builddir)|' > $@ +POTFILE_DEPS = $(shell cat POTFILES) POTFILE := $(DOMAIN).pot POMINIFILES := $(LANGS:%=%.mini.po) POFILES := $(LANGS:%=%.po) GMOFILES := $(LANGS:%=%.gmo) -CLEANFILES = $(POTFILE) $(POFILES) $(GMOFILES) +CLEANFILES = $(POTFILE) $(POFILES) $(GMOFILES) POTFILES EXTRA_DIST = \ - POTFILES \ + $(POTFILES_IN) \ $(POMINIFILES) if HAVE_GNU_GETTEXT_TOOLS @@ -38,7 +43,6 @@ XGETTEXT_ARGS = \ --package-name="$(PACKAGE_NAME)" \ --package-version="$(PACKAGE_VERSION)" \ --msgid-bugs-address="$(MSGID_BUGS_ADDRESS)" \ - --directory=$(top_srcdir) \ $(NULL) SED_PO_FIXUP_ARGS = \ @@ -79,7 +83,7 @@ pull-po: $(POTFILE) $(POTFILE): POTFILES $(POTFILE_DEPS) $(XGETTEXT) -o $@-t $(XGETTEXT_ARGS) \ - --files-from=$(abs_srcdir)/POTFILES + --files-from=$(abs_builddir)/POTFILES $(SED) $(SED_PO_FIXUP_ARGS) < $@-t > $@ rm -f $@-t diff --git a/po/POTFILES b/po/POTFILES deleted file mode 100644 index 51317d38b0..0000000000 --- a/po/POTFILES +++ /dev/null @@ -1,353 +0,0 @@ -gnulib/lib/gai_strerror.c -gnulib/lib/regcomp.c -src/access/viraccessdriverpolkit.c -src/access/viraccessmanager.c -src/admin/admin_server.c -src/admin/admin_server_dispatch.c -src/admin/admin_server_dispatch_stubs.h -src/admin/libvirt-admin.c -src/bhyve/bhyve_capabilities.c -src/bhyve/bhyve_command.c -src/bhyve/bhyve_device.c -src/bhyve/bhyve_domain.c -src/bhyve/bhyve_driver.c -src/bhyve/bhyve_monitor.c -src/bhyve/bhyve_parse_command.c -src/bhyve/bhyve_process.c -src/conf/capabilities.c -src/conf/checkpoint_conf.c -src/conf/cpu_conf.c -src/conf/device_conf.c -src/conf/domain_addr.c -src/conf/domain_capabilities.c -src/conf/domain_conf.c -src/conf/domain_event.c -src/conf/interface_conf.c -src/conf/netdev_bandwidth_conf.c -src/conf/netdev_vlan_conf.c -src/conf/netdev_vport_profile_conf.c -src/conf/network_conf.c -src/conf/networkcommon_conf.c -src/conf/node_device_conf.c -src/conf/node_device_util.c -src/conf/numa_conf.c -src/conf/nwfilter_conf.c -src/conf/nwfilter_params.c -src/conf/object_event.c -src/conf/secret_conf.c -src/conf/snapshot_conf.c -src/conf/storage_adapter_conf.c -src/conf/storage_conf.c -src/conf/virchrdev.c -src/conf/virdomainmomentobjlist.c -src/conf/virdomainobjlist.c -src/conf/virnetworkobj.c -src/conf/virnetworkportdef.c -src/conf/virnodedeviceobj.c -src/conf/virnwfilterbindingdef.c -src/conf/virnwfilterbindingobj.c -src/conf/virnwfilterbindingobjlist.c -src/conf/virnwfilterobj.c -src/conf/virsavecookie.c -src/conf/virsecretobj.c -src/conf/virstorageobj.c -src/cpu/cpu.c -src/cpu/cpu_arm.c -src/cpu/cpu_map.c -src/cpu/cpu_ppc64.c -src/cpu/cpu_s390.c -src/cpu/cpu_x86.c -src/datatypes.c -src/driver.c -src/esx/esx_driver.c -src/esx/esx_network_driver.c -src/esx/esx_storage_backend_iscsi.c -src/esx/esx_storage_backend_vmfs.c -src/esx/esx_storage_driver.c -src/esx/esx_stream.c -src/esx/esx_util.c -src/esx/esx_util.h -src/esx/esx_vi.c -src/esx/esx_vi_methods.c -src/esx/esx_vi_types.c -src/hyperv/hyperv_driver.c -src/hyperv/hyperv_util.c -src/hyperv/hyperv_wmi.c -src/interface/interface_backend_netcf.c -src/interface/interface_backend_udev.c -src/internal.h -src/libvirt-domain-checkpoint.c -src/libvirt-domain-snapshot.c -src/libvirt-domain.c -src/libvirt-host.c -src/libvirt-lxc.c -src/libvirt-network.c -src/libvirt-nodedev.c -src/libvirt-nwfilter.c -src/libvirt-qemu.c -src/libvirt-secret.c -src/libvirt-storage.c -src/libvirt-stream.c -src/libvirt.c -src/libxl/libxl_capabilities.c -src/libxl/libxl_conf.c -src/libxl/libxl_domain.c -src/libxl/libxl_driver.c -src/libxl/libxl_migration.c -src/libxl/xen_common.c -src/libxl/xen_xl.c -src/libxl/xen_xm.c -src/locking/lock_daemon.c -src/locking/lock_daemon_dispatch.c -src/locking/lock_driver_lockd.c -src/locking/lock_driver_sanlock.c -src/locking/lock_manager.c -src/locking/sanlock_helper.c -src/logging/log_daemon.c -src/logging/log_daemon_dispatch.c -src/logging/log_handler.c -src/logging/log_manager.c -src/lxc/lxc_cgroup.c -src/lxc/lxc_conf.c -src/lxc/lxc_container.c -src/lxc/lxc_controller.c -src/lxc/lxc_domain.c -src/lxc/lxc_driver.c -src/lxc/lxc_fuse.c -src/lxc/lxc_hostdev.c -src/lxc/lxc_native.c -src/lxc/lxc_process.c -src/network/bridge_driver.c -src/network/bridge_driver_linux.c -src/network/leaseshelper.c -src/node_device/node_device_driver.c -src/node_device/node_device_hal.c -src/node_device/node_device_udev.c -src/nwfilter/nwfilter_dhcpsnoop.c -src/nwfilter/nwfilter_driver.c -src/nwfilter/nwfilter_ebiptables_driver.c -src/nwfilter/nwfilter_gentech_driver.c -src/nwfilter/nwfilter_learnipaddr.c -src/openvz/openvz_conf.c -src/openvz/openvz_driver.c -src/openvz/openvz_util.c -src/phyp/phyp_driver.c -src/qemu/qemu_agent.c -src/qemu/qemu_alias.c -src/qemu/qemu_block.c -src/qemu/qemu_blockjob.c -src/qemu/qemu_capabilities.c -src/qemu/qemu_cgroup.c -src/qemu/qemu_checkpoint.c -src/qemu/qemu_command.c -src/qemu/qemu_conf.c -src/qemu/qemu_dbus.c -src/qemu/qemu_domain.c -src/qemu/qemu_domain_address.c -src/qemu/qemu_driver.c -src/qemu/qemu_extdevice.c -src/qemu/qemu_firmware.c -src/qemu/qemu_hostdev.c -src/qemu/qemu_hotplug.c -src/qemu/qemu_interface.c -src/qemu/qemu_interop_config.c -src/qemu/qemu_migration.c -src/qemu/qemu_migration_cookie.c -src/qemu/qemu_migration_params.c -src/qemu/qemu_monitor.c -src/qemu/qemu_monitor_json.c -src/qemu/qemu_monitor_text.c -src/qemu/qemu_process.c -src/qemu/qemu_qapi.c -src/qemu/qemu_slirp.c -src/qemu/qemu_tpm.c -src/qemu/qemu_vhost_user.c -src/qemu/qemu_vhost_user_gpu.c -src/remote/remote_client_bodies.h -src/remote/remote_daemon.c -src/remote/remote_daemon_config.c -src/remote/remote_daemon_dispatch.c -src/remote/remote_daemon_dispatch_stubs.h -src/remote/remote_daemon_stream.c -src/remote/remote_driver.c -src/rpc/virkeepalive.c -src/rpc/virnetclient.c -src/rpc/virnetclientprogram.c -src/rpc/virnetclientstream.c -src/rpc/virnetdaemon.c -src/rpc/virnetlibsshsession.c -src/rpc/virnetmessage.c -src/rpc/virnetsaslcontext.c -src/rpc/virnetserver.c -src/rpc/virnetserverclient.c -src/rpc/virnetserverprogram.c -src/rpc/virnetserverservice.c -src/rpc/virnetsocket.c -src/rpc/virnetsshsession.c -src/rpc/virnettlscontext.c -src/secret/secret_driver.c -src/secret/secret_util.c -src/security/security_apparmor.c -src/security/security_dac.c -src/security/security_driver.c -src/security/security_manager.c -src/security/security_selinux.c -src/security/security_util.c -src/security/virt-aa-helper.c -src/storage/parthelper.c -src/storage/storage_backend.c -src/storage/storage_backend_disk.c -src/storage/storage_backend_fs.c -src/storage/storage_backend_gluster.c -src/storage/storage_backend_iscsi.c -src/storage/storage_backend_iscsi_direct.c -src/storage/storage_backend_logical.c -src/storage/storage_backend_mpath.c -src/storage/storage_backend_rbd.c -src/storage/storage_backend_scsi.c -src/storage/storage_backend_sheepdog.c -src/storage/storage_backend_vstorage.c -src/storage/storage_backend_zfs.c -src/storage/storage_driver.c -src/storage/storage_file_fs.c -src/storage/storage_file_gluster.c -src/storage/storage_util.c -src/test/test_driver.c -src/util/iohelper.c -src/util/viralloc.c -src/util/virarptable.c -src/util/viraudit.c -src/util/virauth.c -src/util/virauthconfig.c -src/util/virbitmap.c -src/util/virbuffer.c -src/util/vircgroup.c -src/util/vircgroupbackend.c -src/util/vircgroupbackend.h -src/util/vircgroupv1.c -src/util/vircgroupv2.c -src/util/virclosecallbacks.c -src/util/vircommand.c -src/util/virconf.c -src/util/vircrypto.c -src/util/virdbus.c -src/util/virdnsmasq.c -src/util/virerror.c -src/util/virerror.h -src/util/vireventpoll.c -src/util/virfcp.c -src/util/virfdstream.c -src/util/virfile.c -src/util/virfilecache.c -src/util/virfirewall.c -src/util/virfirewalld.c -src/util/virfirmware.c -src/util/virhash.c -src/util/virhook.c -src/util/virhostcpu.c -src/util/virhostdev.c -src/util/virhostmem.c -src/util/viridentity.c -src/util/virinitctl.c -src/util/viriptables.c -src/util/viriscsi.c -src/util/virjson.c -src/util/virkeyfile.c -src/util/virlease.c -src/util/virlockspace.c -src/util/virlog.c -src/util/virmacmap.c -src/util/virmdev.c -src/util/virmodule.c -src/util/virnetdev.c -src/util/virnetdevbandwidth.c -src/util/virnetdevbridge.c -src/util/virnetdevip.c -src/util/virnetdevmacvlan.c -src/util/virnetdevmidonet.c -src/util/virnetdevopenvswitch.c -src/util/virnetdevtap.c -src/util/virnetdevveth.c -src/util/virnetdevvportprofile.c -src/util/virnetlink.c -src/util/virnodesuspend.c -src/util/virnuma.c -src/util/virobject.c -src/util/virpci.c -src/util/virperf.c -src/util/virpidfile.c -src/util/virpolkit.c -src/util/virportallocator.c -src/util/virprocess.c -src/util/virqemu.c -src/util/virrandom.c -src/util/virresctrl.c -src/util/virrotatingfile.c -src/util/virscsi.c -src/util/virscsihost.c -src/util/virscsivhost.c -src/util/virsecret.c -src/util/virsocketaddr.c -src/util/virstorageencryption.c -src/util/virstoragefile.c -src/util/virstoragefilebackend.c -src/util/virstring.c -src/util/virsysinfo.c -src/util/virsystemd.c -src/util/virthreadjob.c -src/util/virthreadpool.c -src/util/virtime.c -src/util/virtpm.c -src/util/virtypedparam-public.c -src/util/virtypedparam.c -src/util/viruri.c -src/util/virusb.c -src/util/virutil.c -src/util/virvhba.c -src/util/virvsock.c -src/util/virxml.c -src/vbox/vbox_MSCOMGlue.c -src/vbox/vbox_XPCOMCGlue.c -src/vbox/vbox_common.c -src/vbox/vbox_driver.c -src/vbox/vbox_network.c -src/vbox/vbox_snapshot_conf.c -src/vbox/vbox_storage.c -src/vbox/vbox_tmpl.c -src/vmware/vmware_conf.c -src/vmware/vmware_driver.c -src/vmx/vmx.c -src/vz/vz_driver.c -src/vz/vz_sdk.c -src/vz/vz_utils.c -src/vz/vz_utils.h -tests/virpolkittest.c -tools/libvirt-guests.sh.in -tools/virsh-checkpoint.c -tools/virsh-completer-host.c -tools/virsh-console.c -tools/virsh-domain-monitor.c -tools/virsh-domain.c -tools/virsh-edit.c -tools/virsh-host.c -tools/virsh-interface.c -tools/virsh-network.c -tools/virsh-nodedev.c -tools/virsh-nwfilter.c -tools/virsh-pool.c -tools/virsh-secret.c -tools/virsh-snapshot.c -tools/virsh-util.c -tools/virsh-volume.c -tools/virsh.c -tools/virsh.h -tools/virt-admin.c -tools/virt-host-validate-bhyve.c -tools/virt-host-validate-common.c -tools/virt-host-validate-lxc.c -tools/virt-host-validate-qemu.c -tools/virt-host-validate.c -tools/virt-login-shell-helper.c -tools/vsh-table.c -tools/vsh.c -tools/vsh.h diff --git a/po/POTFILES.in b/po/POTFILES.in new file mode 100644 index 0000000000..f11d483290 --- /dev/null +++ b/po/POTFILES.in @@ -0,0 +1,353 @@ +@SRCDIR(a)/gnulib/lib/gai_strerror.c +@SRCDIR(a)/gnulib/lib/regcomp.c +@SRCDIR(a)/src/access/viraccessdriverpolkit.c +@SRCDIR(a)/src/access/viraccessmanager.c +@SRCDIR(a)/src/admin/admin_server.c +@SRCDIR(a)/src/admin/admin_server_dispatch.c +@SRCDIR(a)/src/admin/admin_server_dispatch_stubs.h +@SRCDIR(a)/src/admin/libvirt-admin.c +@SRCDIR(a)/src/bhyve/bhyve_capabilities.c +@SRCDIR(a)/src/bhyve/bhyve_command.c +@SRCDIR(a)/src/bhyve/bhyve_device.c +@SRCDIR(a)/src/bhyve/bhyve_domain.c +@SRCDIR(a)/src/bhyve/bhyve_driver.c +@SRCDIR(a)/src/bhyve/bhyve_monitor.c +@SRCDIR(a)/src/bhyve/bhyve_parse_command.c +@SRCDIR(a)/src/bhyve/bhyve_process.c +@SRCDIR(a)/src/conf/capabilities.c +@SRCDIR(a)/src/conf/checkpoint_conf.c +@SRCDIR(a)/src/conf/cpu_conf.c +@SRCDIR(a)/src/conf/device_conf.c +@SRCDIR(a)/src/conf/domain_addr.c +@SRCDIR(a)/src/conf/domain_capabilities.c +@SRCDIR(a)/src/conf/domain_conf.c +@SRCDIR(a)/src/conf/domain_event.c +@SRCDIR(a)/src/conf/interface_conf.c +@SRCDIR(a)/src/conf/netdev_bandwidth_conf.c +@SRCDIR(a)/src/conf/netdev_vlan_conf.c +@SRCDIR(a)/src/conf/netdev_vport_profile_conf.c +@SRCDIR(a)/src/conf/network_conf.c +@SRCDIR(a)/src/conf/networkcommon_conf.c +@SRCDIR(a)/src/conf/node_device_conf.c +@SRCDIR(a)/src/conf/node_device_util.c +@SRCDIR(a)/src/conf/numa_conf.c +@SRCDIR(a)/src/conf/nwfilter_conf.c +@SRCDIR(a)/src/conf/nwfilter_params.c +@SRCDIR(a)/src/conf/object_event.c +@SRCDIR(a)/src/conf/secret_conf.c +@SRCDIR(a)/src/conf/snapshot_conf.c +@SRCDIR(a)/src/conf/storage_adapter_conf.c +@SRCDIR(a)/src/conf/storage_conf.c +@SRCDIR(a)/src/conf/virchrdev.c +@SRCDIR(a)/src/conf/virdomainmomentobjlist.c +@SRCDIR(a)/src/conf/virdomainobjlist.c +@SRCDIR(a)/src/conf/virnetworkobj.c +@SRCDIR(a)/src/conf/virnetworkportdef.c +@SRCDIR(a)/src/conf/virnodedeviceobj.c +@SRCDIR(a)/src/conf/virnwfilterbindingdef.c +@SRCDIR(a)/src/conf/virnwfilterbindingobj.c +@SRCDIR(a)/src/conf/virnwfilterbindingobjlist.c +@SRCDIR(a)/src/conf/virnwfilterobj.c +@SRCDIR(a)/src/conf/virsavecookie.c +@SRCDIR(a)/src/conf/virsecretobj.c +@SRCDIR(a)/src/conf/virstorageobj.c +@SRCDIR(a)/src/cpu/cpu.c +@SRCDIR(a)/src/cpu/cpu_arm.c +@SRCDIR(a)/src/cpu/cpu_map.c +@SRCDIR(a)/src/cpu/cpu_ppc64.c +@SRCDIR(a)/src/cpu/cpu_s390.c +@SRCDIR(a)/src/cpu/cpu_x86.c +@SRCDIR(a)/src/datatypes.c +@SRCDIR(a)/src/driver.c +@SRCDIR(a)/src/esx/esx_driver.c +@SRCDIR(a)/src/esx/esx_network_driver.c +@SRCDIR(a)/src/esx/esx_storage_backend_iscsi.c +@SRCDIR(a)/src/esx/esx_storage_backend_vmfs.c +@SRCDIR(a)/src/esx/esx_storage_driver.c +@SRCDIR(a)/src/esx/esx_stream.c +@SRCDIR(a)/src/esx/esx_util.c +@SRCDIR(a)/src/esx/esx_util.h +@SRCDIR(a)/src/esx/esx_vi.c +@SRCDIR(a)/src/esx/esx_vi_methods.c +@SRCDIR(a)/src/esx/esx_vi_types.c +@SRCDIR(a)/src/hyperv/hyperv_driver.c +@SRCDIR(a)/src/hyperv/hyperv_util.c +@SRCDIR(a)/src/hyperv/hyperv_wmi.c +@SRCDIR(a)/src/interface/interface_backend_netcf.c +@SRCDIR(a)/src/interface/interface_backend_udev.c +@SRCDIR(a)/src/internal.h +@SRCDIR(a)/src/libvirt-domain-checkpoint.c +@SRCDIR(a)/src/libvirt-domain-snapshot.c +@SRCDIR(a)/src/libvirt-domain.c +@SRCDIR(a)/src/libvirt-host.c +@SRCDIR(a)/src/libvirt-lxc.c +@SRCDIR(a)/src/libvirt-network.c +@SRCDIR(a)/src/libvirt-nodedev.c +@SRCDIR(a)/src/libvirt-nwfilter.c +@SRCDIR(a)/src/libvirt-qemu.c +@SRCDIR(a)/src/libvirt-secret.c +@SRCDIR(a)/src/libvirt-storage.c +@SRCDIR(a)/src/libvirt-stream.c +@SRCDIR(a)/src/libvirt.c +@SRCDIR(a)/src/libxl/libxl_capabilities.c +@SRCDIR(a)/src/libxl/libxl_conf.c +@SRCDIR(a)/src/libxl/libxl_domain.c +@SRCDIR(a)/src/libxl/libxl_driver.c +@SRCDIR(a)/src/libxl/libxl_migration.c +@SRCDIR(a)/src/libxl/xen_common.c +@SRCDIR(a)/src/libxl/xen_xl.c +@SRCDIR(a)/src/libxl/xen_xm.c +@SRCDIR(a)/src/locking/lock_daemon.c +@SRCDIR(a)/src/locking/lock_daemon_dispatch.c +@SRCDIR(a)/src/locking/lock_driver_lockd.c +@SRCDIR(a)/src/locking/lock_driver_sanlock.c +@SRCDIR(a)/src/locking/lock_manager.c +@SRCDIR(a)/src/locking/sanlock_helper.c +@SRCDIR(a)/src/logging/log_daemon.c +@SRCDIR(a)/src/logging/log_daemon_dispatch.c +@SRCDIR(a)/src/logging/log_handler.c +@SRCDIR(a)/src/logging/log_manager.c +@SRCDIR(a)/src/lxc/lxc_cgroup.c +@SRCDIR(a)/src/lxc/lxc_conf.c +@SRCDIR(a)/src/lxc/lxc_container.c +@SRCDIR(a)/src/lxc/lxc_controller.c +@SRCDIR(a)/src/lxc/lxc_domain.c +@SRCDIR(a)/src/lxc/lxc_driver.c +@SRCDIR(a)/src/lxc/lxc_fuse.c +@SRCDIR(a)/src/lxc/lxc_hostdev.c +@SRCDIR(a)/src/lxc/lxc_native.c +@SRCDIR(a)/src/lxc/lxc_process.c +@SRCDIR(a)/src/network/bridge_driver.c +@SRCDIR(a)/src/network/bridge_driver_linux.c +@SRCDIR(a)/src/network/leaseshelper.c +@SRCDIR(a)/src/node_device/node_device_driver.c +@SRCDIR(a)/src/node_device/node_device_hal.c +@SRCDIR(a)/src/node_device/node_device_udev.c +@SRCDIR(a)/src/nwfilter/nwfilter_dhcpsnoop.c +@SRCDIR(a)/src/nwfilter/nwfilter_driver.c +@SRCDIR(a)/src/nwfilter/nwfilter_ebiptables_driver.c +@SRCDIR(a)/src/nwfilter/nwfilter_gentech_driver.c +@SRCDIR(a)/src/nwfilter/nwfilter_learnipaddr.c +@SRCDIR(a)/src/openvz/openvz_conf.c +@SRCDIR(a)/src/openvz/openvz_driver.c +@SRCDIR(a)/src/openvz/openvz_util.c +@SRCDIR(a)/src/phyp/phyp_driver.c +@SRCDIR(a)/src/qemu/qemu_agent.c +@SRCDIR(a)/src/qemu/qemu_alias.c +@SRCDIR(a)/src/qemu/qemu_block.c +@SRCDIR(a)/src/qemu/qemu_blockjob.c +@SRCDIR(a)/src/qemu/qemu_capabilities.c +@SRCDIR(a)/src/qemu/qemu_cgroup.c +@SRCDIR(a)/src/qemu/qemu_checkpoint.c +@SRCDIR(a)/src/qemu/qemu_command.c +@SRCDIR(a)/src/qemu/qemu_conf.c +@SRCDIR(a)/src/qemu/qemu_dbus.c +@SRCDIR(a)/src/qemu/qemu_domain.c +@SRCDIR(a)/src/qemu/qemu_domain_address.c +@SRCDIR(a)/src/qemu/qemu_driver.c +@SRCDIR(a)/src/qemu/qemu_extdevice.c +@SRCDIR(a)/src/qemu/qemu_firmware.c +@SRCDIR(a)/src/qemu/qemu_hostdev.c +@SRCDIR(a)/src/qemu/qemu_hotplug.c +@SRCDIR(a)/src/qemu/qemu_interface.c +@SRCDIR(a)/src/qemu/qemu_interop_config.c +@SRCDIR(a)/src/qemu/qemu_migration.c +@SRCDIR(a)/src/qemu/qemu_migration_cookie.c +@SRCDIR(a)/src/qemu/qemu_migration_params.c +@SRCDIR(a)/src/qemu/qemu_monitor.c +@SRCDIR(a)/src/qemu/qemu_monitor_json.c +@SRCDIR(a)/src/qemu/qemu_monitor_text.c +@SRCDIR(a)/src/qemu/qemu_process.c +@SRCDIR(a)/src/qemu/qemu_qapi.c +@SRCDIR(a)/src/qemu/qemu_slirp.c +@SRCDIR(a)/src/qemu/qemu_tpm.c +@SRCDIR(a)/src/qemu/qemu_vhost_user.c +@SRCDIR(a)/src/qemu/qemu_vhost_user_gpu.c +@SRCDIR(a)/src/remote/remote_client_bodies.h +@SRCDIR(a)/src/remote/remote_daemon.c +@SRCDIR(a)/src/remote/remote_daemon_config.c +@SRCDIR(a)/src/remote/remote_daemon_dispatch.c +@SRCDIR(a)/src/remote/remote_daemon_dispatch_stubs.h +@SRCDIR(a)/src/remote/remote_daemon_stream.c +@SRCDIR(a)/src/remote/remote_driver.c +@SRCDIR(a)/src/rpc/virkeepalive.c +@SRCDIR(a)/src/rpc/virnetclient.c +@SRCDIR(a)/src/rpc/virnetclientprogram.c +@SRCDIR(a)/src/rpc/virnetclientstream.c +@SRCDIR(a)/src/rpc/virnetdaemon.c +@SRCDIR(a)/src/rpc/virnetlibsshsession.c +@SRCDIR(a)/src/rpc/virnetmessage.c +@SRCDIR(a)/src/rpc/virnetsaslcontext.c +@SRCDIR(a)/src/rpc/virnetserver.c +@SRCDIR(a)/src/rpc/virnetserverclient.c +@SRCDIR(a)/src/rpc/virnetserverprogram.c +@SRCDIR(a)/src/rpc/virnetserverservice.c +@SRCDIR(a)/src/rpc/virnetsocket.c +@SRCDIR(a)/src/rpc/virnetsshsession.c +@SRCDIR(a)/src/rpc/virnettlscontext.c +@SRCDIR(a)/src/secret/secret_driver.c +@SRCDIR(a)/src/secret/secret_util.c +@SRCDIR(a)/src/security/security_apparmor.c +@SRCDIR(a)/src/security/security_dac.c +@SRCDIR(a)/src/security/security_driver.c +@SRCDIR(a)/src/security/security_manager.c +@SRCDIR(a)/src/security/security_selinux.c +@SRCDIR(a)/src/security/security_util.c +@SRCDIR(a)/src/security/virt-aa-helper.c +@SRCDIR(a)/src/storage/parthelper.c +@SRCDIR(a)/src/storage/storage_backend.c +@SRCDIR(a)/src/storage/storage_backend_disk.c +@SRCDIR(a)/src/storage/storage_backend_fs.c +@SRCDIR(a)/src/storage/storage_backend_gluster.c +@SRCDIR(a)/src/storage/storage_backend_iscsi.c +@SRCDIR(a)/src/storage/storage_backend_iscsi_direct.c +@SRCDIR(a)/src/storage/storage_backend_logical.c +@SRCDIR(a)/src/storage/storage_backend_mpath.c +@SRCDIR(a)/src/storage/storage_backend_rbd.c +@SRCDIR(a)/src/storage/storage_backend_scsi.c +@SRCDIR(a)/src/storage/storage_backend_sheepdog.c +@SRCDIR(a)/src/storage/storage_backend_vstorage.c +@SRCDIR(a)/src/storage/storage_backend_zfs.c +@SRCDIR(a)/src/storage/storage_driver.c +@SRCDIR(a)/src/storage/storage_file_fs.c +@SRCDIR(a)/src/storage/storage_file_gluster.c +@SRCDIR(a)/src/storage/storage_util.c +@SRCDIR(a)/src/test/test_driver.c +@SRCDIR(a)/src/util/iohelper.c +@SRCDIR(a)/src/util/viralloc.c +@SRCDIR(a)/src/util/virarptable.c +@SRCDIR(a)/src/util/viraudit.c +@SRCDIR(a)/src/util/virauth.c +@SRCDIR(a)/src/util/virauthconfig.c +@SRCDIR(a)/src/util/virbitmap.c +@SRCDIR(a)/src/util/virbuffer.c +@SRCDIR(a)/src/util/vircgroup.c +@SRCDIR(a)/src/util/vircgroupbackend.c +@SRCDIR(a)/src/util/vircgroupbackend.h +@SRCDIR(a)/src/util/vircgroupv1.c +@SRCDIR(a)/src/util/vircgroupv2.c +@SRCDIR(a)/src/util/virclosecallbacks.c +@SRCDIR(a)/src/util/vircommand.c +@SRCDIR(a)/src/util/virconf.c +@SRCDIR(a)/src/util/vircrypto.c +@SRCDIR(a)/src/util/virdbus.c +@SRCDIR(a)/src/util/virdnsmasq.c +@SRCDIR(a)/src/util/virerror.c +@SRCDIR(a)/src/util/virerror.h +@SRCDIR(a)/src/util/vireventpoll.c +@SRCDIR(a)/src/util/virfcp.c +@SRCDIR(a)/src/util/virfdstream.c +@SRCDIR(a)/src/util/virfile.c +@SRCDIR(a)/src/util/virfilecache.c +@SRCDIR(a)/src/util/virfirewall.c +@SRCDIR(a)/src/util/virfirewalld.c +@SRCDIR(a)/src/util/virfirmware.c +@SRCDIR(a)/src/util/virhash.c +@SRCDIR(a)/src/util/virhook.c +@SRCDIR(a)/src/util/virhostcpu.c +@SRCDIR(a)/src/util/virhostdev.c +@SRCDIR(a)/src/util/virhostmem.c +@SRCDIR(a)/src/util/viridentity.c +@SRCDIR(a)/src/util/virinitctl.c +@SRCDIR(a)/src/util/viriptables.c +@SRCDIR(a)/src/util/viriscsi.c +@SRCDIR(a)/src/util/virjson.c +@SRCDIR(a)/src/util/virkeyfile.c +@SRCDIR(a)/src/util/virlease.c +@SRCDIR(a)/src/util/virlockspace.c +@SRCDIR(a)/src/util/virlog.c +@SRCDIR(a)/src/util/virmacmap.c +@SRCDIR(a)/src/util/virmdev.c +@SRCDIR(a)/src/util/virmodule.c +@SRCDIR(a)/src/util/virnetdev.c +@SRCDIR(a)/src/util/virnetdevbandwidth.c +@SRCDIR(a)/src/util/virnetdevbridge.c +@SRCDIR(a)/src/util/virnetdevip.c +@SRCDIR(a)/src/util/virnetdevmacvlan.c +@SRCDIR(a)/src/util/virnetdevmidonet.c +@SRCDIR(a)/src/util/virnetdevopenvswitch.c +@SRCDIR(a)/src/util/virnetdevtap.c +@SRCDIR(a)/src/util/virnetdevveth.c +@SRCDIR(a)/src/util/virnetdevvportprofile.c +@SRCDIR(a)/src/util/virnetlink.c +@SRCDIR(a)/src/util/virnodesuspend.c +@SRCDIR(a)/src/util/virnuma.c +@SRCDIR(a)/src/util/virobject.c +@SRCDIR(a)/src/util/virpci.c +@SRCDIR(a)/src/util/virperf.c +@SRCDIR(a)/src/util/virpidfile.c +@SRCDIR(a)/src/util/virpolkit.c +@SRCDIR(a)/src/util/virportallocator.c +@SRCDIR(a)/src/util/virprocess.c +@SRCDIR(a)/src/util/virqemu.c +@SRCDIR(a)/src/util/virrandom.c +@SRCDIR(a)/src/util/virresctrl.c +@SRCDIR(a)/src/util/virrotatingfile.c +@SRCDIR(a)/src/util/virscsi.c +@SRCDIR(a)/src/util/virscsihost.c +@SRCDIR(a)/src/util/virscsivhost.c +@SRCDIR(a)/src/util/virsecret.c +@SRCDIR(a)/src/util/virsocketaddr.c +@SRCDIR(a)/src/util/virstorageencryption.c +@SRCDIR(a)/src/util/virstoragefile.c +@SRCDIR(a)/src/util/virstoragefilebackend.c +@SRCDIR(a)/src/util/virstring.c +@SRCDIR(a)/src/util/virsysinfo.c +@SRCDIR(a)/src/util/virsystemd.c +@SRCDIR(a)/src/util/virthreadjob.c +@SRCDIR(a)/src/util/virthreadpool.c +@SRCDIR(a)/src/util/virtime.c +@SRCDIR(a)/src/util/virtpm.c +@SRCDIR(a)/src/util/virtypedparam-public.c +@SRCDIR(a)/src/util/virtypedparam.c +@SRCDIR(a)/src/util/viruri.c +@SRCDIR(a)/src/util/virusb.c +@SRCDIR(a)/src/util/virutil.c +@SRCDIR(a)/src/util/virvhba.c +@SRCDIR(a)/src/util/virvsock.c +@SRCDIR(a)/src/util/virxml.c +@SRCDIR(a)/src/vbox/vbox_MSCOMGlue.c +@SRCDIR(a)/src/vbox/vbox_XPCOMCGlue.c +@SRCDIR(a)/src/vbox/vbox_common.c +@SRCDIR(a)/src/vbox/vbox_driver.c +@SRCDIR(a)/src/vbox/vbox_network.c +@SRCDIR(a)/src/vbox/vbox_snapshot_conf.c +@SRCDIR(a)/src/vbox/vbox_storage.c +@SRCDIR(a)/src/vbox/vbox_tmpl.c +@SRCDIR(a)/src/vmware/vmware_conf.c +@SRCDIR(a)/src/vmware/vmware_driver.c +@SRCDIR(a)/src/vmx/vmx.c +@SRCDIR(a)/src/vz/vz_driver.c +@SRCDIR(a)/src/vz/vz_sdk.c +@SRCDIR(a)/src/vz/vz_utils.c +@SRCDIR(a)/src/vz/vz_utils.h +@SRCDIR(a)/tests/virpolkittest.c +@SRCDIR(a)/tools/libvirt-guests.sh.in +@SRCDIR(a)/tools/virsh-checkpoint.c +@SRCDIR(a)/tools/virsh-completer-host.c +@SRCDIR(a)/tools/virsh-console.c +@SRCDIR(a)/tools/virsh-domain-monitor.c +@SRCDIR(a)/tools/virsh-domain.c +@SRCDIR(a)/tools/virsh-edit.c +@SRCDIR(a)/tools/virsh-host.c +@SRCDIR(a)/tools/virsh-interface.c +@SRCDIR(a)/tools/virsh-network.c +@SRCDIR(a)/tools/virsh-nodedev.c +@SRCDIR(a)/tools/virsh-nwfilter.c +@SRCDIR(a)/tools/virsh-pool.c +@SRCDIR(a)/tools/virsh-secret.c +@SRCDIR(a)/tools/virsh-snapshot.c +@SRCDIR(a)/tools/virsh-util.c +@SRCDIR(a)/tools/virsh-volume.c +@SRCDIR(a)/tools/virsh.c +@SRCDIR(a)/tools/virsh.h +@SRCDIR(a)/tools/virt-admin.c +@SRCDIR(a)/tools/virt-host-validate-bhyve.c +@SRCDIR(a)/tools/virt-host-validate-common.c +@SRCDIR(a)/tools/virt-host-validate-lxc.c +@SRCDIR(a)/tools/virt-host-validate-qemu.c +@SRCDIR(a)/tools/virt-host-validate.c +@SRCDIR(a)/tools/virt-login-shell-helper.c +@SRCDIR(a)/tools/vsh-table.c +@SRCDIR(a)/tools/vsh.c +@SRCDIR(a)/tools/vsh.h -- 2.21.0

Our naming was not consistent. Use the protocol name as prefix for all generated files. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com&gt; Reviewed-by: Ján Tomko <jtomko(a)redhat.com&gt; --- Notes: Changes in v2: - modify generated_files in for sc_po_check as well build-aux/syntax-check.mk | 3 ++- src/remote/Makefile.inc.am | 12 ++++++------ src/remote/remote_daemon_dispatch.c | 4 ++-- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk index 75993ee284..156c72d452 100644 --- a/build-aux/syntax-check.mk +++ b/build-aux/syntax-check.mk @@ -1976,7 +1976,8 @@ po_file ?= $(srcdir)/po/POTFILES.in generated_files = \ $(builddir)/src/*.[ch] \ $(builddir)/src/*/*.[ch] \ - $(srcdir)/src/*/{remote_daemon,admin_server,log_daemon,lock_daemon}_dispatch_*stubs.h \ + $(srcdir)/src/*/{remote,qemu,lxc,log,lock}_daemon_dispatch_stubs.h \ + $(srcdir)/src/admin/admin_server_dispatch_stubs.h \ $(srcdir)/src/lxc/{lxc_monitor,lxc_controller}_dispatch.h \ $(srcdir)/src/remote/*_client_bodies.h \ $(srcdir)/src/*/*_protocol.[ch] \ diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am index 00f2212909..5c5f5f4d2c 100644 --- a/src/remote/Makefile.inc.am +++ b/src/remote/Makefile.inc.am @@ -20,8 +20,8 @@ REMOTE_DRIVER_SOURCES = \ REMOTE_DAEMON_GENERATED = \ remote/remote_daemon_dispatch_stubs.h \ - remote/remote_daemon_dispatch_lxc_stubs.h \ - remote/remote_daemon_dispatch_qemu_stubs.h \ + remote/lxc_daemon_dispatch_stubs.h \ + remote/qemu_daemon_dispatch_stubs.h \ $(NULL) REMOTE_DAEMON_SOURCES = \ @@ -442,17 +442,17 @@ remote/remote_daemon_dispatch_stubs.h: $(srcdir)/rpc/gendispatch.pl \ --mode=server remote REMOTE $(REMOTE_PROTOCOL) \ -remote/remote_daemon_dispatch_lxc_stubs.h: $(srcdir)/rpc/gendispatch.pl \ +remote/lxc_daemon_dispatch_stubs.h: $(srcdir)/rpc/gendispatch.pl \ $(LXC_PROTOCOL) Makefile.am $(AM_V_GEN)$(PERL) -w $(top_srcdir)/src/rpc/gendispatch.pl \ --mode=server lxc LXC $(LXC_PROTOCOL) \ - > $(srcdir)/remote/remote_daemon_dispatch_lxc_stubs.h + > $(srcdir)/remote/lxc_daemon_dispatch_stubs.h -remote/remote_daemon_dispatch_qemu_stubs.h: $(srcdir)/rpc/gendispatch.pl \ +remote/qemu_daemon_dispatch_stubs.h: $(srcdir)/rpc/gendispatch.pl \ $(QEMU_PROTOCOL) Makefile.am $(AM_V_GEN)$(PERL) -w $(top_srcdir)/src/rpc/gendispatch.pl \ --mode=server qemu QEMU $(QEMU_PROTOCOL) \ - > $(srcdir)/remote/remote_daemon_dispatch_qemu_stubs.h + > $(srcdir)/remote/qemu_daemon_dispatch_stubs.h libvirtd.8.in: remote/libvirtd.pod $(AM_V_GEN)$(POD2MAN) --section=8 $< $@-t1 && \ diff --git a/src/remote/remote_daemon_dispatch.c b/src/remote/remote_daemon_dispatch.c index 40d97e944a..694bfe534c 100644 --- a/src/remote/remote_daemon_dispatch.c +++ b/src/remote/remote_daemon_dispatch.c @@ -131,8 +131,8 @@ remoteGetStorageConn(virNetServerClientPtr client); #include "remote_daemon_dispatch_stubs.h" -#include "remote_daemon_dispatch_qemu_stubs.h" -#include "remote_daemon_dispatch_lxc_stubs.h" +#include "qemu_daemon_dispatch_stubs.h" +#include "lxc_daemon_dispatch_stubs.h" /* Prototypes */ -- 2.21.0

Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com&gt; Reviewed-by: Ján Tomko <jtomko(a)redhat.com&gt; --- Notes: Changes in v2: - remove entries from .gitignore .gitignore | 7 ------- po/POTFILES.in | 3 +++ src/access/Makefile.inc.am | 14 +++++++------- src/admin/Makefile.inc.am | 1 + src/interface/Makefile.inc.am | 1 + src/libxl/Makefile.inc.am | 1 + src/lxc/Makefile.inc.am | 1 + src/network/Makefile.inc.am | 1 + src/node_device/Makefile.inc.am | 1 + src/nwfilter/Makefile.inc.am | 1 + src/qemu/Makefile.inc.am | 1 + src/remote/Makefile.inc.am | 1 + src/secret/Makefile.inc.am | 1 + src/storage/Makefile.inc.am | 1 + 14 files changed, 21 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 6f8d59987e..8c1078c56c 100644 --- a/.gitignore +++ b/.gitignore @@ -41,13 +41,6 @@ Makefile.in # libvirt related ignores /build/ /ci/scratch/ -/src/access/org.libvirt.api.policy -/src/access/viraccessapicheck.c -/src/access/viraccessapicheck.h -/src/access/viraccessapichecklxc.c -/src/access/viraccessapichecklxc.h -/src/access/viraccessapicheckqemu.c -/src/access/viraccessapicheckqemu.h /src/admin/admin_client.h /src/admin/admin_server_dispatch_stubs.h /src/esx/*.generated.* diff --git a/po/POTFILES.in b/po/POTFILES.in index f11d483290..b975139933 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,3 +1,6 @@ +@BUILDDIR(a)/src/access/viraccessapicheck.c +@BUILDDIR(a)/src/access/viraccessapichecklxc.c +@BUILDDIR(a)/src/access/viraccessapicheckqemu.c @SRCDIR(a)/gnulib/lib/gai_strerror.c @SRCDIR(a)/gnulib/lib/regcomp.c @SRCDIR(a)/src/access/viraccessdriverpolkit.c diff --git a/src/access/Makefile.inc.am b/src/access/Makefile.inc.am index ea27adbe0b..2d871ec8aa 100644 --- a/src/access/Makefile.inc.am +++ b/src/access/Makefile.inc.am @@ -38,7 +38,7 @@ ACCESS_DRIVER_POLKIT_SOURCES = \ access/viraccessdriverpolkit.c \ $(NULL) -ACCESS_DRIVER_POLKIT_POLICY = $(srcdir)/access/org.libvirt.api.policy +ACCESS_DRIVER_POLKIT_POLICY = access/org.libvirt.api.policy GENERATED_SYM_FILES += $(ACCESS_DRIVER_SYM_FILES) @@ -122,31 +122,31 @@ access/viraccessapicheck.h: $(srcdir)/rpc/gendispatch.pl \ $(REMOTE_PROTOCOL) Makefile.am $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=aclheader \ remote REMOTE $(REMOTE_PROTOCOL) \ - > $(srcdir)/access/viraccessapicheck.h + > access/viraccessapicheck.h access/viraccessapicheck.c: $(srcdir)/rpc/gendispatch.pl \ $(REMOTE_PROTOCOL) Makefile.am $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=aclbody \ remote REMOTE $(REMOTE_PROTOCOL) access/viraccessapicheck.h \ - > $(srcdir)/access/viraccessapicheck.c + > access/viraccessapicheck.c access/viraccessapicheckqemu.h: $(srcdir)/rpc/gendispatch.pl \ $(QEMU_PROTOCOL) Makefile.am $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=aclheader \ qemu QEMU $(QEMU_PROTOCOL) \ - > $(srcdir)/access/viraccessapicheckqemu.h + > access/viraccessapicheckqemu.h access/viraccessapicheckqemu.c: $(srcdir)/rpc/gendispatch.pl \ $(QEMU_PROTOCOL) Makefile.am $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=aclbody \ qemu QEMU $(QEMU_PROTOCOL) access/viraccessapicheckqemu.h \ - > $(srcdir)/access/viraccessapicheckqemu.c + > access/viraccessapicheckqemu.c access/viraccessapichecklxc.h: $(srcdir)/rpc/gendispatch.pl \ $(LXC_PROTOCOL) Makefile.am $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=aclheader \ lxc LXC $(LXC_PROTOCOL) \ - > $(srcdir)/access/viraccessapichecklxc.h + > access/viraccessapichecklxc.h access/viraccessapichecklxc.c: $(srcdir)/rpc/gendispatch.pl \ $(LXC_PROTOCOL) Makefile.am $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=aclbody \ lxc LXC $(LXC_PROTOCOL) access/viraccessapichecklxc.h \ - > $(srcdir)/access/viraccessapichecklxc.c + > access/viraccessapichecklxc.c diff --git a/src/admin/Makefile.inc.am b/src/admin/Makefile.inc.am index bea0967aaf..94cbed9972 100644 --- a/src/admin/Makefile.inc.am +++ b/src/admin/Makefile.inc.am @@ -89,6 +89,7 @@ endif WITH_DTRACE_PROBES libvirt_admin_la_CFLAGS = \ $(AM_CFLAGS) \ -I$(builddir)/admin \ + -I$(builddir)/access \ -I$(srcdir)/remote \ -I$(srcdir)/rpc \ -I$(builddir)/rpc \ diff --git a/src/interface/Makefile.inc.am b/src/interface/Makefile.inc.am index 780b2277ba..30ea98ad15 100644 --- a/src/interface/Makefile.inc.am +++ b/src/interface/Makefile.inc.am @@ -21,6 +21,7 @@ if WITH_INTERFACE mod_LTLIBRARIES += libvirt_driver_interface.la libvirt_driver_interface_la_CFLAGS = \ -I$(srcdir)/access \ + -I$(builddir)/access \ -I$(srcdir)/conf \ $(AM_CFLAGS) \ $(LIBNL_CFLAGS) \ diff --git a/src/libxl/Makefile.inc.am b/src/libxl/Makefile.inc.am index ef8e9613f5..5d9cf14f7f 100644 --- a/src/libxl/Makefile.inc.am +++ b/src/libxl/Makefile.inc.am @@ -44,6 +44,7 @@ libvirt_driver_libxl_impl_la_CFLAGS = \ $(LIBXL_CFLAGS) \ $(LIBXML_CFLAGS) \ -I$(srcdir)/access \ + -I$(builddir)/access \ -I$(srcdir)/conf \ -I$(srcdir)/secret \ $(AM_CFLAGS) \ diff --git a/src/lxc/Makefile.inc.am b/src/lxc/Makefile.inc.am index 78f14bf37a..f22a53e58d 100644 --- a/src/lxc/Makefile.inc.am +++ b/src/lxc/Makefile.inc.am @@ -94,6 +94,7 @@ libvirt_driver_lxc_impl_la_CFLAGS = \ $(FUSE_CFLAGS) \ $(XDR_CFLAGS) \ -I$(srcdir)/access \ + -I$(builddir)/access \ -I$(srcdir)/conf \ -I$(builddir)/lxc \ -I$(builddir)/rpc \ diff --git a/src/network/Makefile.inc.am b/src/network/Makefile.inc.am index b58b5ea645..2f7932ae60 100644 --- a/src/network/Makefile.inc.am +++ b/src/network/Makefile.inc.am @@ -44,6 +44,7 @@ libvirt_driver_network_impl_la_CFLAGS = \ $(LIBNL_CFLAGS) \ $(DBUS_CFLAGS) \ -I$(srcdir)/access \ + -I$(builddir)/access \ -I$(srcdir)/conf \ $(AM_CFLAGS) \ $(NULL) diff --git a/src/node_device/Makefile.inc.am b/src/node_device/Makefile.inc.am index 9b58636a0c..1dfa0a5274 100644 --- a/src/node_device/Makefile.inc.am +++ b/src/node_device/Makefile.inc.am @@ -39,6 +39,7 @@ libvirt_driver_nodedev_la_SOURCES = $(NODE_DEVICE_DRIVER_SOURCES) libvirt_driver_nodedev_la_CFLAGS = \ -I$(srcdir)/access \ + -I$(builddir)/access \ -I$(srcdir)/conf \ $(AM_CFLAGS) \ $(LIBNL_CFLAGS) \ diff --git a/src/nwfilter/Makefile.inc.am b/src/nwfilter/Makefile.inc.am index e24e8aa2a0..ca05cba934 100644 --- a/src/nwfilter/Makefile.inc.am +++ b/src/nwfilter/Makefile.inc.am @@ -37,6 +37,7 @@ libvirt_driver_nwfilter_impl_la_CFLAGS = \ $(LIBNL_CFLAGS) \ $(DBUS_CFLAGS) \ -I$(srcdir)/access \ + -I$(builddir)/access \ -I$(srcdir)/conf \ $(AM_CFLAGS) \ $(NULL) diff --git a/src/qemu/Makefile.inc.am b/src/qemu/Makefile.inc.am index 2074a5f54f..69e290c428 100644 --- a/src/qemu/Makefile.inc.am +++ b/src/qemu/Makefile.inc.am @@ -95,6 +95,7 @@ libvirt_driver_qemu_impl_la_CFLAGS = \ $(SELINUX_CFLAGS) \ $(XDR_CFLAGS) \ -I$(srcdir)/access \ + -I$(builddir)/access \ -I$(srcdir)/conf \ -I$(srcdir)/secret \ $(AM_CFLAGS) \ diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am index 6b0ae586d1..7361d02cf4 100644 --- a/src/remote/Makefile.inc.am +++ b/src/remote/Makefile.inc.am @@ -48,6 +48,7 @@ REMOTE_DAEMON_CFLAGS = \ $(PIE_CFLAGS) \ $(COVERAGE_CFLAGS) \ -I$(srcdir)/access \ + -I$(builddir)/access \ -I$(srcdir)/conf \ -I$(srcdir)/rpc \ -I$(builddir)/rpc \ diff --git a/src/secret/Makefile.inc.am b/src/secret/Makefile.inc.am index fd7c90a137..94f293d418 100644 --- a/src/secret/Makefile.inc.am +++ b/src/secret/Makefile.inc.am @@ -28,6 +28,7 @@ if WITH_SECRETS mod_LTLIBRARIES += libvirt_driver_secret.la libvirt_driver_secret_la_CFLAGS = \ -I$(srcdir)/access \ + -I$(builddir)/access \ -I$(srcdir)/conf \ $(AM_CFLAGS) \ $(NULL) diff --git a/src/storage/Makefile.inc.am b/src/storage/Makefile.inc.am index 08a9f4e86c..ec35ab7665 100644 --- a/src/storage/Makefile.inc.am +++ b/src/storage/Makefile.inc.am @@ -119,6 +119,7 @@ storagefile_LTLIBRARIES = libvirt_driver_storage_impl_la_SOURCES = libvirt_driver_storage_impl_la_CFLAGS = \ -I$(srcdir)/access \ + -I$(builddir)/access \ -I$(srcdir)/conf \ -I$(srcdir)/secret \ $(AM_CFLAGS) \ -- 2.21.0

Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com&gt; Reviewed-by: Ján Tomko <jtomko(a)redhat.com&gt; --- Notes: Changes in v2: - remove entries from .gitignore .gitignore | 1 - src/esx/Makefile.inc.am | 5 +++-- src/esx/esx_vi_generator.py | 11 ++++------- tests/Makefile.am | 3 +++ 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 8989b3e3e3..46f6f98045 100644 --- a/.gitignore +++ b/.gitignore @@ -41,7 +41,6 @@ Makefile.in # libvirt related ignores /build/ /ci/scratch/ -/src/esx/*.generated.* /src/hyperv/*.generated.* /src/locking/lock_daemon_dispatch_stubs.h /src/logging/log_daemon_dispatch_stubs.h diff --git a/src/esx/Makefile.inc.am b/src/esx/Makefile.inc.am index 3dab05d71c..7ba9fd1758 100644 --- a/src/esx/Makefile.inc.am +++ b/src/esx/Makefile.inc.am @@ -63,8 +63,8 @@ $(ESX_DRIVER_GENERATED): $(ESX_GENERATED_STAMP) $(ESX_GENERATED_STAMP): $(srcdir)/esx/esx_vi_generator.input \ $(srcdir)/esx/esx_vi_generator.py - $(AM_V_GEN)srcdir=$(srcdir) $(RUNUTF8) $(PYTHON) \ - $(srcdir)/esx/esx_vi_generator.py && touch $@ + $(AM_V_GEN) $(RUNUTF8) $(PYTHON) \ + $(srcdir)/esx/esx_vi_generator.py $(srcdir) $(builddir) && touch $@ MAINTAINERCLEANFILES += $(ESX_DRIVER_GENERATED) $(ESX_GENERATED_STAMP) @@ -81,6 +81,7 @@ libvirt_la_BUILT_LIBADD += libvirt_driver_esx.la libvirt_driver_esx_la_CFLAGS = \ $(CURL_CFLAGS) \ -I$(srcdir)/conf \ + -I$(builddir)/esx \ -I$(srcdir)/vmx \ $(AM_CFLAGS) \ $(NULL) diff --git a/src/esx/esx_vi_generator.py b/src/esx/esx_vi_generator.py index 28d440a6df..c77de6e60c 100755 --- a/src/esx/esx_vi_generator.py +++ b/src/esx/esx_vi_generator.py @@ -1379,14 +1379,11 @@ additional_object_features = { removed_object_features = {} +if len(sys.argv) != 3: + report_error("usage: %s srcdir builddir" % sys.argv[0]) - -if "srcdir" in os.environ: - input_filename = os.path.join(os.environ["srcdir"], "esx/esx_vi_generator.input") - output_dirname = os.path.join(os.environ["srcdir"], "esx") -else: - input_filename = os.path.join(os.getcwd(), "esx_vi_generator.input") - output_dirname = os.getcwd() +input_filename = os.path.join(sys.argv[1], "esx/esx_vi_generator.input") +output_dirname = os.path.join(sys.argv[2], "esx") diff --git a/tests/Makefile.am b/tests/Makefile.am index 9ae456c268..d549e38e18 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -756,6 +756,9 @@ esxutilstest_SOURCES = \ esxutilstest.c \ testutils.c testutils.h esxutilstest_LDADD = $(LDADDS) +esxutilstest_CFLAGS = \ + -I$(top_builddir)/src/esx \ + $(AM_CFLAGS) else ! WITH_ESX EXTRA_DIST += esxutilstest.c endif ! WITH_ESX -- 2.21.0

Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com&gt; Reviewed-by: Ján Tomko <jtomko(a)redhat.com&gt; --- Notes: Changes in v2: - remove entries from .gitignore - modify generated_files for sc_po_check as well .gitignore | 1 - build-aux/syntax-check.mk | 2 +- src/locking/Makefile.inc.am | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 85a417112d..ed11b77921 100644 --- a/.gitignore +++ b/.gitignore @@ -41,7 +41,6 @@ Makefile.in # libvirt related ignores /build/ /ci/scratch/ -/src/locking/lock_daemon_dispatch_stubs.h /src/logging/log_daemon_dispatch_stubs.h /src/lxc/lxc_controller_dispatch.h /src/lxc/lxc_monitor_dispatch.h diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk index cf60e890d2..62fe528c75 100644 --- a/build-aux/syntax-check.mk +++ b/build-aux/syntax-check.mk @@ -1976,7 +1976,7 @@ po_file ?= $(srcdir)/po/POTFILES.in generated_files = \ $(builddir)/src/*.[ch] \ $(builddir)/src/*/*.[ch] \ - $(srcdir)/src/*/{remote,qemu,lxc,log,lock}_daemon_dispatch_stubs.h \ + $(srcdir)/src/*/{remote,qemu,lxc,log}_daemon_dispatch_stubs.h \ $(srcdir)/src/lxc/{lxc_monitor,lxc_controller}_dispatch.h \ $(srcdir)/src/remote/*_client_bodies.h \ $(srcdir)/gnulib/lib/*.[ch] diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am index ba7a9ea2ea..2bfb662016 100644 --- a/src/locking/Makefile.inc.am +++ b/src/locking/Makefile.inc.am @@ -280,7 +280,7 @@ locking/lock_daemon_dispatch_stubs.h: $(LOCK_PROTOCOL) \ $(srcdir)/rpc/gendispatch.pl Makefile.am $(AM_V_GEN)perl -w $(srcdir)/rpc/gendispatch.pl --mode=server \ virLockSpaceProtocol VIR_LOCK_SPACE_PROTOCOL \ - $(LOCK_PROTOCOL) > $(srcdir)/locking/lock_daemon_dispatch_stubs.h + $(LOCK_PROTOCOL) > locking/lock_daemon_dispatch_stubs.h virtlockd.service: locking/virtlockd.service.in $(top_builddir)/config.status -- 2.21.0

Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com&gt; Reviewed-by: Ján Tomko <jtomko(a)redhat.com&gt; --- Notes: Changes in v2: - remove entries from .gitignore - modify generated_files for sc_po_check as well .gitignore | 2 -- build-aux/syntax-check.mk | 1 - src/lxc/Makefile.inc.am | 4 ++-- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index eaad5a1883..38d6637c1c 100644 --- a/.gitignore +++ b/.gitignore @@ -41,8 +41,6 @@ Makefile.in # libvirt related ignores /build/ /ci/scratch/ -/src/lxc/lxc_controller_dispatch.h -/src/lxc/lxc_monitor_dispatch.h /src/remote/*_client_bodies.h /src/remote/*_stubs.h tags diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk index a7e87e7a81..392fc34320 100644 --- a/build-aux/syntax-check.mk +++ b/build-aux/syntax-check.mk @@ -1977,7 +1977,6 @@ generated_files = \ $(builddir)/src/*.[ch] \ $(builddir)/src/*/*.[ch] \ $(srcdir)/src/*/{remote,qemu,lxc}_daemon_dispatch_stubs.h \ - $(srcdir)/src/lxc/{lxc_monitor,lxc_controller}_dispatch.h \ $(srcdir)/src/remote/*_client_bodies.h \ $(srcdir)/gnulib/lib/*.[ch] diff --git a/src/lxc/Makefile.inc.am b/src/lxc/Makefile.inc.am index f22a53e58d..cb55dfd1c6 100644 --- a/src/lxc/Makefile.inc.am +++ b/src/lxc/Makefile.inc.am @@ -252,13 +252,13 @@ lxc/lxc_monitor_dispatch.h: $(srcdir)/rpc/gendispatch.pl \ $(LXC_MONITOR_PROTOCOL) Makefile.am $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=client \ virLXCMonitor VIR_LXC_MONITOR $(LXC_MONITOR_PROTOCOL) > \ - $(srcdir)/lxc/lxc_monitor_dispatch.h + lxc/lxc_monitor_dispatch.h lxc/lxc_controller_dispatch.h: $(srcdir)/rpc/gendispatch.pl \ $(REMOTE_PROTOCOL) Makefile.am $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=server \ virLXCMonitor VIR_LXC_MONITOR $(LXC_MONITOR_PROTOCOL) > \ - $(srcdir)/lxc/lxc_controller_dispatch.h + lxc/lxc_controller_dispatch.h .PHONY: \ install-data-lxc \ -- 2.21.0

Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com&gt; Reviewed-by: Ján Tomko <jtomko(a)redhat.com&gt; --- src/Makefile.am | 6 +++--- src/access/Makefile.inc.am | 3 ++- src/admin/Makefile.inc.am | 13 +++++++------ src/bhyve/Makefile.inc.am | 1 + src/esx/Makefile.inc.am | 4 +--- src/hyperv/Makefile.inc.am | 4 +--- src/interface/Makefile.inc.am | 1 + src/libxl/Makefile.inc.am | 1 + src/locking/Makefile.inc.am | 8 +++++--- src/logging/Makefile.inc.am | 12 +++++++----- src/lxc/Makefile.inc.am | 27 ++++++++++++++++++--------- src/network/Makefile.inc.am | 1 + src/node_device/Makefile.inc.am | 1 + src/nwfilter/Makefile.inc.am | 1 + src/qemu/Makefile.inc.am | 1 + src/remote/Makefile.inc.am | 20 ++++++++++++-------- src/rpc/Makefile.inc.am | 5 ++++- src/secret/Makefile.inc.am | 1 + src/storage/Makefile.inc.am | 1 + src/util/Makefile.inc.am | 6 ++++-- src/vbox/Makefile.inc.am | 1 + src/vz/Makefile.inc.am | 1 + 22 files changed, 75 insertions(+), 44 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index da7e2e6c80..4a0c121a7d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -655,13 +655,13 @@ endif WITH_LIBVIRTD < $< > $@-t && \ mv $@-t $@ -CLEANFILES += $(man8_MANS) -MAINTAINERCLEANFILES += $(MANINFILES) +CLEANFILES += \ + $(man8_MANS) \ + $(MANINFILES) EXTRA_DIST += \ $(SYSTEMD_UNIT_FILES_IN) \ $(PODFILES) \ - $(MANINFILES) \ $(NULL) diff --git a/src/access/Makefile.inc.am b/src/access/Makefile.inc.am index 2d871ec8aa..fd0a5d8098 100644 --- a/src/access/Makefile.inc.am +++ b/src/access/Makefile.inc.am @@ -43,13 +43,14 @@ ACCESS_DRIVER_POLKIT_POLICY = access/org.libvirt.api.policy GENERATED_SYM_FILES += $(ACCESS_DRIVER_SYM_FILES) EXTRA_DIST += \ - $(ACCESS_DRIVER_POLKIT_POLICY) \ access/genpolkit.pl \ $(NULL) libvirt_driver_access_la_SOURCES = \ $(ACCESS_DRIVER_SOURCES) \ + $(NULL) +nodist_libvirt_driver_access_la_SOURCES = \ $(ACCESS_DRIVER_GENERATED) \ $(NULL) noinst_LTLIBRARIES += libvirt_driver_access.la diff --git a/src/admin/Makefile.inc.am b/src/admin/Makefile.inc.am index 448f7e1203..3feb23aa20 100644 --- a/src/admin/Makefile.inc.am +++ b/src/admin/Makefile.inc.am @@ -9,22 +9,21 @@ ADMIN_PROTOCOL_GENERATED = \ admin/admin_server_dispatch_stubs.h \ $(NULL) -EXTRA_DIST += $(ADMIN_PROTOCOL) $(ADMIN_PROTOCOL_GENERATED) +EXTRA_DIST += $(ADMIN_PROTOCOL) BUILT_SOURCES += $(ADMIN_PROTOCOL_GENERATED) -MAINTAINERCLEANFILES += $(ADMIN_PROTOCOL_GENERATED) +CLEANFILES += $(ADMIN_PROTOCOL_GENERATED) admin/admin_server_dispatch.c: admin/admin_server_dispatch_stubs.h noinst_LTLIBRARIES += libvirt_driver_admin.la libvirt_driver_admin_la_SOURCES = \ - admin/admin_protocol.c \ - admin/admin_protocol.h \ admin/admin_server.c \ admin/admin_server.h \ admin/admin_server_dispatch.c \ admin/admin_server_dispatch.h \ - admin/admin_server_dispatch_stubs.h \ $(NULL) +nodist_libvirt_driver_admin_la_SOURCES = \ + $(ADMIN_PROTOCOL_GENERATED) libvirt_driver_admin_la_CFLAGS = \ $(AM_CFLAGS) \ $(XDR_CFLAGS) \ @@ -60,9 +59,11 @@ lib_LTLIBRARIES += libvirt-admin.la libvirt_admin_la_SOURCES = \ admin/libvirt-admin.c \ - $(ADMIN_PROTOCOL_GENERATED) \ $(DATATYPES_SOURCES) +nodist_libvirt_admin_la_SOURCES = \ + $(ADMIN_PROTOCOL_GENERATED) + libvirt_admin_la_LDFLAGS = \ $(VERSION_SCRIPT_FLAGS)$(LIBVIRT_ADMIN_SYMBOL_FILE) \ -version-info $(LIBVIRT_VERSION_INFO) \ diff --git a/src/bhyve/Makefile.inc.am b/src/bhyve/Makefile.inc.am index 96ae2f5044..de9fbe9239 100644 --- a/src/bhyve/Makefile.inc.am +++ b/src/bhyve/Makefile.inc.am @@ -56,6 +56,7 @@ augeastest_DATA += bhyve/test_virtbhyved.aug CLEANFILES += bhyve/virtbhyved.aug virtbhyved_SOURCES = $(REMOTE_DAEMON_SOURCES) +nodist_virtbhyved_SOURCES = $(REMOTE_DAEMON_GENERATED) virtbhyved_CFLAGS = \ $(REMOTE_DAEMON_CFLAGS) \ -DDAEMON_NAME="\"virtbhyved\"" \ diff --git a/src/esx/Makefile.inc.am b/src/esx/Makefile.inc.am index 7ba9fd1758..6b10755b7e 100644 --- a/src/esx/Makefile.inc.am +++ b/src/esx/Makefile.inc.am @@ -44,7 +44,6 @@ ESX_DRIVER_EXTRA_DIST = \ esx/README \ esx/esx_vi_generator.input \ esx/esx_vi_generator.py \ - $(ESX_DRIVER_GENERATED) \ $(NULL) ESX_GENERATED_STAMP = .esx_vi_generator.stamp @@ -54,7 +53,6 @@ DRIVER_SOURCE_FILES += $(ESX_DRIVER_SOURCES) EXTRA_DIST += \ $(ESX_DRIVER_SOURCES) \ $(ESX_DRIVER_EXTRA_DIST) \ - $(ESX_GENERATED_STAMP) \ $(NULL) BUILT_SOURCES += $(ESX_DRIVER_GENERATED) @@ -66,7 +64,7 @@ $(ESX_GENERATED_STAMP): $(srcdir)/esx/esx_vi_generator.input \ $(AM_V_GEN) $(RUNUTF8) $(PYTHON) \ $(srcdir)/esx/esx_vi_generator.py $(srcdir) $(builddir) && touch $@ -MAINTAINERCLEANFILES += $(ESX_DRIVER_GENERATED) $(ESX_GENERATED_STAMP) +CLEANFILES += $(ESX_DRIVER_GENERATED) $(ESX_GENERATED_STAMP) if WITH_ESX USED_SYM_FILES += $(srcdir)/libvirt_esx.syms diff --git a/src/hyperv/Makefile.inc.am b/src/hyperv/Makefile.inc.am index 79e94d09bb..b71602c971 100644 --- a/src/hyperv/Makefile.inc.am +++ b/src/hyperv/Makefile.inc.am @@ -24,8 +24,6 @@ HYPERV_GENERATED_STAMP = .hyperv_wmi_generator.stamp HYPERV_DRIVER_EXTRA_DIST = \ hyperv/hyperv_wmi_generator.input \ hyperv/hyperv_wmi_generator.py \ - $(HYPERV_DRIVER_GENERATED) \ - $(HYPERV_GENERATED_STAMP) \ $(NULL) DRIVER_SOURCE_FILES += $(HYPERV_DRIVER_SOURCES) @@ -45,7 +43,7 @@ $(HYPERV_GENERATED_STAMP): $(srcdir)/hyperv/hyperv_wmi_generator.input \ $(srcdir)/hyperv/hyperv_wmi_generator.py $(srcdir) $(builddir) \ && touch $@ -MAINTAINERCLEANFILES += $(HYPERV_DRIVER_GENERATED) $(HYPERV_GENERATED_STAMP) +CLEANFILES += $(HYPERV_DRIVER_GENERATED) $(HYPERV_GENERATED_STAMP) if WITH_HYPERV noinst_LTLIBRARIES += libvirt_driver_hyperv.la diff --git a/src/interface/Makefile.inc.am b/src/interface/Makefile.inc.am index 30ea98ad15..5f22b90cb4 100644 --- a/src/interface/Makefile.inc.am +++ b/src/interface/Makefile.inc.am @@ -52,6 +52,7 @@ augeastest_DATA += interface/test_virtinterfaced.aug CLEANFILES += interface/virtinterfaced.aug virtinterfaced_SOURCES = $(REMOTE_DAEMON_SOURCES) +nodist_virtinterfaced_SOURCES = $(REMOTE_DAEMON_GENERATED) virtinterfaced_CFLAGS = \ $(REMOTE_DAEMON_CFLAGS) \ -DDAEMON_NAME="\"virtinterfaced\"" \ diff --git a/src/libxl/Makefile.inc.am b/src/libxl/Makefile.inc.am index 5d9cf14f7f..8686e78a5d 100644 --- a/src/libxl/Makefile.inc.am +++ b/src/libxl/Makefile.inc.am @@ -64,6 +64,7 @@ augeastest_DATA += libxl/test_virtxend.aug CLEANFILES += libxl/virtxend.aug virtxend_SOURCES = $(REMOTE_DAEMON_SOURCES) +nodist_virtxend_SOURCES = $(REMOTE_DAEMON_GENERATED) virtxend_CFLAGS = \ $(REMOTE_DAEMON_CFLAGS) \ -DDAEMON_NAME="\"virtxend\"" \ diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am index 2bfb662016..5c2361a581 100644 --- a/src/locking/Makefile.inc.am +++ b/src/locking/Makefile.inc.am @@ -43,8 +43,6 @@ LOCK_DAEMON_SOURCES = \ EXTRA_DIST += \ $(LOCK_PROTOCOL) \ - $(LOCK_PROTOCOL_GENERATED) \ - $(LOCK_DAEMON_GENERATED) \ $(LOCK_DAEMON_SOURCES) \ $(LOCK_DRIVER_LOCKD_SOURCES) \ $(LOCK_DRIVER_SOURCES) \ @@ -64,7 +62,7 @@ BUILT_SOURCES += \ $(LOCK_DAEMON_GENERATED) \ $(NULL) -MAINTAINERCLEANFILES += \ +CLEANFILES += \ $(LOCK_PROTOCOL_GENERATED) \ $(LOCK_DAEMON_GENERATED) \ $(NULL) @@ -105,6 +103,8 @@ if WITH_LIBVIRTD lockdriver_LTLIBRARIES += lockd.la lockd_la_SOURCES = \ $(LOCK_DRIVER_LOCKD_SOURCES) \ + $(NULL) +nodist_lockd_la_SOURCES = \ $(LOCK_PROTOCOL_GENERATED) \ $(NULL) lockd_la_CFLAGS = \ @@ -145,6 +145,8 @@ sbin_PROGRAMS += virtlockd virtlockd_SOURCES = \ $(LOCK_DAEMON_SOURCES) \ + $(NULL) +nodist_virtlockd_SOURCES = \ $(LOCK_PROTOCOL_GENERATED) \ $(LOCK_DAEMON_GENERATED) \ $(NULL) diff --git a/src/logging/Makefile.inc.am b/src/logging/Makefile.inc.am index dbaac2bb0d..fba54239d5 100644 --- a/src/logging/Makefile.inc.am +++ b/src/logging/Makefile.inc.am @@ -10,7 +10,6 @@ LOG_DAEMON_GENERATED = \ $(NULL) LOG_DRIVER_SOURCES = \ - $(LOG_PROTOCOL_GENERATED) \ logging/log_manager.c \ logging/log_manager.h \ $(NULL) @@ -30,10 +29,8 @@ LOG_PROTOCOL = $(srcdir)/logging/log_protocol.x EXTRA_DIST += \ $(LOG_PROTOCOL) \ - $(LOG_PROTOCOL_GENERATED) \ - $(LOG_DAEMON_GENERATED) \ $(LOG_DAEMON_SOURCES) \ - $(LOG_DRIVER_SOURCES) \ + $(LOG_DRIVER) \ logging/virtlogd.aug \ logging/virtlogd.conf \ logging/test_virtlogd.aug.in \ @@ -42,7 +39,7 @@ BUILT_SOURCES += \ $(LOG_PROTOCOL_GENERATED) \ $(LOG_DAEMON_GENERATED) \ $(NULL) -MAINTAINERCLEANFILES += \ +CLEANFILES += \ $(LOG_PROTOCOL_GENERATED) \ $(LOG_DAEMON_GENERATED) \ $(NULL) @@ -66,6 +63,9 @@ libvirt_la_BUILT_LIBADD += libvirt_driver_log.la libvirt_driver_log_la_SOURCES = \ $(LOG_DRIVER_SOURCES) \ $(NULL) +nodist_libvirt_driver_log_la_SOURCES = \ + $(LOG_PROTOCOL_GENERATED) \ + $(NULL) libvirt_driver_log_la_CFLAGS = \ -I$(builddir)/logging \ -I$(builddir)/rpc \ @@ -80,6 +80,8 @@ man8_MANS += virtlogd.8 virtlogd_SOURCES = \ $(LOG_DAEMON_SOURCES) \ + $(NULL) +nodist_virtlogd_SOURCES = \ $(LOG_PROTOCOL_GENERATED) \ $(LOG_DAEMON_GENERATED) \ $(NULL) diff --git a/src/lxc/Makefile.inc.am b/src/lxc/Makefile.inc.am index cb55dfd1c6..d3a7cbf93b 100644 --- a/src/lxc/Makefile.inc.am +++ b/src/lxc/Makefile.inc.am @@ -22,8 +22,6 @@ LXC_GENERATED = \ LXC_MONITOR_PROTOCOL = $(srcdir)/lxc/lxc_monitor_protocol.x LXC_DRIVER_SOURCES = \ - $(LXC_MONITOR_PROTOCOL_GENERATED) \ - $(LXC_MONITOR_GENERATED) \ lxc/lxc_conf.c \ lxc/lxc_conf.h \ lxc/lxc_container.c \ @@ -47,8 +45,6 @@ LXC_DRIVER_SOURCES = \ $(NULL) LXC_CONTROLLER_SOURCES = \ - $(LXC_MONITOR_PROTOCOL_GENERATED) \ - $(LXC_CONTROLLER_GENERATED) \ lxc/lxc_conf.c \ lxc/lxc_conf.h \ lxc/lxc_container.c \ @@ -62,13 +58,17 @@ LXC_CONTROLLER_SOURCES = \ lxc/lxc_controller.c \ $(NULL) - -DRIVER_SOURCE_FILES += $(LXC_DRIVER_SOURCES) -STATEFUL_DRIVER_SOURCE_FILES += $(LXC_DRIVER_SOURCES) +DRIVER_SOURCE_FILES += \ + $(LXC_MONITOR_PROTOCOL_GENERATED) \ + $(LXC_MONITOR_GENERATED) \ + $(LXC_DRIVER_SOURCES) +STATEFUL_DRIVER_SOURCE_FILES += \ + $(LXC_MONITOR_PROTOCOL_GENERATED) \ + $(LXC_MONITOR_GENERATED) \ + $(LXC_DRIVER_SOURCES) EXTRA_DIST += \ $(LXC_DRIVER_SOURCES) \ $(LXC_MONITOR_PROTOCOL) \ - $(LXC_GENERATED) \ $(LXC_CONTROLLER_SOURCES) \ $(NULL) @@ -112,7 +112,11 @@ libvirt_driver_lxc_impl_la_CFLAGS += $(BLKID_CFLAGS) libvirt_driver_lxc_impl_la_LIBADD += $(BLKID_LIBS) endif WITH_BLKID libvirt_driver_lxc_impl_la_LIBADD += $(SECDRIVER_LIBS) -libvirt_driver_lxc_impl_la_SOURCES = $(LXC_DRIVER_SOURCES) +libvirt_driver_lxc_impl_la_SOURCES = \ + $(LXC_DRIVER_SOURCES) +nodist_libvirt_driver_lxc_impl_la_SOURCES = \ + $(LXC_MONITOR_PROTOCOL_GENERATED) \ + $(LXC_MONITOR_GENERATED) sbin_PROGRAMS += virtlxcd @@ -123,6 +127,7 @@ augeastest_DATA += lxc/test_virtlxcd.aug CLEANFILES += lxc/virtlxcd.aug virtlxcd_SOURCES = $(REMOTE_DAEMON_SOURCES) +nodst_virtlxcd_SOURCES = $(REMOTE_DAEMON_GENERATED) virtlxcd_CFLAGS = \ $(REMOTE_DAEMON_CFLAGS) \ -DDAEMON_NAME="\"virtlxcd\"" \ @@ -183,6 +188,10 @@ libvirt_lxc_SOURCES = \ $(LXC_CONTROLLER_SOURCES) \ $(DATATYPES_SOURCES) \ $(NULL) +nodist_libvirt_lxc_SOURCES = \ + $(LXC_MONITOR_PROTOCOL_GENERATED) \ + $(LXC_CONTROLLER_GENERATED) \ + $(NULL) libvirt_lxc_LDFLAGS = \ $(AM_LDFLAGS) \ $(PIE_LDFLAGS) \ diff --git a/src/network/Makefile.inc.am b/src/network/Makefile.inc.am index 2f7932ae60..58dd90c23b 100644 --- a/src/network/Makefile.inc.am +++ b/src/network/Makefile.inc.am @@ -59,6 +59,7 @@ augeastest_DATA += network/test_virtnetworkd.aug CLEANFILES += network/virtnetworkd.aug virtnetworkd_SOURCES = $(REMOTE_DAEMON_SOURCES) +nodist_virtnetworkd_SOURCES = $(REMOTE_DAEMON_GENERATED) virtnetworkd_CFLAGS = \ $(REMOTE_DAEMON_CFLAGS) \ -DDAEMON_NAME="\"virtnetworkd\"" \ diff --git a/src/node_device/Makefile.inc.am b/src/node_device/Makefile.inc.am index 1dfa0a5274..2a8c437e7b 100644 --- a/src/node_device/Makefile.inc.am +++ b/src/node_device/Makefile.inc.am @@ -77,6 +77,7 @@ augeastest_DATA += node_device/test_virtnodedevd.aug CLEANFILES += node_device/virtnodedevd.aug virtnodedevd_SOURCES = $(REMOTE_DAEMON_SOURCES) +nodist_virtnodedevd_SOURCES = $(REMOTE_DAEMON_GENERATED) virtnodedevd_CFLAGS = \ $(REMOTE_DAEMON_CFLAGS) \ -DDAEMON_NAME="\"virtnodedevd\"" \ diff --git a/src/nwfilter/Makefile.inc.am b/src/nwfilter/Makefile.inc.am index ca05cba934..c320b75f78 100644 --- a/src/nwfilter/Makefile.inc.am +++ b/src/nwfilter/Makefile.inc.am @@ -60,6 +60,7 @@ augeastest_DATA += nwfilter/test_virtnwfilterd.aug CLEANFILES += nwfilter/virtnwfilterd.aug virtnwfilterd_SOURCES = $(REMOTE_DAEMON_SOURCES) +nodist_virtnwfilterd_SOURCES = $(REMOTE_DAEMON_GENERATED) virtnwfilterd_CFLAGS = \ $(REMOTE_DAEMON_CFLAGS) \ -DDAEMON_NAME="\"virtnwfilterd\"" \ diff --git a/src/qemu/Makefile.inc.am b/src/qemu/Makefile.inc.am index 69e290c428..3f3476b2b4 100644 --- a/src/qemu/Makefile.inc.am +++ b/src/qemu/Makefile.inc.am @@ -134,6 +134,7 @@ augeastest_DATA += qemu/test_virtqemud.aug CLEANFILES += qemu/virtqemud.aug virtqemud_SOURCES = $(REMOTE_DAEMON_SOURCES) +nodist_virtqemud_SOURCES = $(REMOTE_DAEMON_GENERATED) virtqemud_CFLAGS = \ $(REMOTE_DAEMON_CFLAGS) \ -DDAEMON_NAME="\"virtqemud\"" \ diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am index 242eb3ed2d..f5de92be23 100644 --- a/src/remote/Makefile.inc.am +++ b/src/remote/Makefile.inc.am @@ -15,7 +15,6 @@ REMOTE_DRIVER_GENERATED = \ REMOTE_DRIVER_SOURCES = \ remote/remote_driver.c \ remote/remote_driver.h \ - $(REMOTE_DRIVER_GENERATED) \ $(NULL) REMOTE_DAEMON_GENERATED = \ @@ -33,7 +32,6 @@ REMOTE_DAEMON_SOURCES = \ remote/remote_daemon_dispatch.h \ remote/remote_daemon_stream.c \ remote/remote_daemon_stream.h \ - $(REMOTE_DAEMON_GENERATED) \ $(NULL) REMOTE_DAEMON_CFLAGS = \ @@ -140,7 +138,9 @@ REMOTE_DRIVER_PROTOCOL = \ $(LXC_PROTOCOL) \ $(NULL) -DRIVER_SOURCE_FILES += $(REMOTE_DRIVER_SOURCES) +DRIVER_SOURCE_FILES += \ + $(REMOTE_DRIVER_GENERATED) \ + $(REMOTE_DRIVER_SOURCES) EXTRA_DIST += \ $(REMOTE_DRIVER_PROTOCOL) \ @@ -161,11 +161,9 @@ BUILT_SOURCES += \ $(REMOTE_DRIVER_GENERATED) \ $(REMOTE_DAEMON_GENERATED) \ $(NULL) -MAINTAINERCLEANFILES += \ +CLEANFILES += \ $(REMOTE_DRIVER_GENERATED) \ $(REMOTE_DAEMON_GENERATED) \ - $(NULL) -CLEANFILES += \ remote/libvirtd.conf \ remote/virtproxyd.conf \ $(NULL) @@ -182,10 +180,13 @@ libvirt_driver_remote_la_CFLAGS = \ $(AM_CFLAGS) \ $(NULL) libvirt_driver_remote_la_LDFLAGS = $(AM_LDFLAGS) -libvirt_driver_remote_la_SOURCES = $(REMOTE_DRIVER_SOURCES) +libvirt_driver_remote_la_SOURCES = \ + $(REMOTE_DRIVER_SOURCES) +nodist_libvirt_driver_remote_la_SOURCES = \ + $(REMOTE_DRIVER_GENERATED) if WITH_DTRACE_PROBES -nodist_libvirt_driver_remote_la_SOURCES = libvirt_probes.h +nodist_libvirt_driver_remote_la_SOURCES += libvirt_probes.h endif WITH_DTRACE_PROBES if WITH_SASL @@ -230,6 +231,8 @@ man8_MANS += libvirtd.8 libvirtd_SOURCES = $(REMOTE_DAEMON_SOURCES) +nodist_libvirtd_SOURCES = $(REMOTE_DAEMON_GENERATED) + libvirtd_CFLAGS = \ $(REMOTE_DAEMON_CFLAGS) \ -DSOCK_PREFIX="\"libvirt\"" \ @@ -243,6 +246,7 @@ libvirtd_LDFLAGS = $(REMOTE_DAEMON_LD_FLAGS) libvirtd_LDADD = $(REMOTE_DAEMON_LD_ADD) virtproxyd_SOURCES = $(REMOTE_DAEMON_SOURCES) +nodist_virtproxyd_SOURCES = $(REMOTE_DAEMON_GENERATED) virtproxyd_CFLAGS = \ $(REMOTE_DAEMON_CFLAGS) \ -DSOCK_PREFIX="\"libvirt\"" \ diff --git a/src/rpc/Makefile.inc.am b/src/rpc/Makefile.inc.am index 4aa38db1ab..a5bde92c9f 100644 --- a/src/rpc/Makefile.inc.am +++ b/src/rpc/Makefile.inc.am @@ -16,7 +16,7 @@ VIR_NET_RPC_GENERATED = \ $(NULL) BUILT_SOURCES += $(VIR_NET_RPC_GENERATED) -MAINTAINERCLEANFILES += $(VIR_NET_RPC_GENERATED) +CLEANFILES += $(VIR_NET_RPC_GENERATED) noinst_LTLIBRARIES += \ libvirt-net-rpc.la \ @@ -39,6 +39,9 @@ libvirt_net_rpc_la_SOURCES = \ rpc/virnetsocket.c \ rpc/virkeepalive.h \ rpc/virkeepalive.c \ + $(NULL) + +nodist_libvirt_net_rpc_la_SOURCES = \ $(VIR_NET_RPC_GENERATED) \ $(NULL) diff --git a/src/secret/Makefile.inc.am b/src/secret/Makefile.inc.am index 94f293d418..3d77366d3c 100644 --- a/src/secret/Makefile.inc.am +++ b/src/secret/Makefile.inc.am @@ -48,6 +48,7 @@ augeastest_DATA += secret/test_virtsecretd.aug CLEANFILES += secret/virtsecretd.aug virtsecretd_SOURCES = $(REMOTE_DAEMON_SOURCES) +nodist_virtsecretd_SOURCES = $(REMOTE_DAEMON_GENERATED) virtsecretd_CFLAGS = \ $(REMOTE_DAEMON_CFLAGS) \ -DDAEMON_NAME="\"virtsecretd\"" \ diff --git a/src/storage/Makefile.inc.am b/src/storage/Makefile.inc.am index ec35ab7665..1dfe48668f 100644 --- a/src/storage/Makefile.inc.am +++ b/src/storage/Makefile.inc.am @@ -152,6 +152,7 @@ augeastest_DATA += storage/test_virtstoraged.aug CLEANFILES += storage/virtstoraged.aug virtstoraged_SOURCES = $(REMOTE_DAEMON_SOURCES) +nodist_virtstoraged_SOURCES = $(REMOTE_DAEMON_GENERATED) virtstoraged_CFLAGS = \ $(REMOTE_DAEMON_CFLAGS) \ -DDAEMON_NAME="\"virtstoraged\"" \ diff --git a/src/util/Makefile.inc.am b/src/util/Makefile.inc.am index d8c8e61c4b..0eadef71ca 100644 --- a/src/util/Makefile.inc.am +++ b/src/util/Makefile.inc.am @@ -253,9 +253,8 @@ KEYMANS = $(KEYPODS:%.pod=%.7) man7_MANS += $(KEYMANS) -UTIL_SOURCES += $(KEYTABLES) BUILT_SOURCES += $(KEYTABLES) -MAINTAINERCLEANFILES += $(KEYTABLES) +CLEANFILES += $(KEYTABLES) CLEANFILES += $(KEYMANS) $(KEYPODS) UTIL_IO_HELPER_SOURCES = util/iohelper.c @@ -266,6 +265,9 @@ libvirt_la_BUILT_LIBADD += libvirt_util.la libvirt_util_la_SOURCES = \ $(UTIL_SOURCES) \ $(NULL) +nodist_libvirt_util_la_SOURCES = \ + $(KEYTABLES) \ + $(NULL) libvirt_util_la_CFLAGS = \ $(CAPNG_CFLAGS) \ $(YAJL_CFLAGS) \ diff --git a/src/vbox/Makefile.inc.am b/src/vbox/Makefile.inc.am index 346a84429b..551189c0f5 100644 --- a/src/vbox/Makefile.inc.am +++ b/src/vbox/Makefile.inc.am @@ -73,6 +73,7 @@ augeastest_DATA += vbox/test_virtvboxd.aug CLEANFILES += vbox/virtvboxd.aug virtvboxd_SOURCES = $(REMOTE_DAEMON_SOURCES) +nodist_virtvboxd_SOURCES = $(REMOTE_DAEMON_GENERATED) virtvboxd_CFLAGS = \ $(REMOTE_DAEMON_CFLAGS) \ -DDAEMON_NAME="\"virtvboxd\"" \ diff --git a/src/vz/Makefile.inc.am b/src/vz/Makefile.inc.am index c5bef04088..1757c8ba10 100644 --- a/src/vz/Makefile.inc.am +++ b/src/vz/Makefile.inc.am @@ -47,6 +47,7 @@ augeastest_DATA += vz/test_virtvzd.aug CLEANFILES += vz/virtvzd.aug virtvzd_SOURCES = $(REMOTE_DAEMON_SOURCES) +nodist_virtvzd_SOURCES = $(REMOTE_DAEMON_GENERATED) virtvzd_CFLAGS = \ $(REMOTE_DAEMON_CFLAGS) \ -DDAEMON_NAME="\"virtvzd\"" \ -- 2.21.0