[libvirt] [PATCH 00/17] Split up the src/Makefile.am even more

[libvirt] [PATCH] gnulib: update...

[libvirt] [PATCH v6 00/11] qemu:...

Daniel P. Berrangé

Wednesday, 28 February 2018 Wed, 28 Feb '18

4:14 a.m.

This is a continuation of my previous work to split src/Makefile.am This series does all the other non-virt drivers and utility code directories. This is about as far as I'm intending to take it for now. This is for post-freeze obviously :) Daniel P. Berrangé (17): make: split interface driver build rules into interface/Makefile.inc.am make: split network driver build rules into network/Makefile.inc.am make: split nwfilter driver build rules into nwfilter/Makefile.inc.am make: split nodedev driver build rules into node_device/Makefile.inc.am make: split secret driver build rules into secret/Makefile.inc.am make: split storage driver build rules into storage/Makefile.inc.am make: split remote driver & daemon build rules into remote/Makefile.inc.am make: split XML conf build rules into conf/Makefile.inc.am make: split CPU build rules into cpu/Makefile.inc.am make: split security driver build rules into security/Makefile.inc.am make: split access driver build rules into access/Makefile.inc.am make: split logging daemon build rules into logging/Makefile.inc.am make: split lock daemon build rules into locking/Makefile.inc.am make: split admin driver build rules into admin/Makefile.inc.am make: split RPC build rules into rpc/Makefile.inc.am make: split util build rules into util/Makefile.inc.am make: split vmx driver build rules into vmx/Makefile.inc.am src/Makefile.am | 1993 +-------------------------------------- src/access/Makefile.inc.am | 148 +++ src/admin/Makefile.inc.am | 50 + src/conf/Makefile.inc.am | 163 ++++ src/cpu/Makefile.inc.am | 24 + src/interface/Makefile.inc.am | 42 + src/locking/Makefile.inc.am | 321 +++++++ src/logging/Makefile.inc.am | 155 +++ src/network/Makefile.inc.am | 106 +++ src/node_device/Makefile.inc.am | 65 ++ src/nwfilter/Makefile.inc.am | 42 + src/remote/Makefile.inc.am | 342 +++++++ src/rpc/Makefile.inc.am | 147 +++ src/secret/Makefile.inc.am | 38 + src/security/Makefile.inc.am | 80 ++ src/storage/Makefile.inc.am | 323 +++++++ src/util/Makefile.inc.am | 325 +++++++ src/vmx/Makefile.inc.am | 22 + 18 files changed, 2435 insertions(+), 1951 deletions(-) create mode 100644 src/access/Makefile.inc.am create mode 100644 src/admin/Makefile.inc.am create mode 100644 src/conf/Makefile.inc.am create mode 100644 src/cpu/Makefile.inc.am create mode 100644 src/interface/Makefile.inc.am create mode 100644 src/locking/Makefile.inc.am create mode 100644 src/logging/Makefile.inc.am create mode 100644 src/network/Makefile.inc.am create mode 100644 src/node_device/Makefile.inc.am create mode 100644 src/nwfilter/Makefile.inc.am create mode 100644 src/remote/Makefile.inc.am create mode 100644 src/rpc/Makefile.inc.am create mode 100644 src/secret/Makefile.inc.am create mode 100644 src/security/Makefile.inc.am create mode 100644 src/storage/Makefile.inc.am create mode 100644 src/util/Makefile.inc.am create mode 100644 src/vmx/Makefile.inc.am -- 2.14.3

Show replies by date

Daniel P. Berrangé

Wednesday, 28 February Wed, 28 Feb

4:14 a.m.

New subject: [libvirt] [PATCH 01/17] make: split interface driver build rules into interface/Makefile.inc.am

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/Makefile.am | 41 +---------------------------------------- src/interface/Makefile.inc.am | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 40 deletions(-) create mode 100644 src/interface/Makefile.inc.am diff --git a/src/Makefile.am b/src/Makefile.am index 8d72f2f1e5..e50f6eecb3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -98,6 +98,7 @@ include xen/Makefile.inc.am include xenapi/Makefile.inc.am include vz/Makefile.inc.am include lxc/Makefile.inc.am +include interface/Makefile.inc.am THREAD_LIBS = $(LIB_PTHREAD) $(LTLIBMULTITHREAD) @@ -781,7 +782,6 @@ check-drivername: EXTRA_DIST += check-drivername.pl DRIVER_SOURCE_FILES += \ - $(INTERFACE_DRIVER_SOURCES) \ $(NETWORK_DRIVER_SOURCES) \ $(NODE_DEVICE_DRIVER_SOURCES) \ $(NODE_DEVICE_DRIVER_HAL_SOURCES) \ @@ -793,7 +793,6 @@ DRIVER_SOURCE_FILES += \ $(NULL) STATEFUL_DRIVER_SOURCE_FILES += \ - $(INTERFACE_DRIVER_SOURCES) \ $(NETWORK_DRIVER_SOURCES) \ $(NODE_DEVICE_DRIVER_SOURCES) \ $(NWFILTER_DRIVER_SOURCES) \ @@ -838,23 +837,6 @@ NETWORK_DRIVER_SOURCES = \ $(NULL) EXTRA_DIST += network/bridge_driver_linux.c network/bridge_driver_nop.c -INTERFACE_DRIVER_SOURCES = - -if WITH_INTERFACE -INTERFACE_DRIVER_SOURCES += \ - interface/interface_driver.h \ - interface/interface_driver.c - -if WITH_NETCF -INTERFACE_DRIVER_SOURCES += \ - interface/interface_backend_netcf.c -endif WITH_NETCF -if WITH_UDEV -INTERFACE_DRIVER_SOURCES += \ - interface/interface_backend_udev.c -endif WITH_UDEV -endif WITH_INTERFACE - SECRET_UTIL_SOURCES = \ secret/secret_util.h secret/secret_util.c @@ -1208,26 +1190,6 @@ endif WITH_NETWORK EXTRA_DIST += network/default.xml -if WITH_INTERFACE -mod_LTLIBRARIES += libvirt_driver_interface.la -libvirt_driver_interface_la_CFLAGS = \ - -I$(srcdir)/access \ - -I$(srcdir)/conf \ - $(AM_CFLAGS) $(LIBNL_CFLAGS) -libvirt_driver_interface_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF) -libvirt_driver_interface_la_LIBADD = -if WITH_NETCF -libvirt_driver_interface_la_CFLAGS += $(NETCF_CFLAGS) -libvirt_driver_interface_la_LIBADD += $(NETCF_LIBS) -endif WITH_NETCF -if WITH_UDEV -libvirt_driver_interface_la_CFLAGS += $(UDEV_CFLAGS) -libvirt_driver_interface_la_LIBADD += $(UDEV_LIBS) -endif WITH_UDEV -libvirt_driver_interface_la_LIBADD += libvirt.la ../gnulib/lib/libgnu.la -libvirt_driver_interface_la_SOURCES = $(INTERFACE_DRIVER_SOURCES) -endif WITH_INTERFACE - if WITH_SECRETS mod_LTLIBRARIES += libvirt_driver_secret.la libvirt_driver_secret_la_CFLAGS = \ @@ -1569,7 +1531,6 @@ access/viraccessapichecklxc.c: $(srcdir)/rpc/gendispatch.pl \ EXTRA_DIST += \ $(REMOTE_DRIVER_SOURCES) \ $(NETWORK_DRIVER_SOURCES) \ - $(INTERFACE_DRIVER_SOURCES) \ $(STORAGE_DRIVER_SOURCES) \ $(STORAGE_DRIVER_FS_SOURCES) \ $(STORAGE_DRIVER_LVM_SOURCES) \ diff --git a/src/interface/Makefile.inc.am b/src/interface/Makefile.inc.am new file mode 100644 index 0000000000..27fbfe1e1a --- /dev/null +++ b/src/interface/Makefile.inc.am @@ -0,0 +1,42 @@ +INTERFACE_DRIVER_SOURCES = \ + interface/interface_driver.h \ + interface/interface_driver.c \ + $(NULL) + +INTERFACE_DRIVER_NETCF_SOURCES = interface/interface_backend_netcf.c +INTERFACE_DRIVER_UDEV_SOURCES = interface/interface_backend_udev.c + +DRIVER_SOURCE_FILES += $(INTERFACE_DRIVER_SOURCES) +STATEFUL_DRIVER_SOURCE_FILES += $(INTERFACE_DRIVER_SOURCES) + +EXTRA_DIST += \ + $(INTERFACE_DRIVER_SOURCES) \ + $(INTERFACE_DRIVER_NETCF_SOURCES) \ + $(INTERFACE_DRIVER_UDEV_SOURCES) \ + $(NULL) + +if WITH_INTERFACE +mod_LTLIBRARIES += libvirt_driver_interface.la +libvirt_driver_interface_la_CFLAGS = \ + -I$(srcdir)/access \ + -I$(srcdir)/conf \ + $(AM_CFLAGS) \ + $(LIBNL_CFLAGS) \ + $(NULL) +libvirt_driver_interface_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF) +libvirt_driver_interface_la_LIBADD = \ + libvirt.la \ + ../gnulib/lib/libgnu.la \ + $(NULL) +libvirt_driver_interface_la_SOURCES = $(INTERFACE_DRIVER_SOURCES) +if WITH_NETCF +libvirt_driver_interface_la_CFLAGS += $(NETCF_CFLAGS) +libvirt_driver_interface_la_LIBADD += $(NETCF_LIBS) +libvirt_driver_interface_la_SOURCES += $(INTERFACE_DRIVER_NETCF_SOURCES) +endif WITH_NETCF +if WITH_UDEV +libvirt_driver_interface_la_CFLAGS += $(UDEV_CFLAGS) +libvirt_driver_interface_la_LIBADD += $(UDEV_LIBS) +libvirt_driver_interface_la_SOURCES += $(INTERFACE_DRIVER_UDEV_SOURCES) +endif WITH_UDEV +endif WITH_INTERFACE -- 2.14.3

Daniel P. Berrangé

4:14 a.m.

New subject: [libvirt] [PATCH 02/17] make: split network driver build rules into network/Makefile.inc.am

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/Makefile.am | 85 +---------------------------------- src/network/Makefile.inc.am | 106 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 107 insertions(+), 84 deletions(-) create mode 100644 src/network/Makefile.inc.am diff --git a/src/Makefile.am b/src/Makefile.am index e50f6eecb3..d16cbe2f0c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -99,6 +99,7 @@ include xenapi/Makefile.inc.am include vz/Makefile.inc.am include lxc/Makefile.inc.am include interface/Makefile.inc.am +include network/Makefile.inc.am THREAD_LIBS = $(LIB_PTHREAD) $(LTLIBMULTITHREAD) @@ -114,9 +115,6 @@ SECDRIVER_CFLAGS += $(APPARMOR_CFLAGS) SECDRIVER_LIBS += $(APPARMOR_LIBS) endif WITH_SECDRIVER_APPARMOR -if WITH_NETWORK -UUID=$(shell uuidgen 2>/dev/null) -endif WITH_NETWORK lib_LTLIBRARIES = libvirt.la libvirt-qemu.la libvirt-lxc.la @@ -782,7 +780,6 @@ check-drivername: EXTRA_DIST += check-drivername.pl DRIVER_SOURCE_FILES += \ - $(NETWORK_DRIVER_SOURCES) \ $(NODE_DEVICE_DRIVER_SOURCES) \ $(NODE_DEVICE_DRIVER_HAL_SOURCES) \ $(NODE_DEVICE_DRIVER_UDEV_SOURCES) \ @@ -793,7 +790,6 @@ DRIVER_SOURCE_FILES += \ $(NULL) STATEFUL_DRIVER_SOURCE_FILES += \ - $(NETWORK_DRIVER_SOURCES) \ $(NODE_DEVICE_DRIVER_SOURCES) \ $(NWFILTER_DRIVER_SOURCES) \ $(SECRET_DRIVER_SOURCES) \ @@ -830,12 +826,6 @@ SECURITY_DRIVER_APPARMOR_HELPER_SOURCES = \ $(DATATYPES_SOURCES) \ security/virt-aa-helper.c -NETWORK_DRIVER_SOURCES = \ - network/bridge_driver.h network/bridge_driver.c \ - network/bridge_driver_platform.h \ - network/bridge_driver_platform.c \ - $(NULL) -EXTRA_DIST += network/bridge_driver_linux.c network/bridge_driver_nop.c SECRET_UTIL_SOURCES = \ secret/secret_util.h secret/secret_util.c @@ -894,9 +884,6 @@ STORAGE_HELPER_DISK_SOURCES = \ UTIL_IO_HELPER_SOURCES = \ util/iohelper.c -NETWORK_LEASES_HELPER_SOURCES = \ - network/leaseshelper.c - # Network filters NWFILTER_DRIVER_SOURCES = \ nwfilter/nwfilter_driver.h nwfilter/nwfilter_driver.c \ @@ -1167,27 +1154,6 @@ EXTRA_DIST += \ $< $(srcdir)/$(subst $(srcdir)/,,$@) -if WITH_NETWORK -noinst_LTLIBRARIES += libvirt_driver_network_impl.la -libvirt_driver_network_la_SOURCES = -libvirt_driver_network_la_LIBADD = libvirt_driver_network_impl.la -mod_LTLIBRARIES += libvirt_driver_network.la -libvirt_driver_network_la_LIBADD += libvirt.la ../gnulib/lib/libgnu.la \ - $(LIBNL_LIBS) \ - $(DBUS_LIBS) \ - $(NULL) -libvirt_driver_network_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF) - -libvirt_driver_network_impl_la_CFLAGS = \ - $(LIBNL_CFLAGS) \ - $(DBUS_CFLAGS) \ - -I$(srcdir)/access \ - -I$(srcdir)/conf \ - $(AM_CFLAGS) -libvirt_driver_network_impl_la_SOURCES = $(NETWORK_DRIVER_SOURCES) -libvirt_driver_network_impl_la_LIBADD = $(DBUS_LIBS) -endif WITH_NETWORK -EXTRA_DIST += network/default.xml if WITH_SECRETS @@ -1530,7 +1496,6 @@ access/viraccessapichecklxc.c: $(srcdir)/rpc/gendispatch.pl \ # Add all conditional sources just in case... EXTRA_DIST += \ $(REMOTE_DRIVER_SOURCES) \ - $(NETWORK_DRIVER_SOURCES) \ $(STORAGE_DRIVER_SOURCES) \ $(STORAGE_DRIVER_FS_SOURCES) \ $(STORAGE_DRIVER_LVM_SOURCES) \ @@ -2652,27 +2617,6 @@ libvirt_iohelper_CFLAGS = \ $(PIE_CFLAGS) \ $(NULL) -if WITH_NETWORK -libexec_PROGRAMS += libvirt_leaseshelper -libvirt_leaseshelper_SOURCES = $(NETWORK_LEASES_HELPER_SOURCES) -libvirt_leaseshelper_LDFLAGS = \ - $(AM_LDFLAGS) \ - $(PIE_LDFLAGS) \ - $(NULL) -libvirt_leaseshelper_LDADD = \ - libvirt_util.la \ - ../gnulib/lib/libgnu.la -if WITH_DTRACE_PROBES -libvirt_leaseshelper_LDADD += libvirt_probes.lo -endif WITH_DTRACE_PROBES - -libvirt_leaseshelper_CFLAGS = \ - $(AM_CFLAGS) \ - $(PIE_CFLAGS) \ - $(NULL) -else ! WITH_NETWORK -EXTRA_DIST += $(NETWORK_LEASES_HELPER_SOURCES) -endif ! WITH_NETWORK endif WITH_LIBVIRTD @@ -2834,25 +2778,6 @@ endif WITH_LIBVIRTD if WITH_SANLOCK $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/sanlock" endif WITH_SANLOCK -if WITH_NETWORK - $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/network" - $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/dnsmasq" - $(MKDIR_P) "$(DESTDIR)$(localstatedir)/run/libvirt/network" - $(MKDIR_P) "$(DESTDIR)$(confdir)/qemu/networks/autostart" - $(INSTALL_DATA) $(srcdir)/network/default.xml \ - $(DESTDIR)$(confdir)/qemu/networks/default.xml - test -z "$(UUID)" || \ - { sed -e "s,</name>,</name>; <uuid>$(UUID)</uuid>," \ - $(DESTDIR)$(confdir)/qemu/networks/default.xml | \ - tr ";" "\n" > \ - $(DESTDIR)$(confdir)/qemu/networks/default.xml.t && \ - cp $(DESTDIR)$(confdir)/qemu/networks/default.xml.t \ - $(DESTDIR)$(confdir)/qemu/networks/default.xml && \ - rm $(DESTDIR)$(confdir)/qemu/networks/default.xml.t; } - ( cd $(DESTDIR)$(confdir)/qemu/networks/autostart && \ - rm -f default.xml && \ - $(LN_S) ../default.xml default.xml ) -endif WITH_NETWORK uninstall-local:: uninstall-init uninstall-systemd uninstall-upstart \ uninstall-sysctl uninstall-polkit uninstall-sasl \ @@ -2870,14 +2795,6 @@ endif WITH_LIBVIRTD if WITH_SANLOCK rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/sanlock" ||: endif WITH_SANLOCK -if WITH_NETWORK - rm -f $(DESTDIR)$(confdir)/qemu/networks/autostart/default.xml - rm -f $(DESTDIR)$(confdir)/qemu/networks/default.xml - rmdir "$(DESTDIR)$(confdir)/qemu/networks/autostart" || : - rmdir "$(DESTDIR)$(confdir)/qemu/networks" || : - rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/network" ||: - rmdir "$(DESTDIR)$(localstatedir)/run/libvirt/network" ||: -endif WITH_NETWORK rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt" ||: CLEANFILES += *.gcov .libs/*.gcda .libs/*.gcno *.gcno *.gcda *.i *.s diff --git a/src/network/Makefile.inc.am b/src/network/Makefile.inc.am new file mode 100644 index 0000000000..508c8c0422 --- /dev/null +++ b/src/network/Makefile.inc.am @@ -0,0 +1,106 @@ +NETWORK_DRIVER_SOURCES = \ + network/bridge_driver.h \ + network/bridge_driver.c \ + network/bridge_driver_platform.h \ + network/bridge_driver_platform.c \ + $(NULL) + +NETWORK_DRIVER_PLATFORM_INC = \ + network/bridge_driver_linux.c \ + network/bridge_driver_nop.c \ + $(NULL) + +NETWORK_LEASES_HELPER_SOURCES = \ + network/leaseshelper.c \ + $(NULL) + +DRIVER_SOURCE_FILES += $(NETWORK_DRIVER_SOURCES) +STATEFUL_DRIVER_SOURCE_FILES += $(NETWORK_DRIVER_SOURCES) +EXTRA_DIST += \ + $(NETWORK_DRIVER_SOURCES) \ + $(NETWORK_DRIVER_PLATFORM_INC) \ + $(NETWORK_LEASES_HELPER_SOURCES) \ + $(NULL) + + +if WITH_NETWORK + +noinst_LTLIBRARIES += libvirt_driver_network_impl.la +libvirt_driver_network_la_SOURCES = +libvirt_driver_network_la_LIBADD = \ + libvirt_driver_network_impl.la \ + libvirt.la \ + ../gnulib/lib/libgnu.la \ + $(LIBNL_LIBS) \ + $(DBUS_LIBS) \ + $(NULL) +mod_LTLIBRARIES += libvirt_driver_network.la +libvirt_driver_network_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF) + +libvirt_driver_network_impl_la_CFLAGS = \ + $(LIBNL_CFLAGS) \ + $(DBUS_CFLAGS) \ + -I$(srcdir)/access \ + -I$(srcdir)/conf \ + $(AM_CFLAGS) \ + $(NULL) +libvirt_driver_network_impl_la_SOURCES = $(NETWORK_DRIVER_SOURCES) +libvirt_driver_network_impl_la_LIBADD = $(DBUS_LIBS) + +libexec_PROGRAMS += libvirt_leaseshelper +libvirt_leaseshelper_SOURCES = $(NETWORK_LEASES_HELPER_SOURCES) +libvirt_leaseshelper_LDFLAGS = \ + $(AM_LDFLAGS) \ + $(PIE_LDFLAGS) \ + $(NULL) +libvirt_leaseshelper_LDADD = \ + libvirt_util.la \ + ../gnulib/lib/libgnu.la +if WITH_DTRACE_PROBES +libvirt_leaseshelper_LDADD += libvirt_probes.lo +endif WITH_DTRACE_PROBES + +libvirt_leaseshelper_CFLAGS = \ + $(AM_CFLAGS) \ + $(PIE_CFLAGS) \ + $(NULL) + +INSTALL_DATA_DIRS += network + +UUID=$(shell uuidgen 2>/dev/null) + +install-data-network: + $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/network" + $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/dnsmasq" + $(MKDIR_P) "$(DESTDIR)$(localstatedir)/run/libvirt/network" + $(MKDIR_P) "$(DESTDIR)$(confdir)/qemu/networks/autostart" + $(INSTALL_DATA) $(srcdir)/network/default.xml \ + $(DESTDIR)$(confdir)/qemu/networks/default.xml + test -z "$(UUID)" || \ + { sed -e "s,</name>,</name>; <uuid>$(UUID)</uuid>," \ + $(DESTDIR)$(confdir)/qemu/networks/default.xml | \ + tr ";" "\n" > \ + $(DESTDIR)$(confdir)/qemu/networks/default.xml.t && \ + cp $(DESTDIR)$(confdir)/qemu/networks/default.xml.t \ + $(DESTDIR)$(confdir)/qemu/networks/default.xml && \ + rm $(DESTDIR)$(confdir)/qemu/networks/default.xml.t; } + ( cd $(DESTDIR)$(confdir)/qemu/networks/autostart && \ + rm -f default.xml && \ + $(LN_S) ../default.xml default.xml ) + +uninstall-data-network: + rm -f $(DESTDIR)$(confdir)/qemu/networks/autostart/default.xml + rm -f $(DESTDIR)$(confdir)/qemu/networks/default.xml + rmdir "$(DESTDIR)$(confdir)/qemu/networks/autostart" || : + rmdir "$(DESTDIR)$(confdir)/qemu/networks" || : + rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/network" ||: + rmdir "$(DESTDIR)$(localstatedir)/run/libvirt/network" ||: + +endif WITH_NETWORK + +EXTRA_DIST += network/default.xml + +.PHONY: \ + install-data-network \ + uninstall-data-network \ + $(NULL) -- 2.14.3

Daniel P. Berrangé

4:14 a.m.

New subject: [libvirt] [PATCH 03/17] make: split nwfilter driver build rules into nwfilter/Makefile.inc.am

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/Makefile.am | 39 +-------------------------------------- src/nwfilter/Makefile.inc.am | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 38 deletions(-) create mode 100644 src/nwfilter/Makefile.inc.am diff --git a/src/Makefile.am b/src/Makefile.am index d16cbe2f0c..8c21453ec7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -100,6 +100,7 @@ include vz/Makefile.inc.am include lxc/Makefile.inc.am include interface/Makefile.inc.am include network/Makefile.inc.am +include nwfilter/Makefile.inc.am THREAD_LIBS = $(LIB_PTHREAD) $(LTLIBMULTITHREAD) @@ -783,7 +784,6 @@ DRIVER_SOURCE_FILES += \ $(NODE_DEVICE_DRIVER_SOURCES) \ $(NODE_DEVICE_DRIVER_HAL_SOURCES) \ $(NODE_DEVICE_DRIVER_UDEV_SOURCES) \ - $(NWFILTER_DRIVER_SOURCES) \ $(REMOTE_DRIVER_SOURCES) \ $(SECRET_DRIVER_SOURCES) \ $(STORAGE_DRIVER_SOURCES) \ @@ -791,7 +791,6 @@ DRIVER_SOURCE_FILES += \ STATEFUL_DRIVER_SOURCE_FILES += \ $(NODE_DEVICE_DRIVER_SOURCES) \ - $(NWFILTER_DRIVER_SOURCES) \ $(SECRET_DRIVER_SOURCES) \ $(STORAGE_DRIVER_SOURCES) \ $(NULL) @@ -884,19 +883,6 @@ STORAGE_HELPER_DISK_SOURCES = \ UTIL_IO_HELPER_SOURCES = \ util/iohelper.c -# Network filters -NWFILTER_DRIVER_SOURCES = \ - nwfilter/nwfilter_driver.h nwfilter/nwfilter_driver.c \ - nwfilter/nwfilter_tech_driver.h \ - nwfilter/nwfilter_gentech_driver.c \ - nwfilter/nwfilter_gentech_driver.h \ - nwfilter/nwfilter_dhcpsnoop.c \ - nwfilter/nwfilter_dhcpsnoop.h \ - nwfilter/nwfilter_ebiptables_driver.c \ - nwfilter/nwfilter_ebiptables_driver.h \ - nwfilter/nwfilter_learnipaddr.c \ - nwfilter/nwfilter_learnipaddr.h - # Security framework and drivers for various models SECURITY_DRIVER_SOURCES = \ @@ -1362,28 +1348,6 @@ libvirt_driver_nodedev_la_LIBADD += libvirt.la ../gnulib/lib/libgnu.la endif WITH_NODE_DEVICES -if WITH_NWFILTER -noinst_LTLIBRARIES += libvirt_driver_nwfilter_impl.la -libvirt_driver_nwfilter_la_SOURCES = -libvirt_driver_nwfilter_la_LIBADD = libvirt_driver_nwfilter_impl.la -mod_LTLIBRARIES += libvirt_driver_nwfilter.la -libvirt_driver_nwfilter_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF) -libvirt_driver_nwfilter_impl_la_CFLAGS = \ - $(LIBPCAP_CFLAGS) \ - $(LIBNL_CFLAGS) \ - $(DBUS_CFLAGS) \ - -I$(srcdir)/access \ - -I$(srcdir)/conf \ - $(AM_CFLAGS) -libvirt_driver_nwfilter_impl_la_LDFLAGS = $(AM_LDFLAGS) -libvirt_driver_nwfilter_impl_la_LIBADD = \ - $(LIBPCAP_LIBS) \ - $(LIBNL_LIBS) \ - $(DBUS_LIBS) -libvirt_driver_nwfilter_impl_la_LIBADD += libvirt.la ../gnulib/lib/libgnu.la -libvirt_driver_nwfilter_impl_la_SOURCES = $(NWFILTER_DRIVER_SOURCES) -endif WITH_NWFILTER - libvirt_security_manager_la_SOURCES = $(SECURITY_DRIVER_SOURCES) noinst_LTLIBRARIES += libvirt_security_manager.la @@ -1511,7 +1475,6 @@ EXTRA_DIST += \ $(NODE_DEVICE_DRIVER_SOURCES) \ $(NODE_DEVICE_DRIVER_HAL_SOURCES) \ $(NODE_DEVICE_DRIVER_UDEV_SOURCES) \ - $(NWFILTER_DRIVER_SOURCES) \ $(SECURITY_DRIVER_SELINUX_SOURCES) \ $(SECURITY_DRIVER_APPARMOR_SOURCES) \ $(SECRET_DRIVER_SOURCES) \ diff --git a/src/nwfilter/Makefile.inc.am b/src/nwfilter/Makefile.inc.am new file mode 100644 index 0000000000..16345efcb6 --- /dev/null +++ b/src/nwfilter/Makefile.inc.am @@ -0,0 +1,42 @@ +NWFILTER_DRIVER_SOURCES = \ + nwfilter/nwfilter_driver.h \ + nwfilter/nwfilter_driver.c \ + nwfilter/nwfilter_tech_driver.h \ + nwfilter/nwfilter_gentech_driver.c \ + nwfilter/nwfilter_gentech_driver.h \ + nwfilter/nwfilter_dhcpsnoop.c \ + nwfilter/nwfilter_dhcpsnoop.h \ + nwfilter/nwfilter_ebiptables_driver.c \ + nwfilter/nwfilter_ebiptables_driver.h \ + nwfilter/nwfilter_learnipaddr.c \ + nwfilter/nwfilter_learnipaddr.h \ + $(NULL) + +DRIVER_SOURCE_FILES += $(NWFILTER_DRIVER_SOURCES) +STATEFUL_DRIVER_SOURCE_FILES += $(NWFILTER_DRIVER_SOURCES) +EXTRA_DIST += $(NWFILTER_DRIVER_SOURCES) + +if WITH_NWFILTER +noinst_LTLIBRARIES += libvirt_driver_nwfilter_impl.la +libvirt_driver_nwfilter_la_SOURCES = +libvirt_driver_nwfilter_la_LIBADD = libvirt_driver_nwfilter_impl.la +mod_LTLIBRARIES += libvirt_driver_nwfilter.la +libvirt_driver_nwfilter_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF) +libvirt_driver_nwfilter_impl_la_CFLAGS = \ + $(LIBPCAP_CFLAGS) \ + $(LIBNL_CFLAGS) \ + $(DBUS_CFLAGS) \ + -I$(srcdir)/access \ + -I$(srcdir)/conf \ + $(AM_CFLAGS) \ + $(NULL) +libvirt_driver_nwfilter_impl_la_LDFLAGS = $(AM_LDFLAGS) +libvirt_driver_nwfilter_impl_la_LIBADD = \ + $(LIBPCAP_LIBS) \ + $(LIBNL_LIBS) \ + $(DBUS_LIBS) \ + libvirt.la \ + ../gnulib/lib/libgnu.la \ + $(NULL) +libvirt_driver_nwfilter_impl_la_SOURCES = $(NWFILTER_DRIVER_SOURCES) +endif WITH_NWFILTER -- 2.14.3

Daniel P. Berrangé

4:14 a.m.

New subject: [libvirt] [PATCH 04/17] make: split nodedev driver build rules into node_device/Makefile.inc.am

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/Makefile.am | 46 +---------------------------- src/node_device/Makefile.inc.am | 65 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 45 deletions(-) create mode 100644 src/node_device/Makefile.inc.am diff --git a/src/Makefile.am b/src/Makefile.am index 8c21453ec7..bbaab675f5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -101,6 +101,7 @@ include lxc/Makefile.inc.am include interface/Makefile.inc.am include network/Makefile.inc.am include nwfilter/Makefile.inc.am +include node_device/Makefile.inc.am THREAD_LIBS = $(LIB_PTHREAD) $(LTLIBMULTITHREAD) @@ -781,16 +782,12 @@ check-drivername: EXTRA_DIST += check-drivername.pl DRIVER_SOURCE_FILES += \ - $(NODE_DEVICE_DRIVER_SOURCES) \ - $(NODE_DEVICE_DRIVER_HAL_SOURCES) \ - $(NODE_DEVICE_DRIVER_UDEV_SOURCES) \ $(REMOTE_DRIVER_SOURCES) \ $(SECRET_DRIVER_SOURCES) \ $(STORAGE_DRIVER_SOURCES) \ $(NULL) STATEFUL_DRIVER_SOURCE_FILES += \ - $(NODE_DEVICE_DRIVER_SOURCES) \ $(SECRET_DRIVER_SOURCES) \ $(STORAGE_DRIVER_SOURCES) \ $(NULL) @@ -931,18 +928,6 @@ ACCESS_DRIVER_POLKIT_POLICY = \ $(srcdir)/access/org.libvirt.api.policy -NODE_DEVICE_DRIVER_SOURCES = \ - node_device/node_device_driver.c \ - node_device/node_device_driver.h - -NODE_DEVICE_DRIVER_HAL_SOURCES = \ - node_device/node_device_hal.c \ - node_device/node_device_hal.h - -NODE_DEVICE_DRIVER_UDEV_SOURCES = \ - node_device/node_device_udev.c \ - node_device/node_device_udev.h - CPU_SOURCES = \ cpu/cpu.h cpu/cpu.c \ cpu/cpu_x86.h cpu/cpu_x86.c cpu/cpu_x86_data.h \ @@ -1321,32 +1306,6 @@ libvirt_storage_backend_vstorage_la_LDFLAGS = $(AM_LDFLAGS_MOD) libvirt_storage_backend_vstorage_la_LIBADD = libvirt.la ../gnulib/lib/libgnu.la endif WITH_STORAGE_VSTORAGE -if WITH_NODE_DEVICES -# Needed to keep automake quiet about conditionals -mod_LTLIBRARIES += libvirt_driver_nodedev.la -libvirt_driver_nodedev_la_SOURCES = $(NODE_DEVICE_DRIVER_SOURCES) - -libvirt_driver_nodedev_la_CFLAGS = \ - -I$(srcdir)/access \ - -I$(srcdir)/conf \ - $(AM_CFLAGS) $(LIBNL_CFLAGS) -libvirt_driver_nodedev_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF) -libvirt_driver_nodedev_la_LIBADD = - -if WITH_HAL -libvirt_driver_nodedev_la_SOURCES += $(NODE_DEVICE_DRIVER_HAL_SOURCES) -libvirt_driver_nodedev_la_CFLAGS += $(HAL_CFLAGS) -libvirt_driver_nodedev_la_LIBADD += $(HAL_LIBS) -endif WITH_HAL -if WITH_UDEV -libvirt_driver_nodedev_la_SOURCES += $(NODE_DEVICE_DRIVER_UDEV_SOURCES) -libvirt_driver_nodedev_la_CFLAGS += $(UDEV_CFLAGS) $(PCIACCESS_CFLAGS) -libvirt_driver_nodedev_la_LIBADD += $(UDEV_LIBS) $(PCIACCESS_LIBS) -endif WITH_UDEV - -libvirt_driver_nodedev_la_LIBADD += libvirt.la ../gnulib/lib/libgnu.la -endif WITH_NODE_DEVICES - libvirt_security_manager_la_SOURCES = $(SECURITY_DRIVER_SOURCES) @@ -1472,9 +1431,6 @@ EXTRA_DIST += \ $(STORAGE_DRIVER_GLUSTER_SOURCES) \ $(STORAGE_DRIVER_ZFS_SOURCES) \ $(STORAGE_DRIVER_VSTORAGE_SOURCES) \ - $(NODE_DEVICE_DRIVER_SOURCES) \ - $(NODE_DEVICE_DRIVER_HAL_SOURCES) \ - $(NODE_DEVICE_DRIVER_UDEV_SOURCES) \ $(SECURITY_DRIVER_SELINUX_SOURCES) \ $(SECURITY_DRIVER_APPARMOR_SOURCES) \ $(SECRET_DRIVER_SOURCES) \ diff --git a/src/node_device/Makefile.inc.am b/src/node_device/Makefile.inc.am new file mode 100644 index 0000000000..5f5ec68b29 --- /dev/null +++ b/src/node_device/Makefile.inc.am @@ -0,0 +1,65 @@ +NODE_DEVICE_DRIVER_SOURCES = \ + node_device/node_device_driver.c \ + node_device/node_device_driver.h \ + $(NULL) + +NODE_DEVICE_DRIVER_HAL_SOURCES = \ + node_device/node_device_hal.c \ + node_device/node_device_hal.h \ + $(NULL) + +NODE_DEVICE_DRIVER_UDEV_SOURCES = \ + node_device/node_device_udev.c \ + node_device/node_device_udev.h \ + $(NULL) + +DRIVER_SOURCE_FILES += \ + $(NODE_DEVICE_DRIVER_SOURCES) \ + $(NODE_DEVICE_DRIVER_HAL_SOURCES) \ + $(NODE_DEVICE_DRIVER_UDEV_SOURCES) \ + $(NULL) + +STATEFUL_DRIVER_SOURCE_FILES += \ + $(NODE_DEVICE_DRIVER_SOURCES) \ + $(NULL) + +EXTRA_DIST += \ + $(NODE_DEVICE_DRIVER_SOURCES) \ + $(NODE_DEVICE_DRIVER_HAL_SOURCES) \ + $(NODE_DEVICE_DRIVER_UDEV_SOURCES) \ + $(NULL) + + +if WITH_NODE_DEVICES +# Needed to keep automake quiet about conditionals +mod_LTLIBRARIES += libvirt_driver_nodedev.la +libvirt_driver_nodedev_la_SOURCES = $(NODE_DEVICE_DRIVER_SOURCES) + +libvirt_driver_nodedev_la_CFLAGS = \ + -I$(srcdir)/access \ + -I$(srcdir)/conf \ + $(AM_CFLAGS) \ + $(LIBNL_CFLAGS) \ + $(NULL) +libvirt_driver_nodedev_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF) +libvirt_driver_nodedev_la_LIBADD = + +if WITH_HAL +libvirt_driver_nodedev_la_SOURCES += $(NODE_DEVICE_DRIVER_HAL_SOURCES) +libvirt_driver_nodedev_la_CFLAGS += $(HAL_CFLAGS) +libvirt_driver_nodedev_la_LIBADD += $(HAL_LIBS) +endif WITH_HAL +if WITH_UDEV +libvirt_driver_nodedev_la_SOURCES += $(NODE_DEVICE_DRIVER_UDEV_SOURCES) +libvirt_driver_nodedev_la_CFLAGS += \ + $(UDEV_CFLAGS) \ + $(PCIACCESS_CFLAGS) \ + $(NULL) +libvirt_driver_nodedev_la_LIBADD += \ + $(UDEV_LIBS) \ + $(PCIACCESS_LIBS) \ + $(NULL) +endif WITH_UDEV + +libvirt_driver_nodedev_la_LIBADD += libvirt.la ../gnulib/lib/libgnu.la +endif WITH_NODE_DEVICES -- 2.14.3

Daniel P. Berrangé

4:14 a.m.

New subject: [libvirt] [PATCH 05/17] make: split secret driver build rules into secret/Makefile.inc.am

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/Makefile.am | 29 +---------------------------- src/secret/Makefile.inc.am | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 28 deletions(-) create mode 100644 src/secret/Makefile.inc.am diff --git a/src/Makefile.am b/src/Makefile.am index bbaab675f5..6518464639 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -102,6 +102,7 @@ include interface/Makefile.inc.am include network/Makefile.inc.am include nwfilter/Makefile.inc.am include node_device/Makefile.inc.am +include secret/Makefile.inc.am THREAD_LIBS = $(LIB_PTHREAD) $(LTLIBMULTITHREAD) @@ -783,12 +784,10 @@ EXTRA_DIST += check-drivername.pl DRIVER_SOURCE_FILES += \ $(REMOTE_DRIVER_SOURCES) \ - $(SECRET_DRIVER_SOURCES) \ $(STORAGE_DRIVER_SOURCES) \ $(NULL) STATEFUL_DRIVER_SOURCE_FILES += \ - $(SECRET_DRIVER_SOURCES) \ $(STORAGE_DRIVER_SOURCES) \ $(NULL) @@ -823,12 +822,6 @@ SECURITY_DRIVER_APPARMOR_HELPER_SOURCES = \ security/virt-aa-helper.c -SECRET_UTIL_SOURCES = \ - secret/secret_util.h secret/secret_util.c - -SECRET_DRIVER_SOURCES = \ - secret/secret_driver.h secret/secret_driver.c - # Storage backend specific impls STORAGE_DRIVER_BACKEND_SOURCES = \ storage/storage_backend.h storage/storage_backend.c @@ -981,12 +974,6 @@ libvirt_cpu_la_CFLAGS = \ -I$(srcdir)/conf $(AM_CFLAGS) libvirt_cpu_la_SOURCES = $(CPU_SOURCES) -noinst_LTLIBRARIES += libvirt_secret.la -libvirt_la_BUILT_LIBADD += libvirt_secret.la -libvirt_secret_la_CFLAGS = $(AM_CFLAGS) -libvirt_secret_la_LDFLAGS = $(AM_LDFLAGS) -libvirt_secret_la_SOURCES = $(SECRET_UTIL_SOURCES) - if WITH_VMX noinst_LTLIBRARIES += libvirt_vmx.la libvirt_la_BUILT_LIBADD += libvirt_vmx.la @@ -1126,18 +1113,6 @@ EXTRA_DIST += \ - -if WITH_SECRETS -mod_LTLIBRARIES += libvirt_driver_secret.la -libvirt_driver_secret_la_CFLAGS = \ - -I$(srcdir)/access \ - -I$(srcdir)/conf \ - $(AM_CFLAGS) -libvirt_driver_secret_la_LIBADD = libvirt.la ../gnulib/lib/libgnu.la -libvirt_driver_secret_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF) -libvirt_driver_secret_la_SOURCES = $(SECRET_DRIVER_SOURCES) -endif WITH_SECRETS - # Needed to keep automake quiet about conditionals libvirt_driver_storage_impl_la_SOURCES = libvirt_driver_storage_impl_la_CFLAGS = \ @@ -1433,8 +1408,6 @@ EXTRA_DIST += \ $(STORAGE_DRIVER_VSTORAGE_SOURCES) \ $(SECURITY_DRIVER_SELINUX_SOURCES) \ $(SECURITY_DRIVER_APPARMOR_SOURCES) \ - $(SECRET_DRIVER_SOURCES) \ - $(SECRET_UTIL_SOURCES) \ $(ACCESS_DRIVER_POLKIT_POLICY) check-local: check-augeas diff --git a/src/secret/Makefile.inc.am b/src/secret/Makefile.inc.am new file mode 100644 index 0000000000..305c4a1ead --- /dev/null +++ b/src/secret/Makefile.inc.am @@ -0,0 +1,38 @@ +SECRET_DRIVER_SOURCES = \ + secret/secret_driver.h \ + secret/secret_driver.c \ + $(NULL) + +SECRET_UTIL_SOURCES = \ + secret/secret_util.h \ + secret/secret_util.c \ + $(NULL) + + +DRIVER_SOURCE_FILES += $(SECRET_DRIVER_SOURCES) +STATEFUL_DRIVER_SOURCE_FILES += $(SECRET_DRIVER_SOURCES) +EXTRA_DIST += \ + $(SECRET_DRIVER_SOURCES) \ + $(SECRET_UTIL_SOURCESQ) \ + $(NULL) + +noinst_LTLIBRARIES += libvirt_secret.la +libvirt_la_BUILT_LIBADD += libvirt_secret.la +libvirt_secret_la_CFLAGS = $(AM_CFLAGS) +libvirt_secret_la_LDFLAGS = $(AM_LDFLAGS) +libvirt_secret_la_SOURCES = $(SECRET_UTIL_SOURCES) + +if WITH_SECRETS +mod_LTLIBRARIES += libvirt_driver_secret.la +libvirt_driver_secret_la_CFLAGS = \ + -I$(srcdir)/access \ + -I$(srcdir)/conf \ + $(AM_CFLAGS) \ + $(NULL) +libvirt_driver_secret_la_LIBADD = \ + libvirt.la \ + ../gnulib/lib/libgnu.la \ + $(NULL) +libvirt_driver_secret_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF) +libvirt_driver_secret_la_SOURCES = $(SECRET_DRIVER_SOURCES) +endif WITH_SECRETS -- 2.14.3

Daniel P. Berrangé

4:14 a.m.

New subject: [libvirt] [PATCH 06/17] make: split storage driver build rules into storage/Makefile.inc.am

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/Makefile.am | 259 +---------------------------------- src/storage/Makefile.inc.am | 323 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 324 insertions(+), 258 deletions(-) create mode 100644 src/storage/Makefile.inc.am diff --git a/src/Makefile.am b/src/Makefile.am index 6518464639..8d0780d25e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -103,6 +103,7 @@ include network/Makefile.inc.am include nwfilter/Makefile.inc.am include node_device/Makefile.inc.am include secret/Makefile.inc.am +include storage/Makefile.inc.am THREAD_LIBS = $(LIB_PTHREAD) $(LTLIBMULTITHREAD) @@ -784,14 +785,8 @@ EXTRA_DIST += check-drivername.pl DRIVER_SOURCE_FILES += \ $(REMOTE_DRIVER_SOURCES) \ - $(STORAGE_DRIVER_SOURCES) \ $(NULL) -STATEFUL_DRIVER_SOURCE_FILES += \ - $(STORAGE_DRIVER_SOURCES) \ - $(NULL) - - check-driverimpls: $(AM_V_GEN)$(PERL) $(srcdir)/check-driverimpls.pl \ $(filter /%,$(DRIVER_SOURCE_FILES)) \ @@ -822,53 +817,6 @@ SECURITY_DRIVER_APPARMOR_HELPER_SOURCES = \ security/virt-aa-helper.c -# Storage backend specific impls -STORAGE_DRIVER_BACKEND_SOURCES = \ - storage/storage_backend.h storage/storage_backend.c - -STORAGE_DRIVER_SOURCES = \ - storage/storage_driver.h storage/storage_driver.c \ - $(STORAGE_DRIVER_BACKEND_SOURCES) \ - storage/storage_util.h storage/storage_util.c - -STORAGE_DRIVER_FS_SOURCES = \ - storage/storage_backend_fs.h storage/storage_backend_fs.c - -STORAGE_DRIVER_LVM_SOURCES = \ - storage/storage_backend_logical.h \ - storage/storage_backend_logical.c - -STORAGE_DRIVER_ISCSI_SOURCES = \ - storage/storage_backend_iscsi.h storage/storage_backend_iscsi.c - -STORAGE_DRIVER_SCSI_SOURCES = \ - storage/storage_backend_scsi.h storage/storage_backend_scsi.c - -STORAGE_DRIVER_MPATH_SOURCES = \ - storage/storage_backend_mpath.h storage/storage_backend_mpath.c - -STORAGE_DRIVER_DISK_SOURCES = \ - storage/storage_backend_disk.h storage/storage_backend_disk.c - -STORAGE_DRIVER_RBD_SOURCES = \ - storage/storage_backend_rbd.h storage/storage_backend_rbd.c - -STORAGE_DRIVER_SHEEPDOG_SOURCES = \ - storage/storage_backend_sheepdog.h storage/storage_backend_sheepdog.c \ - storage/storage_backend_sheepdog_priv.h - -STORAGE_DRIVER_GLUSTER_SOURCES = \ - storage/storage_backend_gluster.h storage/storage_backend_gluster.c - -STORAGE_DRIVER_ZFS_SOURCES = \ - storage/storage_backend_zfs.h storage/storage_backend_zfs.c - -STORAGE_DRIVER_VSTORAGE_SOURCES = \ - storage/storage_backend_vstorage.h \ - storage/storage_backend_vstorage.c - -STORAGE_HELPER_DISK_SOURCES = \ - storage/parthelper.c UTIL_IO_HELPER_SOURCES = \ util/iohelper.c @@ -1113,173 +1061,6 @@ EXTRA_DIST += \ -# Needed to keep automake quiet about conditionals -libvirt_driver_storage_impl_la_SOURCES = -libvirt_driver_storage_impl_la_CFLAGS = \ - -I$(srcdir)/access \ - -I$(srcdir)/conf \ - -I$(srcdir)/secret \ - $(AM_CFLAGS) -libvirt_driver_storage_impl_la_LDFLAGS = $(AM_LDFLAGS) -libvirt_driver_storage_impl_la_LIBADD = -libvirt_driver_storage_impl_la_LIBADD += $(SECDRIVER_LIBS) $(LIBXML_LIBS) -if WITH_BLKID -libvirt_driver_storage_impl_la_CFLAGS += $(BLKID_CFLAGS) -libvirt_driver_storage_impl_la_LIBADD += $(BLKID_LIBS) -endif WITH_BLKID - -storagebackenddir = $(libdir)/libvirt/storage-backend -storagebackend_LTLIBRARIES = - -if WITH_STORAGE -noinst_LTLIBRARIES += libvirt_driver_storage_impl.la -libvirt_driver_storage_la_SOURCES = -libvirt_driver_storage_la_LIBADD = libvirt_driver_storage_impl.la -mod_LTLIBRARIES += libvirt_driver_storage.la -libvirt_driver_storage_la_LIBADD += libvirt.la ../gnulib/lib/libgnu.la -libvirt_driver_storage_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF) -libvirt_driver_storage_impl_la_SOURCES += $(STORAGE_DRIVER_SOURCES) - - -libvirt_storage_backend_fs_la_SOURCES = $(STORAGE_DRIVER_FS_SOURCES) -libvirt_storage_backend_fs_la_CFLAGS = \ - -I$(srcdir)/conf \ - $(AM_CFLAGS) - -storagebackend_LTLIBRARIES += libvirt_storage_backend_fs.la -libvirt_storage_backend_fs_la_LDFLAGS = $(AM_LDFLAGS_MOD) -libvirt_storage_backend_fs_la_LIBADD = libvirt.la ../gnulib/lib/libgnu.la -endif WITH_STORAGE - -if WITH_STORAGE_LVM -libvirt_storage_backend_logical_la_SOURCES = \ - $(STORAGE_DRIVER_LVM_SOURCES) -libvirt_storage_backend_logical_la_CFLAGS = \ - -I$(srcdir)/conf \ - $(AM_CFLAGS) - -storagebackend_LTLIBRARIES += libvirt_storage_backend_logical.la -libvirt_storage_backend_logical_la_LDFLAGS = $(AM_LDFLAGS_MOD) -libvirt_storage_backend_logical_la_LIBADD = libvirt.la ../gnulib/lib/libgnu.la -endif WITH_STORAGE_LVM - -if WITH_STORAGE_ISCSI -libvirt_storage_backend_iscsi_la_SOURCES = \ - $(STORAGE_DRIVER_ISCSI_SOURCES) -libvirt_storage_backend_iscsi_la_CFLAGS = \ - -I$(srcdir)/conf \ - -I$(srcdir)/secret \ - $(AM_CFLAGS) - -storagebackend_LTLIBRARIES += libvirt_storage_backend_iscsi.la -libvirt_storage_backend_iscsi_la_LDFLAGS = $(AM_LDFLAGS_MOD) -libvirt_storage_backend_iscsi_la_LIBADD = libvirt.la ../gnulib/lib/libgnu.la -endif WITH_STORAGE_ISCSI - -if WITH_STORAGE_SCSI -libvirt_storage_backend_scsi_la_SOURCES = $(STORAGE_DRIVER_SCSI_SOURCES) -libvirt_storage_backend_scsi_la_CFLAGS = \ - -I$(srcdir)/conf \ - $(AM_CFLAGS) - -storagebackend_LTLIBRARIES += libvirt_storage_backend_scsi.la -libvirt_storage_backend_scsi_la_LDFLAGS = $(AM_LDFLAGS_MOD) -libvirt_storage_backend_scsi_la_LIBADD = libvirt.la ../gnulib/lib/libgnu.la -endif WITH_STORAGE_SCSI - -if WITH_STORAGE_MPATH -libvirt_storage_backend_mpath_la_SOURCES = \ - $(STORAGE_DRIVER_MPATH_SOURCES) -libvirt_storage_backend_mpath_la_LIBADD = $(DEVMAPPER_LIBS) -libvirt_storage_backend_mpath_la_CFLAGS = \ - -I$(srcdir)/conf \ - $(DEVMAPPER_CFLAGS) \ - $(AM_CFLAGS) - -storagebackend_LTLIBRARIES += libvirt_storage_backend_mpath.la -libvirt_storage_backend_mpath_la_LDFLAGS = $(AM_LDFLAGS_MOD) -libvirt_storage_backend_mpath_la_LIBADD += libvirt.la ../gnulib/lib/libgnu.la -endif WITH_STORAGE_MPATH - -if WITH_STORAGE_DISK -libvirt_storage_backend_disk_la_SOURCES = $(STORAGE_DRIVER_DISK_SOURCES) -libvirt_storage_backend_disk_la_CFLAGS = \ - -I$(srcdir)/conf \ - $(AM_CFLAGS) - -storagebackend_LTLIBRARIES += libvirt_storage_backend_disk.la -libvirt_storage_backend_disk_la_LDFLAGS = $(AM_LDFLAGS_MOD) -libvirt_storage_backend_disk_la_LIBADD = libvirt.la ../gnulib/lib/libgnu.la -endif WITH_STORAGE_DISK - -if WITH_STORAGE_RBD -libvirt_storage_backend_rbd_la_SOURCES = $(STORAGE_DRIVER_RBD_SOURCES) -libvirt_storage_backend_rbd_la_LIBADD = $(LIBRBD_LIBS) -libvirt_storage_backend_rbd_la_CFLAGS = \ - -I$(srcdir)/conf \ - -I$(srcdir)/secret \ - $(AM_CFLAGS) - -storagebackend_LTLIBRARIES += libvirt_storage_backend_rbd.la -libvirt_storage_backend_rbd_la_LDFLAGS = $(AM_LDFLAGS_MOD) -libvirt_storage_backend_rbd_la_LIBADD += libvirt.la ../gnulib/lib/libgnu.la -endif WITH_STORAGE_RBD - -if WITH_STORAGE_SHEEPDOG -libvirt_storage_backend_sheepdog_la_SOURCES = \ - $(STORAGE_DRIVER_SHEEPDOG_SOURCES) -libvirt_storage_backend_sheepdog_la_CFLAGS = \ - -I$(srcdir)/conf \ - $(AM_CFLAGS) - -libvirt_storage_backend_sheepdog_priv_la_SOURCES = \ - $(STORAGE_DRIVER_SHEEPDOG_SOURCES) -libvirt_storage_backend_sheepdog_priv_la_CFLAGS = \ - -I$(srcdir)/conf \ - $(AM_CFLAGS) -noinst_LTLIBRARIES += libvirt_storage_backend_sheepdog_priv.la - -storagebackend_LTLIBRARIES += libvirt_storage_backend_sheepdog.la -libvirt_storage_backend_sheepdog_la_LDFLAGS = $(AM_LDFLAGS_MOD) -libvirt_storage_backend_sheepdog_la_LIBADD = libvirt.la ../gnulib/lib/libgnu.la -endif WITH_STORAGE_SHEEPDOG - -if WITH_STORAGE_GLUSTER -libvirt_storage_backend_gluster_la_SOURCES = \ - $(STORAGE_DRIVER_GLUSTER_SOURCES) -libvirt_storage_backend_gluster_la_LIBADD = $(GLUSTERFS_LIBS) -libvirt_storage_backend_gluster_la_CFLAGS = \ - -I$(srcdir)/conf \ - $(GLUSTERFS_CFLAGS) \ - $(AM_CFLAGS) - -storagebackend_LTLIBRARIES += libvirt_storage_backend_gluster.la -libvirt_storage_backend_gluster_la_LDFLAGS = $(AM_LDFLAGS_MOD) -libvirt_storage_backend_gluster_la_LIBADD += libvirt.la ../gnulib/lib/libgnu.la -endif WITH_STORAGE_GLUSTER - -if WITH_STORAGE_ZFS -libvirt_storage_backend_zfs_la_SOURCES = $(STORAGE_DRIVER_ZFS_SOURCES) -libvirt_storage_backend_zfs_la_CFLAGS = \ - -I$(srcdir)/conf \ - $(AM_CFLAGS) - -storagebackend_LTLIBRARIES += libvirt_storage_backend_zfs.la -libvirt_storage_backend_zfs_la_LDFLAGS = $(AM_LDFLAGS_MOD) -libvirt_storage_backend_zfs_la_LIBADD = libvirt.la ../gnulib/lib/libgnu.la -endif WITH_STORAGE_ZFS - -if WITH_STORAGE_VSTORAGE -libvirt_storage_backend_vstorage_la_SOURCES = \ - $(STORAGE_DRIVER_VSTORAGE_SOURCES) -libvirt_storage_backend_vstorage_la_CFLAGS = \ - -I$(srcdir)/conf \ - $(AM_CFLAGS) - -storagebackend_LTLIBRARIES += libvirt_storage_backend_vstorage.la -libvirt_storage_backend_vstorage_la_LDFLAGS = $(AM_LDFLAGS_MOD) -libvirt_storage_backend_vstorage_la_LIBADD = libvirt.la ../gnulib/lib/libgnu.la -endif WITH_STORAGE_VSTORAGE @@ -1394,18 +1175,6 @@ access/viraccessapichecklxc.c: $(srcdir)/rpc/gendispatch.pl \ # Add all conditional sources just in case... EXTRA_DIST += \ $(REMOTE_DRIVER_SOURCES) \ - $(STORAGE_DRIVER_SOURCES) \ - $(STORAGE_DRIVER_FS_SOURCES) \ - $(STORAGE_DRIVER_LVM_SOURCES) \ - $(STORAGE_DRIVER_ISCSI_SOURCES) \ - $(STORAGE_DRIVER_SCSI_SOURCES) \ - $(STORAGE_DRIVER_MPATH_SOURCES) \ - $(STORAGE_DRIVER_DISK_SOURCES) \ - $(STORAGE_DRIVER_RBD_SOURCES) \ - $(STORAGE_DRIVER_SHEEPDOG_SOURCES) \ - $(STORAGE_DRIVER_GLUSTER_SOURCES) \ - $(STORAGE_DRIVER_ZFS_SOURCES) \ - $(STORAGE_DRIVER_VSTORAGE_SOURCES) \ $(SECURITY_DRIVER_SELINUX_SOURCES) \ $(SECURITY_DRIVER_APPARMOR_SOURCES) \ $(ACCESS_DRIVER_POLKIT_POLICY) @@ -2512,32 +2281,6 @@ libvirt_iohelper_CFLAGS = \ endif WITH_LIBVIRTD -if WITH_STORAGE_DISK -if WITH_LIBVIRTD -libexec_PROGRAMS += libvirt_parthelper - -libvirt_parthelper_SOURCES = $(STORAGE_HELPER_DISK_SOURCES) -libvirt_parthelper_LDFLAGS = \ - $(AM_LDFLAGS) \ - $(PIE_LDFLAGS) \ - $(NULL) -libvirt_parthelper_LDADD = \ - $(LIBPARTED_LIBS) \ - libvirt_util.la \ - ../gnulib/lib/libgnu.la -if WITH_DTRACE_PROBES -libvirt_parthelper_LDADD += libvirt_probes.lo -endif WITH_DTRACE_PROBES - -libvirt_parthelper_CFLAGS = \ - $(LIBPARTED_CFLAGS) \ - $(AM_CFLAGS) \ - $(PIE_CFLAGS) \ - $(NULL) -endif WITH_LIBVIRTD -endif WITH_STORAGE_DISK -EXTRA_DIST += $(STORAGE_HELPER_DISK_SOURCES) - if WITH_SANLOCK libexec_PROGRAMS += libvirt_sanlock_helper diff --git a/src/storage/Makefile.inc.am b/src/storage/Makefile.inc.am new file mode 100644 index 0000000000..7ca7230cc8 --- /dev/null +++ b/src/storage/Makefile.inc.am @@ -0,0 +1,323 @@ +STORAGE_DRIVER_BACKEND_SOURCES = \ + storage/storage_backend.h \ + storage/storage_backend.c \ + $(NULL) + +STORAGE_DRIVER_SOURCES = \ + storage/storage_driver.h \ + storage/storage_driver.c \ + $(STORAGE_DRIVER_BACKEND_SOURCES) \ + storage/storage_util.h \ + storage/storage_util.c \ + $(NULL) + +STORAGE_DRIVER_FS_SOURCES = \ + storage/storage_backend_fs.h \ + storage/storage_backend_fs.c \ + $(NULL) + +STORAGE_DRIVER_LVM_SOURCES = \ + storage/storage_backend_logical.h \ + storage/storage_backend_logical.c \ + $(NULL) + +STORAGE_DRIVER_ISCSI_SOURCES = \ + storage/storage_backend_iscsi.h \ + storage/storage_backend_iscsi.c \ + $(NULL) + +STORAGE_DRIVER_SCSI_SOURCES = \ + storage/storage_backend_scsi.h \ + storage/storage_backend_scsi.c \ + $(NULL) + +STORAGE_DRIVER_MPATH_SOURCES = \ + storage/storage_backend_mpath.h \ + storage/storage_backend_mpath.c \ + $(NULL) + +STORAGE_DRIVER_DISK_SOURCES = \ + storage/storage_backend_disk.h \ + storage/storage_backend_disk.c \ + $(NULL) + +STORAGE_DRIVER_RBD_SOURCES = \ + storage/storage_backend_rbd.h \ + storage/storage_backend_rbd.c \ + $(NULL) + +STORAGE_DRIVER_SHEEPDOG_SOURCES = \ + storage/storage_backend_sheepdog.h \ + storage/storage_backend_sheepdog.c \ + storage/storage_backend_sheepdog_priv.h \ + $(NULL) + +STORAGE_DRIVER_GLUSTER_SOURCES = \ + storage/storage_backend_gluster.h \ + storage/storage_backend_gluster.c \ + $(NULL) + +STORAGE_DRIVER_ZFS_SOURCES = \ + storage/storage_backend_zfs.h \ + storage/storage_backend_zfs.c \ + $(NULL) + +STORAGE_DRIVER_VSTORAGE_SOURCES = \ + storage/storage_backend_vstorage.h \ + storage/storage_backend_vstorage.c \ + $(NULL) + +STORAGE_HELPER_DISK_SOURCES = \ + storage/parthelper.c \ + $(NULL) + +DRIVER_SOURCE_FILES += $(STORAGE_DRIVER_SOURCES) +STATEFUL_DRIVER_SOURCE_FILES += $(STORAGE_DRIVER_SOURCES) +EXTRA_DIST += \ + $(STORAGE_DRIVER_SOURCES) \ + $(STORAGE_DRIVER_FS_SOURCES) \ + $(STORAGE_DRIVER_LVM_SOURCES) \ + $(STORAGE_DRIVER_ISCSI_SOURCES) \ + $(STORAGE_DRIVER_SCSI_SOURCES) \ + $(STORAGE_DRIVER_MPATH_SOURCES) \ + $(STORAGE_DRIVER_DISK_SOURCES) \ + $(STORAGE_DRIVER_RBD_SOURCES) \ + $(STORAGE_DRIVER_SHEEPDOG_SOURCES) \ + $(STORAGE_DRIVER_GLUSTER_SOURCES) \ + $(STORAGE_DRIVER_ZFS_SOURCES) \ + $(STORAGE_DRIVER_VSTORAGE_SOURCES) \ + $(STORAGE_HELPER_DISK_SOURCES) \ + $(NULL) + +storagebackenddir = $(libdir)/libvirt/storage-backend +storagebackend_LTLIBRARIES = + +# Needed to keep automake quiet about conditionals +libvirt_driver_storage_impl_la_SOURCES = +libvirt_driver_storage_impl_la_CFLAGS = \ + -I$(srcdir)/access \ + -I$(srcdir)/conf \ + -I$(srcdir)/secret \ + $(AM_CFLAGS) \ + $(NULL) +libvirt_driver_storage_impl_la_LDFLAGS = $(AM_LDFLAGS) +libvirt_driver_storage_impl_la_LIBADD = $(SECDRIVER_LIBS) $(LIBXML_LIBS) +if WITH_BLKID +libvirt_driver_storage_impl_la_CFLAGS += $(BLKID_CFLAGS) +libvirt_driver_storage_impl_la_LIBADD += $(BLKID_LIBS) +endif WITH_BLKID + +if WITH_STORAGE +noinst_LTLIBRARIES += libvirt_driver_storage_impl.la +libvirt_driver_storage_la_SOURCES = +libvirt_driver_storage_la_LIBADD = \ + libvirt_driver_storage_impl.la \ + libvirt.la \ + ../gnulib/lib/libgnu.la \ + $(NULL) +mod_LTLIBRARIES += libvirt_driver_storage.la +libvirt_driver_storage_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF) +libvirt_driver_storage_impl_la_SOURCES += $(STORAGE_DRIVER_SOURCES) + + +libvirt_storage_backend_fs_la_SOURCES = $(STORAGE_DRIVER_FS_SOURCES) +libvirt_storage_backend_fs_la_CFLAGS = \ + -I$(srcdir)/conf \ + $(AM_CFLAGS) \ + $(NULL) + +storagebackend_LTLIBRARIES += libvirt_storage_backend_fs.la +libvirt_storage_backend_fs_la_LDFLAGS = $(AM_LDFLAGS_MOD) +libvirt_storage_backend_fs_la_LIBADD = \ + libvirt.la \ + ../gnulib/lib/libgnu.la \ + $(NULL) +endif WITH_STORAGE + +if WITH_STORAGE_LVM +libvirt_storage_backend_logical_la_SOURCES = $(STORAGE_DRIVER_LVM_SOURCES) +libvirt_storage_backend_logical_la_CFLAGS = \ + -I$(srcdir)/conf \ + $(AM_CFLAGS) \ + $(NULL) + +storagebackend_LTLIBRARIES += libvirt_storage_backend_logical.la +libvirt_storage_backend_logical_la_LDFLAGS = $(AM_LDFLAGS_MOD) +libvirt_storage_backend_logical_la_LIBADD = \ + libvirt.la \ + ../gnulib/lib/libgnu.la \ + $(NULL) +endif WITH_STORAGE_LVM + +if WITH_STORAGE_ISCSI +libvirt_storage_backend_iscsi_la_SOURCES = $(STORAGE_DRIVER_ISCSI_SOURCES) +libvirt_storage_backend_iscsi_la_CFLAGS = \ + -I$(srcdir)/conf \ + -I$(srcdir)/secret \ + $(AM_CFLAGS) \ + $(NULL) + +storagebackend_LTLIBRARIES += libvirt_storage_backend_iscsi.la +libvirt_storage_backend_iscsi_la_LDFLAGS = $(AM_LDFLAGS_MOD) +libvirt_storage_backend_iscsi_la_LIBADD = \ + libvirt.la \ + ../gnulib/lib/libgnu.la \ + $(NULL) +endif WITH_STORAGE_ISCSI + +if WITH_STORAGE_SCSI +libvirt_storage_backend_scsi_la_SOURCES = $(STORAGE_DRIVER_SCSI_SOURCES) +libvirt_storage_backend_scsi_la_CFLAGS = \ + -I$(srcdir)/conf \ + $(AM_CFLAGS) \ + $(NULL) + +storagebackend_LTLIBRARIES += libvirt_storage_backend_scsi.la +libvirt_storage_backend_scsi_la_LDFLAGS = $(AM_LDFLAGS_MOD) +libvirt_storage_backend_scsi_la_LIBADD = \ + libvirt.la \ + ../gnulib/lib/libgnu.la \ + $(NULL) +endif WITH_STORAGE_SCSI + +if WITH_STORAGE_MPATH +libvirt_storage_backend_mpath_la_SOURCES = $(STORAGE_DRIVER_MPATH_SOURCES) +libvirt_storage_backend_mpath_la_LIBADD = \ + $(DEVMAPPER_LIBS) \ + libvirt.la \ + ../gnulib/lib/libgnu.la \ + $(NULL) +libvirt_storage_backend_mpath_la_CFLAGS = \ + -I$(srcdir)/conf \ + $(DEVMAPPER_CFLAGS) \ + $(AM_CFLAGS) \ + $(NULL) + +storagebackend_LTLIBRARIES += libvirt_storage_backend_mpath.la +libvirt_storage_backend_mpath_la_LDFLAGS = $(AM_LDFLAGS_MOD) +endif WITH_STORAGE_MPATH + +if WITH_STORAGE_DISK +libvirt_storage_backend_disk_la_SOURCES = $(STORAGE_DRIVER_DISK_SOURCES) +libvirt_storage_backend_disk_la_CFLAGS = \ + -I$(srcdir)/conf \ + $(AM_CFLAGS) \ + $(NULL) + +storagebackend_LTLIBRARIES += libvirt_storage_backend_disk.la +libvirt_storage_backend_disk_la_LDFLAGS = $(AM_LDFLAGS_MOD) +libvirt_storage_backend_disk_la_LIBADD = \ + libvirt.la \ + ../gnulib/lib/libgnu.la \ + $(NULL) +endif WITH_STORAGE_DISK + +if WITH_STORAGE_RBD +libvirt_storage_backend_rbd_la_SOURCES = $(STORAGE_DRIVER_RBD_SOURCES) +libvirt_storage_backend_rbd_la_LIBADD = \ + $(LIBRBD_LIBS) \ + libvirt.la \ + ../gnulib/lib/libgnu.la \ + $(NULL) +libvirt_storage_backend_rbd_la_CFLAGS = \ + -I$(srcdir)/conf \ + -I$(srcdir)/secret \ + $(AM_CFLAGS) \ + $(NULL) + +storagebackend_LTLIBRARIES += libvirt_storage_backend_rbd.la +libvirt_storage_backend_rbd_la_LDFLAGS = $(AM_LDFLAGS_MOD) +endif WITH_STORAGE_RBD + +if WITH_STORAGE_SHEEPDOG +libvirt_storage_backend_sheepdog_la_SOURCES = $(STORAGE_DRIVER_SHEEPDOG_SOURCES) +libvirt_storage_backend_sheepdog_la_CFLAGS = \ + -I$(srcdir)/conf \ + $(AM_CFLAGS) \ + $(NULL) + +libvirt_storage_backend_sheepdog_priv_la_SOURCES = $(STORAGE_DRIVER_SHEEPDOG_SOURCES) +libvirt_storage_backend_sheepdog_priv_la_CFLAGS = \ + -I$(srcdir)/conf \ + $(AM_CFLAGS) \ + $(NULL) +noinst_LTLIBRARIES += libvirt_storage_backend_sheepdog_priv.la + +storagebackend_LTLIBRARIES += libvirt_storage_backend_sheepdog.la +libvirt_storage_backend_sheepdog_la_LDFLAGS = $(AM_LDFLAGS_MOD) +libvirt_storage_backend_sheepdog_la_LIBADD = \ + libvirt.la \ + ../gnulib/lib/libgnu.la \ + $(NULL) +endif WITH_STORAGE_SHEEPDOG + +if WITH_STORAGE_GLUSTER +libvirt_storage_backend_gluster_la_SOURCES = $(STORAGE_DRIVER_GLUSTER_SOURCES) +libvirt_storage_backend_gluster_la_LIBADD = \ + $(GLUSTERFS_LIBS) \ + libvirt.la \ + ../gnulib/lib/libgnu.la \ + $(NULL) +libvirt_storage_backend_gluster_la_CFLAGS = \ + -I$(srcdir)/conf \ + $(GLUSTERFS_CFLAGS) \ + $(AM_CFLAGS) \ + $(NULL) + +storagebackend_LTLIBRARIES += libvirt_storage_backend_gluster.la +libvirt_storage_backend_gluster_la_LDFLAGS = $(AM_LDFLAGS_MOD) +endif WITH_STORAGE_GLUSTER + +if WITH_STORAGE_ZFS +libvirt_storage_backend_zfs_la_SOURCES = $(STORAGE_DRIVER_ZFS_SOURCES) +libvirt_storage_backend_zfs_la_CFLAGS = \ + -I$(srcdir)/conf \ + $(AM_CFLAGS) \ + $(NULL) + +storagebackend_LTLIBRARIES += libvirt_storage_backend_zfs.la +libvirt_storage_backend_zfs_la_LDFLAGS = $(AM_LDFLAGS_MOD) +libvirt_storage_backend_zfs_la_LIBADD = \ + libvirt.la \ + ../gnulib/lib/libgnu.la \ + $(NULL) +endif WITH_STORAGE_ZFS + +if WITH_STORAGE_VSTORAGE +libvirt_storage_backend_vstorage_la_SOURCES = $(STORAGE_DRIVER_VSTORAGE_SOURCES) +libvirt_storage_backend_vstorage_la_CFLAGS = \ + -I$(srcdir)/conf \ + $(AM_CFLAGS) \ + $(NULL) + +storagebackend_LTLIBRARIES += libvirt_storage_backend_vstorage.la +libvirt_storage_backend_vstorage_la_LDFLAGS = $(AM_LDFLAGS_MOD) +libvirt_storage_backend_vstorage_la_LIBADD = \ + libvirt.la \ + ../gnulib/lib/libgnu.la \ + $(NULL) +endif WITH_STORAGE_VSTORAGE + +if WITH_STORAGE_DISK +libexec_PROGRAMS += libvirt_parthelper + +libvirt_parthelper_SOURCES = $(STORAGE_HELPER_DISK_SOURCES) +libvirt_parthelper_LDFLAGS = \ + $(AM_LDFLAGS) \ + $(PIE_LDFLAGS) \ + $(NULL) +libvirt_parthelper_LDADD = \ + $(LIBPARTED_LIBS) \ + libvirt_util.la \ + ../gnulib/lib/libgnu.la \ + $(NULL) +if WITH_DTRACE_PROBES +libvirt_parthelper_LDADD += libvirt_probes.lo +endif WITH_DTRACE_PROBES + +libvirt_parthelper_CFLAGS = \ + $(LIBPARTED_CFLAGS) \ + $(AM_CFLAGS) \ + $(PIE_CFLAGS) \ + $(NULL) +endif WITH_STORAGE_DISK -- 2.14.3

Daniel P. Berrangé

4:14 a.m.

New subject: [libvirt] [PATCH 07/17] make: split remote driver & daemon build rules into remote/Makefile.inc.am

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/Makefile.am | 349 +++------------------------------------------ src/remote/Makefile.inc.am | 342 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 365 insertions(+), 326 deletions(-) create mode 100644 src/remote/Makefile.inc.am diff --git a/src/Makefile.am b/src/Makefile.am index 8d0780d25e..bbfd3b0427 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -81,6 +81,15 @@ tapset_DATA = endif WITH_DTRACE_PROBES libexec_PROGRAMS = RPC_PROBE_FILES = +LOGROTATE_FILES_IN = +PODFILES = +MANINFILES = +SYSTEMD_UNIT_FILES_IN = +SYSVINIT_FILES_IN = +UPSTART_FILES = +SYSCONF_FILES = +sbin_PROGRAMS = +man8_MANS = include uml/Makefile.inc.am include phyp/Makefile.inc.am @@ -104,6 +113,7 @@ include nwfilter/Makefile.inc.am include node_device/Makefile.inc.am include secret/Makefile.inc.am include storage/Makefile.inc.am +include remote/Makefile.inc.am THREAD_LIBS = $(LIB_PTHREAD) $(LTLIBMULTITHREAD) @@ -123,7 +133,6 @@ endif WITH_SECDRIVER_APPARMOR lib_LTLIBRARIES = libvirt.la libvirt-qemu.la libvirt-lxc.la moddir = $(libdir)/libvirt/connection-driver -sbin_PROGRAMS = confdir = $(sysconfdir)/libvirt conf_DATA += libvirt.conf libvirt-admin.conf @@ -538,81 +547,6 @@ CONF_SOURCES = \ $(CHRDEV_CONF_SOURCES) \ $(DEVICE_CONF_SOURCES) -# The remote RPC driver, covering domains, storage, networks, etc -REMOTE_DRIVER_GENERATED = \ - remote/remote_protocol.c \ - remote/remote_protocol.h \ - remote/remote_client_bodies.h \ - remote/lxc_protocol.c \ - remote/lxc_protocol.h \ - remote/lxc_client_bodies.h \ - remote/qemu_protocol.c \ - remote/qemu_protocol.h \ - remote/qemu_client_bodies.h \ - $(NULL) - -REMOTE_PROTOCOL = $(srcdir)/remote/remote_protocol.x -LXC_PROTOCOL = $(srcdir)/remote/lxc_protocol.x -QEMU_PROTOCOL = $(srcdir)/remote/qemu_protocol.x -REMOTE_DRIVER_PROTOCOL = $(REMOTE_PROTOCOL) $(QEMU_PROTOCOL) $(LXC_PROTOCOL) - -remote/remote_client_bodies.h: $(srcdir)/rpc/gendispatch.pl \ - $(REMOTE_PROTOCOL) Makefile.am - $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=client \ - remote REMOTE $(REMOTE_PROTOCOL) \ - > $(srcdir)/remote/remote_client_bodies.h - -remote/lxc_client_bodies.h: $(srcdir)/rpc/gendispatch.pl \ - $(LXC_PROTOCOL) Makefile.am - $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=client \ - lxc LXC $(LXC_PROTOCOL) \ - > $(srcdir)/remote/lxc_client_bodies.h - -remote/qemu_client_bodies.h: $(srcdir)/rpc/gendispatch.pl \ - $(QEMU_PROTOCOL) Makefile.am - $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=client \ - qemu QEMU $(QEMU_PROTOCOL) \ - > $(srcdir)/remote/qemu_client_bodies.h - -remote/remote_daemon_dispatch_stubs.h: $(srcdir)/rpc/gendispatch.pl \ - $(REMOTE_PROTOCOL) Makefile.am - $(AM_V_GEN)$(PERL) -w $(top_srcdir)/src/rpc/gendispatch.pl \ - --mode=server remote REMOTE $(REMOTE_PROTOCOL) \ - > $(srcdir)/remote/remote_daemon_dispatch_stubs.h - -remote/remote_daemon_dispatch_lxc_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 - -remote/remote_daemon_dispatch_qemu_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 - -REMOTE_DRIVER_SOURCES = \ - remote/remote_driver.c remote/remote_driver.h \ - $(REMOTE_DRIVER_GENERATED) - -LIBVIRTD_GENERATED = \ - remote/remote_daemon_dispatch_stubs.h \ - remote/remote_daemon_dispatch_lxc_stubs.h \ - remote/remote_daemon_dispatch_qemu_stubs.h \ - $(NULL) - -LIBVIRTD_SOURCES = \ - remote/remote_daemon.c remote/remote_daemon.h \ - remote/remote_daemon_config.c remote/remote_daemon_config.h \ - remote/remote_daemon_dispatch.c remote/remote_daemon_dispatch.h \ - remote/remote_daemon_stream.c remote/remote_daemon_stream.h \ - $(LIBVIRTD_GENERATED) - -EXTRA_DIST += $(REMOTE_DRIVER_PROTOCOL) \ - $(REMOTE_DRIVER_GENERATED) \ - $(LIBVIRTD_SOURCES) \ - $(NULL) ADMIN_PROTOCOL = $(srcdir)/admin/admin_protocol.x @@ -783,10 +717,6 @@ check-drivername: EXTRA_DIST += check-drivername.pl -DRIVER_SOURCE_FILES += \ - $(REMOTE_DRIVER_SOURCES) \ - $(NULL) - check-driverimpls: $(AM_V_GEN)$(PERL) $(srcdir)/check-driverimpls.pl \ $(filter /%,$(DRIVER_SOURCE_FILES)) \ @@ -951,105 +881,7 @@ GENERATED_SYM_FILES += \ libvirt_admin.syms libvirt_admin.def \ $(NULL) -if WITH_REMOTE -noinst_LTLIBRARIES += libvirt_driver_remote.la -libvirt_la_BUILT_LIBADD += libvirt_driver_remote.la -libvirt_driver_remote_la_CFLAGS = \ - $(XDR_CFLAGS) \ - -I$(srcdir)/conf \ - -I$(srcdir)/rpc \ - $(AM_CFLAGS) -libvirt_driver_remote_la_LDFLAGS = $(AM_LDFLAGS) -libvirt_driver_remote_la_SOURCES = $(REMOTE_DRIVER_SOURCES) - -BUILT_SOURCES += $(REMOTE_DRIVER_GENERATED) -endif WITH_REMOTE - - -if WITH_LIBVIRTD - -sbin_PROGRAMS += libvirtd - -BUILT_SOURCES += $(LIBVIRTD_GENERATED) - -augeas_DATA += remote/libvirtd.aug - -augeastest_DATA += test_libvirtd.aug - -conf_DATA += remote/libvirtd.conf - -CLEANFILES += test_libvirtd.aug - -if WITH_POLKIT -if WITH_POLKIT0 -policydir = $(datadir)/PolicyKit/policy -policyauth = auth_admin_keep_session -else ! WITH_POLKIT0 -policydir = $(datadir)/polkit-1/actions -policyauth = auth_admin_keep -endif ! WITH_POLKIT0 -endif WITH_POLKIT - -BUILT_SOURCES += libvirtd.policy -CLEANFILES += libvirtd.policy - -libvirtd.policy: remote/libvirtd.policy.in $(top_builddir)/config.status - $(AM_V_GEN) sed \ - -e 's|[@]authaction[@]|$(policyauth)|g' \ - < $< > $@-t && \ - mv $@-t $@ - -libvirtd_SOURCES = $(LIBVIRTD_SOURCES) - -libvirtd_CFLAGS = \ - $(LIBXML_CFLAGS) $(GNUTLS_CFLAGS) $(SASL_CFLAGS) \ - $(XDR_CFLAGS) $(DBUS_CFLAGS) $(LIBNL_CFLAGS) \ - $(WARN_CFLAGS) $(PIE_CFLAGS) \ - $(COVERAGE_CFLAGS) \ - -I$(srcdir)/access \ - -I$(srcdir)/conf \ - -I$(srcdir)/rpc \ - $(NULL) - -libvirtd_LDFLAGS = \ - $(RELRO_LDFLAGS) \ - $(PIE_LDFLAGS) \ - $(COVERAGE_LDFLAGS) \ - $(NO_INDIRECT_LDFLAGS) \ - $(NO_UNDEFINED_LDFLAGS) \ - $(NULL) - -libvirtd_LDADD = \ - $(LIBXML_LIBS) \ - $(GNUTLS_LIBS) \ - $(SASL_LIBS) \ - $(DBUS_LIBS) \ - $(LIBNL_LIBS) \ - $(NULL) - -if WITH_DTRACE_PROBES -libvirtd_LDADD += ../src/libvirt_probes.lo -endif WITH_DTRACE_PROBES - -libvirtd_LDADD += \ - libvirt_driver_admin.la \ - libvirt-lxc.la \ - libvirt-qemu.la \ - libvirt.la \ - ../gnulib/lib/libgnu.la $(LIBSOCKET) \ - $(NULL) - -endif WITH_LIBVIRTD -EXTRA_DIST += \ - remote/test_libvirtd.aug.in \ - remote/libvirtd.aug \ - remote/libvirtd.conf \ - remote/libvirtd.policy.in \ - remote/libvirtd.rules \ - remote/libvirtd.sasl \ - remote/libvirtd.sysctl \ - $(NULL) %protocol.c: %protocol.x %protocol.h $(srcdir)/rpc/genprotocol.pl $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/genprotocol.pl $(RPCGEN) -c \ @@ -1174,7 +1006,6 @@ access/viraccessapichecklxc.c: $(srcdir)/rpc/gendispatch.pl \ # Add all conditional sources just in case... EXTRA_DIST += \ - $(REMOTE_DRIVER_SOURCES) \ $(SECURITY_DRIVER_SELINUX_SOURCES) \ $(SECURITY_DRIVER_APPARMOR_SOURCES) \ $(ACCESS_DRIVER_POLKIT_POLICY) @@ -1184,13 +1015,12 @@ check-local: check-augeas .PHONY: check-augeas \ check-augeas-sanlock \ check-augeas-lockd \ - check-augeas-libvirtd \ $(NULL) check-augeas: $(AUGEAS_DIRS:%=check-augeas-%) \ check-augeas-sanlock \ check-augeas-lockd check-augeas-virtlockd \ - check-augeas-virtlogd check-augeas-libvirtd + check-augeas-virtlogd AUG_GENTEST = $(PERL) $(top_srcdir)/build-aux/augeas-gentest.pl EXTRA_DIST += $(top_srcdir)/build-aux/augeas-gentest.pl @@ -1245,18 +1075,6 @@ check-augeas-virtlogd: test_virtlogd.aug '$(AUGPARSE)' -I $(srcdir)/logging test_virtlogd.aug; \ fi -if WITH_LIBVIRTD -test_libvirtd.aug: remote/test_libvirtd.aug.in \ - remote/libvirtd.conf $(AUG_GENTEST) - $(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/remote/libvirtd.conf $< $@ - -check-augeas-libvirtd: test_libvirtd.aug - $(AM_V_GEN)if test -x '$(AUGPARSE)'; then \ - '$(AUGPARSE)' -I $(srcdir)/remote test_libvirtd.aug; \ - fi -else ! WITH_LIBVIRTD -check-augeas-libvirtd: -endif ! WITH_LIBVIRTD # # Build our version script. This is composed of three parts: # @@ -1284,12 +1102,6 @@ else ! WITH_LINUX SYM_FILES += $(srcdir)/libvirt_linux.syms endif ! WITH_LINUX -if WITH_REMOTE -USED_SYM_FILES += $(srcdir)/libvirt_remote.syms -else ! WITH_REMOTE -SYM_FILES += $(srcdir)/libvirt_remote.syms -endif ! WITH_REMOTE - if WITH_VMX USED_SYM_FILES += $(srcdir)/libvirt_vmx.syms else ! WITH_VMX @@ -1732,10 +1544,9 @@ EXTRA_DIST += $(LOCK_DAEMON_SOURCES) \ $(LOG_DAEMON_SOURCES) endif ! WITH_LIBVIRTD -SYSCONF_FILES = \ +SYSCONF_FILES += \ locking/virtlockd.sysconf \ logging/virtlogd.sysconf \ - remote/libvirtd.sysconf \ $(NULL) EXTRA_DIST += \ @@ -1762,30 +1573,19 @@ uninstall-sysconfig: done rmdir $(DESTDIR)$(sysconfdir)/sysconfig || : -SYSVINIT_FILES_IN = \ +SYSVINIT_FILES_IN += \ locking/virtlockd.init.in \ logging/virtlogd.init.in \ - remote/libvirtd.init.in \ $(NULL) SYSVINIT_FILES = $(notdir $(SYSVINIT_FILES_IN:%.in=%)) EXTRA_DIST += $(SYSVINIT_FILES_IN) -LOGROTATE_FILES_IN = \ - remote/libvirtd.qemu.logrotate.in \ - remote/libvirtd.lxc.logrotate.in \ - remote/libvirtd.libxl.logrotate.in \ - remote/libvirtd.uml.logrotate.in \ - remote/libvirtd.logrotate.in \ - $(NULL) +LOGROTATE_FILES := $(LOGROTATE_FILES_IN:remote/%.in=%) EXTRA_DIST += $(LOGROTATE_FILES_IN) -if WITH_LIBVIRTD - -LOGROTATE_FILES := $(LOGROTATE_FILES_IN:remote/%.in=%) - BUILT_SOURCES += $(LOGROTATE_FILES) CLEANFILES += $(LOGROTATE_FILES) @@ -1795,6 +1595,7 @@ CLEANFILES += $(LOGROTATE_FILES) < $< > $@-t && \ mv $@-t $@ +if WITH_LIBVIRTD install-logrotate: $(LOGROTATE_FILES) $(MKDIR_P) $(DESTDIR)$(sysconfdir)/logrotate.d/ for f in $(LOGROTATE_FILES) ; \ @@ -1807,45 +1608,10 @@ install-logrotate: $(LOGROTATE_FILES) uninstall-logrotate: rm -f $(LOGROTATE_FILES:%.logrotate=$(DESTDIR)$(sysconfdir)/logrotate.d/%) rmdir $(DESTDIR)$(sysconfdir)/logrotate.d || : - -if WITH_SYSCTL -# Use $(prefix)/lib rather than $(libdir), since man sysctl.d insists on -# /usr/lib/sysctl.d/ even when libdir is /usr/lib64 -install-sysctl: - $(MKDIR_P) $(DESTDIR)$(prefix)/lib/sysctl.d - $(INSTALL_DATA) $(srcdir)/remote/libvirtd.sysctl \ - $(DESTDIR)$(prefix)/lib/sysctl.d/60-libvirtd.conf - -uninstall-sysctl: - rm -f $(DESTDIR)$(prefix)/lib/sysctl.d/60-libvirtd.conf - rmdir $(DESTDIR)$(prefix)/lib/sysctl.d || : -else ! WITH_SYSCTL -install-sysctl: -uninstall-sysctl: -endif ! WITH_SYSCTL - -if WITH_POLKIT -install-polkit:: - $(MKDIR_P) $(DESTDIR)$(policydir) - $(INSTALL_DATA) libvirtd.policy $(DESTDIR)$(policydir)/org.libvirt.unix.policy -if ! WITH_POLKIT0 - $(MKDIR_P) $(DESTDIR)$(datadir)/polkit-1/rules.d - $(INSTALL_DATA) $(srcdir)/remote/libvirtd.rules \ - $(DESTDIR)$(datadir)/polkit-1/rules.d/50-libvirt.rules -endif ! WITH_POLKIT0 - -uninstall-polkit:: - rm -f $(DESTDIR)$(policydir)/org.libvirt.unix.policy - rmdir $(DESTDIR)$(policydir) || : -if ! WITH_POLKIT0 - rm -f $(DESTDIR)$(datadir)/polkit-1/rules.d/50-libvirt.rules - rmdir $(DESTDIR)$(datadir)/polkit-1/rules.d || : -endif ! WITH_POLKIT0 - -else ! WITH_POLKIT -install-polkit:: -uninstall-polkit:: -endif ! WITH_POLKIT +else ! WITH_LIBVIRTD +install-logrotate: +uninstall-logrotate: +endif ! WITH_LIBVIRTD if LIBVIRT_INIT_SCRIPT_RED_HAT install-init:: $(SYSVINIT_FILES) install-sysconfig @@ -1865,42 +1631,7 @@ else ! LIBVIRT_INIT_SCRIPT_RED_HAT install-init:: uninstall-init:: endif ! LIBVIRT_INIT_SCRIPT_RED_HAT -else ! WITH_LIBVIRTD -install-polkit:: -uninstall-polkit:: -install-sysctl:: -uninstall-sysctl:: -install-init:: -uninstall-init:: -install-logrotate:: -uninstall-logrotate:: -endif ! WITH_LIBVIRTD - -# This is needed for clients too, so can't wrap in -# the WITH_LIBVIRTD conditional -if WITH_SASL -install-sasl: - $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sasl2/ - $(INSTALL_DATA) $(srcdir)/remote/libvirtd.sasl \ - $(DESTDIR)$(sysconfdir)/sasl2/libvirt.conf - -uninstall-sasl: - rm -f $(DESTDIR)$(sysconfdir)/sasl2/libvirt.conf - rmdir $(DESTDIR)$(sysconfdir)/sasl2/ || : -else ! WITH_SASL -install-sasl: -uninstall-sasl: -endif ! WITH_SASL - -libvirtd.init: remote/libvirtd.init.in $(top_builddir)/config.status - $(AM_V_GEN)sed \ - -e 's|[@]localstatedir[@]|$(localstatedir)|g' \ - -e 's|[@]sbindir[@]|$(sbindir)|g' \ - -e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \ - < $< > $@-t && \ - chmod a+x $@-t && \ - mv $@-t $@ virtlockd.init: locking/virtlockd.init.in $(top_builddir)/config.status $(AM_V_GEN)sed \ @@ -1940,16 +1671,6 @@ virtlogd.8.in: logging/virtlogd.pod rm -f $@-t1 && \ mv $@-t2 $@ -libvirtd.8.in: remote/libvirtd.pod - $(AM_V_GEN)$(POD2MAN) --section=8 $< $@-t1 && \ - if grep 'POD ERROR' $@-t1; then rm $@-t1; exit 1; fi && \ - sed \ - -e 's|SYSCONFDIR|\@sysconfdir\@|g' \ - -e 's|LOCALSTATEDIR|\@localstatedir\@|g' \ - < $@-t1 > $@-t2 && \ - rm -f $@-t1 && \ - mv $@-t2 $@ - %.8: %.8.in $(top_srcdir)/configure.ac $(AM_V_GEN)sed \ -e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \ @@ -1958,7 +1679,7 @@ libvirtd.8.in: remote/libvirtd.pod mv $@-t $@ if WITH_LIBVIRTD -man8_MANS = virtlockd.8 virtlogd.8 libvirtd.8 +man8_MANS += virtlockd.8 virtlogd.8 conf_DATA += locking/virtlockd.conf logging/virtlogd.conf @@ -1966,30 +1687,26 @@ augeas_DATA += locking/virtlockd.aug logging/virtlogd.aug augeastest_DATA += test_virtlockd.aug test_virtlogd.aug endif WITH_LIBVIRTD -PODFILES = \ +PODFILES += \ locking/virtlockd.pod \ logging/virtlogd.pod \ - remote/libvirtd.pod \ $(NULL) -MANINFILES = \ +MANINFILES += \ virtlockd.8.in \ virtlogd.8.in \ - libvirtd.8.in \ $(NULL) CLEANFILES += test_virtlockd.aug test_virtlogd.aug $(man8_MANS) MAINTAINERCLEANFILES += $(MANINFILES) -SYSTEMD_UNIT_FILES_IN = \ +SYSTEMD_UNIT_FILES_IN += \ locking/virtlockd.service.in \ locking/virtlockd.socket.in \ locking/virtlockd-admin.socket.in \ logging/virtlogd.service.in \ logging/virtlogd.socket.in \ logging/virtlogd-admin.socket.in \ - remote/libvirtd.service.in \ - remote/virt-guest-shutdown.target.in \ $(NULL) EXTRA_DIST += \ @@ -2033,18 +1750,6 @@ install-systemd: uninstall-systemd: endif ! WITH_LIBVIRTD -libvirtd.service: remote/libvirtd.service.in $(top_builddir)/config.status - $(AM_V_GEN)sed \ - -e 's|[@]localstatedir[@]|$(localstatedir)|g' \ - -e 's|[@]sbindir[@]|$(sbindir)|g' \ - -e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \ - < $< > $@-t && \ - mv $@-t $@ - -virt-guest-shutdown.target: remote/virt-guest-shutdown.target.in \ - $(top_builddir)/config.status - $(AM_V_GEN)cp $< $@ - virtlockd.service: locking/virtlockd.service.in $(top_builddir)/config.status $(AM_V_GEN)sed \ -e 's|[@]sbindir[@]|$(sbindir)|g' \ @@ -2084,10 +1789,6 @@ virtlogd-admin.socket: logging/virtlogd-admin.socket.in \ mv $@-t $@ -UPSTART_FILES = \ - remote/libvirtd.upstart \ - $(NULL) - EXTRA_DIST += $(UPSTART_FILES) if WITH_LIBVIRTD @@ -2401,7 +2102,6 @@ install-data-local: install-init install-systemd install-upstart \ install-sysctl install-polkit install-sasl \ install-logrotate $(INSTALL_DATA_DIRS:%=install-data-%) if WITH_LIBVIRTD - $(MKDIR_P) "$(DESTDIR)$(localstatedir)/log/libvirt" $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/lockd" $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/lockd/files" $(MKDIR_P) "$(DESTDIR)$(localstatedir)/run/libvirt/lockd" @@ -2418,7 +2118,6 @@ uninstall-local:: uninstall-init uninstall-systemd uninstall-upstart \ uninstall-sysctl uninstall-polkit uninstall-sasl \ uninstall-logrotate $(INSTALL_DATA_DIRS:%=uninstall-data-%) if WITH_LIBVIRTD - rmdir "$(DESTDIR)$(localstatedir)/log/libvirt" ||: rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/lockd/files" ||: rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/lockd" ||: rmdir "$(DESTDIR)$(localstatedir)/run/libvirt/lockd" ||: @@ -2435,7 +2134,5 @@ endif WITH_SANLOCK CLEANFILES += *.gcov .libs/*.gcda .libs/*.gcno *.gcno *.gcda *.i *.s DISTCLEANFILES += $(GENERATED_SYM_FILES) MAINTAINERCLEANFILES += \ - $(REMOTE_DRIVER_GENERATED) \ - $(LIBVIRTD_GENERATED) \ $(VIR_NET_RPC_GENERATED) \ $(NULL) diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am new file mode 100644 index 0000000000..3d0d557bd9 --- /dev/null +++ b/src/remote/Makefile.inc.am @@ -0,0 +1,342 @@ +REMOTE_DRIVER_GENERATED = \ + remote/remote_protocol.c \ + remote/remote_protocol.h \ + remote/remote_client_bodies.h \ + remote/lxc_protocol.c \ + remote/lxc_protocol.h \ + remote/lxc_client_bodies.h \ + remote/qemu_protocol.c \ + remote/qemu_protocol.h \ + remote/qemu_client_bodies.h \ + $(NULL) + +REMOTE_DRIVER_SOURCES = \ + remote/remote_driver.c \ + remote/remote_driver.h \ + $(REMOTE_DRIVER_GENERATED) \ + $(NULL) + +LIBVIRTD_GENERATED = \ + remote/remote_daemon_dispatch_stubs.h \ + remote/remote_daemon_dispatch_lxc_stubs.h \ + remote/remote_daemon_dispatch_qemu_stubs.h \ + $(NULL) + +LIBVIRTD_SOURCES = \ + remote/remote_daemon.c \ + remote/remote_daemon.h \ + remote/remote_daemon_config.c \ + remote/remote_daemon_config.h \ + remote/remote_daemon_dispatch.c \ + remote/remote_daemon_dispatch.h \ + remote/remote_daemon_stream.c \ + remote/remote_daemon_stream.h \ + $(LIBVIRTD_GENERATED) \ + $(NULL) + + +LOGROTATE_FILES_IN += \ + remote/libvirtd.qemu.logrotate.in \ + remote/libvirtd.lxc.logrotate.in \ + remote/libvirtd.libxl.logrotate.in \ + remote/libvirtd.uml.logrotate.in \ + remote/libvirtd.logrotate.in \ + $(NULL) + +SYSVINIT_FILES_IN += remote/libvirtd.init.in + +SYSCONF_FILES += remote/libvirtd.sysconf + +PODFILES += remote/libvirtd.pod +MANINFILES += libvirtd.8.in + +SYSTEMD_UNIT_FILES_IN += \ + remote/libvirtd.service.in \ + remote/virt-guest-shutdown.target.in \ + $(NULL) + +UPSTART_FILES += remote/libvirtd.upstart + +REMOTE_PROTOCOL = $(srcdir)/remote/remote_protocol.x +LXC_PROTOCOL = $(srcdir)/remote/lxc_protocol.x +QEMU_PROTOCOL = $(srcdir)/remote/qemu_protocol.x +REMOTE_DRIVER_PROTOCOL = \ + $(REMOTE_PROTOCOL) \ + $(QEMU_PROTOCOL) \ + $(LXC_PROTOCOL) \ + $(NULL) + +DRIVER_SOURCE_FILES += $(REMOTE_DRIVER_SOURCES) + +EXTRA_DIST += \ + $(REMOTE_DRIVER_PROTOCOL) \ + $(REMOTE_DRIVER_SOURCES) \ + $(LIBVIRTD_SOURCES) \ + remote/test_libvirtd.aug.in \ + remote/libvirtd.aug \ + remote/libvirtd.conf \ + remote/libvirtd.policy.in \ + remote/libvirtd.rules \ + remote/libvirtd.sasl \ + remote/libvirtd.sysctl \ + $(NULL) + +if WITH_REMOTE +noinst_LTLIBRARIES += libvirt_driver_remote.la +libvirt_la_BUILT_LIBADD += libvirt_driver_remote.la +libvirt_driver_remote_la_CFLAGS = \ + $(XDR_CFLAGS) \ + -I$(srcdir)/conf \ + -I$(srcdir)/rpc \ + $(AM_CFLAGS) \ + $(NULL) +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 +USED_SYM_FILES += $(srcdir)/libvirt_remote.syms +else ! WITH_REMOTE +SYM_FILES += $(srcdir)/libvirt_remote.syms +endif ! WITH_REMOTE + +if WITH_LIBVIRTD + +sbin_PROGRAMS += libvirtd + +BUILT_SOURCES += $(LIBVIRTD_GENERATED) +MAINTAINERCLEANFILES += $(LIBVIRTD_GENERATED) + +augeas_DATA += remote/libvirtd.aug + +augeastest_DATA += test_libvirtd.aug + +conf_DATA += remote/libvirtd.conf + +CLEANFILES += test_libvirtd.aug + +if WITH_POLKIT +if WITH_POLKIT0 +policydir = $(datadir)/PolicyKit/policy +policyauth = auth_admin_keep_session +else ! WITH_POLKIT0 +policydir = $(datadir)/polkit-1/actions +policyauth = auth_admin_keep +endif ! WITH_POLKIT0 +endif WITH_POLKIT + +BUILT_SOURCES += libvirtd.policy +CLEANFILES += libvirtd.policy + +man8_MANS += libvirtd.8 + +libvirtd_SOURCES = $(LIBVIRTD_SOURCES) + +libvirtd_CFLAGS = \ + $(LIBXML_CFLAGS) \ + $(GNUTLS_CFLAGS) \ + $(SASL_CFLAGS) \ + $(XDR_CFLAGS) \ + $(DBUS_CFLAGS) \ + $(LIBNL_CFLAGS) \ + $(WARN_CFLAGS) \ + $(PIE_CFLAGS) \ + $(COVERAGE_CFLAGS) \ + -I$(srcdir)/access \ + -I$(srcdir)/conf \ + -I$(srcdir)/rpc \ + $(NULL) + +libvirtd_LDFLAGS = \ + $(RELRO_LDFLAGS) \ + $(PIE_LDFLAGS) \ + $(COVERAGE_LDFLAGS) \ + $(NO_INDIRECT_LDFLAGS) \ + $(NO_UNDEFINED_LDFLAGS) \ + $(NULL) + +libvirtd_LDADD = \ + $(LIBXML_LIBS) \ + $(GNUTLS_LIBS) \ + $(SASL_LIBS) \ + $(DBUS_LIBS) \ + $(LIBNL_LIBS) \ + $(NULL) + +if WITH_DTRACE_PROBES +libvirtd_LDADD += ../src/libvirt_probes.lo +endif WITH_DTRACE_PROBES + +libvirtd_LDADD += \ + libvirt_driver_admin.la \ + libvirt-lxc.la \ + libvirt-qemu.la \ + libvirt.la \ + ../gnulib/lib/libgnu.la \ + $(LIBSOCKET) \ + $(NULL) + +INSTALL_DATA_DIRS += remote + +install-data-remote: + $(MKDIR_P) "$(DESTDIR)$(localstatedir)/log/libvirt" + +uninstall-data-remote: + rmdir "$(DESTDIR)$(localstatedir)/log/libvirt" ||: + +AUGEAS_DIRS += remote + +test_libvirtd.aug: remote/test_libvirtd.aug.in \ + remote/libvirtd.conf $(AUG_GENTEST) + $(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/remote/libvirtd.conf $< $@ + +check-augeas-remote: test_libvirtd.aug + $(AM_V_GEN)if test -x '$(AUGPARSE)'; then \ + '$(AUGPARSE)' -I $(srcdir)/remote test_libvirtd.aug; \ + fi + +if WITH_SYSCTL +# Use $(prefix)/lib rather than $(libdir), since man sysctl.d insists on +# /usr/lib/sysctl.d/ even when libdir is /usr/lib64 +install-sysctl: + $(MKDIR_P) $(DESTDIR)$(prefix)/lib/sysctl.d + $(INSTALL_DATA) $(srcdir)/remote/libvirtd.sysctl \ + $(DESTDIR)$(prefix)/lib/sysctl.d/60-libvirtd.conf + +uninstall-sysctl: + rm -f $(DESTDIR)$(prefix)/lib/sysctl.d/60-libvirtd.conf + rmdir $(DESTDIR)$(prefix)/lib/sysctl.d || : +else ! WITH_SYSCTL +install-sysctl: +uninstall-sysctl: +endif ! WITH_SYSCTL + +if WITH_POLKIT +install-polkit:: + $(MKDIR_P) $(DESTDIR)$(policydir) + $(INSTALL_DATA) libvirtd.policy $(DESTDIR)$(policydir)/org.libvirt.unix.policy +if ! WITH_POLKIT0 + $(MKDIR_P) $(DESTDIR)$(datadir)/polkit-1/rules.d + $(INSTALL_DATA) $(srcdir)/remote/libvirtd.rules \ + $(DESTDIR)$(datadir)/polkit-1/rules.d/50-libvirt.rules +endif ! WITH_POLKIT0 + +uninstall-polkit:: + rm -f $(DESTDIR)$(policydir)/org.libvirt.unix.policy + rmdir $(DESTDIR)$(policydir) || : +if ! WITH_POLKIT0 + rm -f $(DESTDIR)$(datadir)/polkit-1/rules.d/50-libvirt.rules + rmdir $(DESTDIR)$(datadir)/polkit-1/rules.d || : +endif ! WITH_POLKIT0 + +else ! WITH_POLKIT +install-polkit:: +uninstall-polkit:: +endif ! WITH_POLKIT + +else ! WITH_LIBVIRTD +install-polkit:: +uninstall-polkit:: +install-sysctl:: +uninstall-sysctl:: +endif ! WITH_LIBVIRTD + +.PHONY: \ + install-data-remote \ + uninstall-data-remote \ + check-augeas-remote \ + $(NULL) + +# This is needed for clients too, so can't wrap in +# the WITH_LIBVIRTD conditional +if WITH_SASL +install-sasl: + $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sasl2/ + $(INSTALL_DATA) $(srcdir)/remote/libvirtd.sasl \ + $(DESTDIR)$(sysconfdir)/sasl2/libvirt.conf + +uninstall-sasl: + rm -f $(DESTDIR)$(sysconfdir)/sasl2/libvirt.conf + rmdir $(DESTDIR)$(sysconfdir)/sasl2/ || : +else ! WITH_SASL +install-sasl: +uninstall-sasl: +endif ! WITH_SASL + +libvirtd.policy: remote/libvirtd.policy.in $(top_builddir)/config.status + $(AM_V_GEN) sed \ + -e 's|[@]authaction[@]|$(policyauth)|g' \ + < $< > $@-t && \ + mv $@-t $@ + +libvirtd.init: remote/libvirtd.init.in $(top_builddir)/config.status + $(AM_V_GEN)sed \ + -e 's|[@]localstatedir[@]|$(localstatedir)|g' \ + -e 's|[@]sbindir[@]|$(sbindir)|g' \ + -e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \ + < $< > $@-t && \ + chmod a+x $@-t && \ + mv $@-t $@ + +libvirtd.service: remote/libvirtd.service.in $(top_builddir)/config.status + $(AM_V_GEN)sed \ + -e 's|[@]localstatedir[@]|$(localstatedir)|g' \ + -e 's|[@]sbindir[@]|$(sbindir)|g' \ + -e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \ + < $< > $@-t && \ + mv $@-t $@ + +virt-guest-shutdown.target: remote/virt-guest-shutdown.target.in \ + $(top_builddir)/config.status + $(AM_V_GEN)cp $< $@ + + +remote/remote_client_bodies.h: $(srcdir)/rpc/gendispatch.pl \ + $(REMOTE_PROTOCOL) Makefile.am + $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=client \ + remote REMOTE $(REMOTE_PROTOCOL) \ + > $(srcdir)/remote/remote_client_bodies.h + +remote/lxc_client_bodies.h: $(srcdir)/rpc/gendispatch.pl \ + $(LXC_PROTOCOL) Makefile.am + $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=client \ + lxc LXC $(LXC_PROTOCOL) \ + > $(srcdir)/remote/lxc_client_bodies.h + +remote/qemu_client_bodies.h: $(srcdir)/rpc/gendispatch.pl \ + $(QEMU_PROTOCOL) Makefile.am + $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=client \ + qemu QEMU $(QEMU_PROTOCOL) \ + > $(srcdir)/remote/qemu_client_bodies.h + +remote/remote_daemon_dispatch_stubs.h: $(srcdir)/rpc/gendispatch.pl \ + $(REMOTE_PROTOCOL) Makefile.am + $(AM_V_GEN)$(PERL) -w $(top_srcdir)/src/rpc/gendispatch.pl \ + --mode=server remote REMOTE $(REMOTE_PROTOCOL) \ + > $(srcdir)/remote/remote_daemon_dispatch_stubs.h + +remote/remote_daemon_dispatch_lxc_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 + +remote/remote_daemon_dispatch_qemu_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 + +libvirtd.8.in: remote/libvirtd.pod + $(AM_V_GEN)$(POD2MAN) --section=8 $< $@-t1 && \ + if grep 'POD ERROR' $@-t1; then rm $@-t1; exit 1; fi && \ + sed \ + -e 's|SYSCONFDIR|\@sysconfdir\@|g' \ + -e 's|LOCALSTATEDIR|\@localstatedir\@|g' \ + < $@-t1 > $@-t2 && \ + rm -f $@-t1 && \ + mv $@-t2 $@ -- 2.14.3

Daniel P. Berrangé

4:14 a.m.

New subject: [libvirt] [PATCH 08/17] make: split XML conf build rules into conf/Makefile.inc.am

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/Makefile.am | 117 +--------------------------------- src/conf/Makefile.inc.am | 163 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 164 insertions(+), 116 deletions(-) create mode 100644 src/conf/Makefile.inc.am diff --git a/src/Makefile.am b/src/Makefile.am index bbfd3b0427..f4fb9ac242 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -91,6 +91,7 @@ SYSCONF_FILES = sbin_PROGRAMS = man8_MANS = +include conf/Makefile.inc.am include uml/Makefile.inc.am include phyp/Makefile.inc.am include test/Makefile.inc.am @@ -439,114 +440,6 @@ logging/log_daemon_dispatch_stubs.h: $(LOG_PROTOCOL) \ $(LOG_PROTOCOL) > $(srcdir)/logging/log_daemon_dispatch_stubs.h -NETDEV_CONF_SOURCES = \ - conf/netdev_bandwidth_conf.h conf/netdev_bandwidth_conf.c \ - conf/netdev_vport_profile_conf.h conf/netdev_vport_profile_conf.c \ - conf/netdev_vlan_conf.h conf/netdev_vlan_conf.c - -# XML configuration format handling sources -# Domain driver generic impl APIs -DOMAIN_CONF_SOURCES = \ - conf/capabilities.c conf/capabilities.h \ - conf/domain_addr.c conf/domain_addr.h \ - conf/domain_capabilities.c conf/domain_capabilities.h \ - conf/domain_conf.c conf/domain_conf.h \ - conf/domain_audit.c conf/domain_audit.h \ - conf/domain_nwfilter.c conf/domain_nwfilter.h \ - conf/virsavecookie.c conf/virsavecookie.h \ - conf/snapshot_conf.c conf/snapshot_conf.h \ - conf/numa_conf.c conf/numa_conf.h \ - conf/virdomainobjlist.c conf/virdomainobjlist.h - -OBJECT_EVENT_SOURCES = \ - conf/object_event.c conf/object_event.h \ - conf/object_event_private.h - -DOMAIN_EVENT_SOURCES = \ - conf/domain_event.c conf/domain_event.h - -NETWORK_EVENT_SOURCES = \ - conf/network_event.c conf/network_event.h - -STORAGE_EVENT_SOURCES = \ - conf/storage_event.c conf/storage_event.h - -NODE_DEVICE_EVENT_SOURCES = \ - conf/node_device_event.c conf/node_device_event.h - -SECRET_EVENT_SOURCES = \ - conf/secret_event.c conf/secret_event.h - -# Network driver generic impl APIs -NETWORK_CONF_SOURCES = \ - conf/network_conf.c conf/network_conf.h \ - conf/virnetworkobj.c conf/virnetworkobj.h \ - conf/networkcommon_conf.c conf/networkcommon_conf.h - -# Network filter driver generic impl APIs -NWFILTER_PARAM_CONF_SOURCES = \ - conf/nwfilter_params.c conf/nwfilter_params.h \ - conf/nwfilter_ipaddrmap.c \ - conf/nwfilter_ipaddrmap.h \ - conf/nwfilter_conf.h \ - conf/virnwfilterobj.h - -NWFILTER_CONF_SOURCES = \ - $(NWFILTER_PARAM_CONF_SOURCES) \ - conf/nwfilter_conf.c conf/nwfilter_conf.h \ - conf/virnwfilterobj.c conf/virnwfilterobj.h - -# Storage driver generic impl APIs -STORAGE_CONF_SOURCES = \ - conf/storage_adapter_conf.h conf/storage_adapter_conf.c \ - conf/storage_conf.h conf/storage_conf.c \ - conf/virstorageobj.h conf/virstorageobj.c - -# Interface driver generic impl APIs -INTERFACE_CONF_SOURCES = \ - conf/interface_conf.c conf/interface_conf.h \ - conf/virinterfaceobj.c conf/virinterfaceobj.h - -# Secret driver generic impl APIs -SECRET_CONF_SOURCES = \ - conf/secret_conf.h conf/secret_conf.c \ - conf/virsecretobj.h conf/virsecretobj.c - -# Network driver generic impl APIs -NODE_DEVICE_CONF_SOURCES = \ - conf/node_device_conf.c conf/node_device_conf.h \ - conf/virnodedeviceobj.c conf/virnodedeviceobj.h - -CPU_CONF_SOURCES = \ - conf/cpu_conf.c conf/cpu_conf.h - -# Safe character device handling helper APIs -CHRDEV_CONF_SOURCES = \ - conf/virchrdev.c conf/virchrdev.h - -# Device Helper APIs -DEVICE_CONF_SOURCES = \ - conf/device_conf.c conf/device_conf.h - -CONF_SOURCES = \ - $(NETDEV_CONF_SOURCES) \ - $(DOMAIN_CONF_SOURCES) \ - $(OBJECT_EVENT_SOURCES) \ - $(DOMAIN_EVENT_SOURCES) \ - $(NETWORK_EVENT_SOURCES) \ - $(STORAGE_EVENT_SOURCES) \ - $(NODE_DEVICE_EVENT_SOURCES) \ - $(SECRET_EVENT_SOURCES) \ - $(NETWORK_CONF_SOURCES) \ - $(NWFILTER_CONF_SOURCES) \ - $(NODE_DEVICE_CONF_SOURCES) \ - $(STORAGE_CONF_SOURCES) \ - $(INTERFACE_CONF_SOURCES) \ - $(SECRET_CONF_SOURCES) \ - $(CPU_CONF_SOURCES) \ - $(CHRDEV_CONF_SOURCES) \ - $(DEVICE_CONF_SOURCES) - ADMIN_PROTOCOL = $(srcdir)/admin/admin_protocol.x @@ -838,14 +731,6 @@ libvirt_util_la_LIBADD = $(CAPNG_LIBS) $(YAJL_LIBS) $(LIBNL_LIBS) \ $(POLKIT_LIBS) $(GNUTLS_LIBS) -noinst_LTLIBRARIES += libvirt_conf.la -libvirt_la_BUILT_LIBADD += libvirt_conf.la -libvirt_conf_la_SOURCES = $(CONF_SOURCES) -libvirt_conf_la_CFLAGS = \ - -I$(srcdir)/conf $(AM_CFLAGS) -libvirt_conf_la_LDFLAGS = $(AM_LDFLAGS) -libvirt_conf_la_LIBADD = $(LIBXML_LIBS) - noinst_LTLIBRARIES += libvirt_cpu.la libvirt_la_BUILT_LIBADD += libvirt_cpu.la libvirt_cpu_la_CFLAGS = \ diff --git a/src/conf/Makefile.inc.am b/src/conf/Makefile.inc.am new file mode 100644 index 0000000000..6d7b0f076b --- /dev/null +++ b/src/conf/Makefile.inc.am @@ -0,0 +1,163 @@ +NETDEV_CONF_SOURCES = \ + conf/netdev_bandwidth_conf.h \ + conf/netdev_bandwidth_conf.c \ + conf/netdev_vport_profile_conf.h \ + conf/netdev_vport_profile_conf.c \ + conf/netdev_vlan_conf.h \ + conf/netdev_vlan_conf.c \ + $(NULL) + +DOMAIN_CONF_SOURCES = \ + conf/capabilities.c \ + conf/capabilities.h \ + conf/domain_addr.c \ + conf/domain_addr.h \ + conf/domain_capabilities.c \ + conf/domain_capabilities.h \ + conf/domain_conf.c \ + conf/domain_conf.h \ + conf/domain_audit.c \ + conf/domain_audit.h \ + conf/domain_nwfilter.c \ + conf/domain_nwfilter.h \ + conf/virsavecookie.c \ + conf/virsavecookie.h \ + conf/snapshot_conf.c \ + conf/snapshot_conf.h \ + conf/numa_conf.c \ + conf/numa_conf.h \ + conf/virdomainobjlist.c \ + conf/virdomainobjlist.h \ + $(NULL) + +OBJECT_EVENT_SOURCES = \ + conf/object_event.c \ + conf/object_event.h \ + conf/object_event_private.h \ + $(NULL) + +DOMAIN_EVENT_SOURCES = \ + conf/domain_event.c \ + conf/domain_event.h \ + $(NULL) + +NETWORK_EVENT_SOURCES = \ + conf/network_event.c \ + conf/network_event.h \ + $(NULL) + +STORAGE_EVENT_SOURCES = \ + conf/storage_event.c \ + conf/storage_event.h \ + $(NULL) + +NODE_DEVICE_EVENT_SOURCES = \ + conf/node_device_event.c \ + conf/node_device_event.h \ + $(NULL) + +SECRET_EVENT_SOURCES = \ + conf/secret_event.c \ + conf/secret_event.h \ + $(NULL) + +NETWORK_CONF_SOURCES = \ + conf/network_conf.c \ + conf/network_conf.h \ + conf/virnetworkobj.c \ + conf/virnetworkobj.h \ + conf/networkcommon_conf.c \ + conf/networkcommon_conf.h \ + $(NULL) + +NWFILTER_PARAM_CONF_SOURCES = \ + conf/nwfilter_params.c \ + conf/nwfilter_params.h \ + conf/nwfilter_ipaddrmap.c \ + conf/nwfilter_ipaddrmap.h \ + conf/nwfilter_conf.h \ + conf/virnwfilterobj.h \ + $(NULL) + +NWFILTER_CONF_SOURCES = \ + $(NWFILTER_PARAM_CONF_SOURCES) \ + conf/nwfilter_conf.c \ + conf/nwfilter_conf.h \ + conf/virnwfilterobj.c \ + conf/virnwfilterobj.h \ + $(NULL) + +STORAGE_CONF_SOURCES = \ + conf/storage_adapter_conf.h \ + conf/storage_adapter_conf.c \ + conf/storage_conf.h \ + conf/storage_conf.c \ + conf/virstorageobj.h \ + conf/virstorageobj.c \ + $(NULL) + +INTERFACE_CONF_SOURCES = \ + conf/interface_conf.c \ + conf/interface_conf.h \ + conf/virinterfaceobj.c \ + conf/virinterfaceobj.h \ + $(NULL) + +SECRET_CONF_SOURCES = \ + conf/secret_conf.h \ + conf/secret_conf.c \ + conf/virsecretobj.h \ + conf/virsecretobj.c \ + $(NULL) + +NODE_DEVICE_CONF_SOURCES = \ + conf/node_device_conf.c \ + conf/node_device_conf.h \ + conf/virnodedeviceobj.c \ + conf/virnodedeviceobj.h \ + $(NULL) + +CPU_CONF_SOURCES = \ + conf/cpu_conf.c \ + conf/cpu_conf.h \ + $(NULL) + +CHRDEV_CONF_SOURCES = \ + conf/virchrdev.c \ + conf/virchrdev.h \ + $(NULL) + +DEVICE_CONF_SOURCES = \ + conf/device_conf.c \ + conf/device_conf.h \ + $(NULL) + +CONF_SOURCES = \ + $(NETDEV_CONF_SOURCES) \ + $(DOMAIN_CONF_SOURCES) \ + $(OBJECT_EVENT_SOURCES) \ + $(DOMAIN_EVENT_SOURCES) \ + $(NETWORK_EVENT_SOURCES) \ + $(STORAGE_EVENT_SOURCES) \ + $(NODE_DEVICE_EVENT_SOURCES) \ + $(SECRET_EVENT_SOURCES) \ + $(NETWORK_CONF_SOURCES) \ + $(NWFILTER_CONF_SOURCES) \ + $(NODE_DEVICE_CONF_SOURCES) \ + $(STORAGE_CONF_SOURCES) \ + $(INTERFACE_CONF_SOURCES) \ + $(SECRET_CONF_SOURCES) \ + $(CPU_CONF_SOURCES) \ + $(CHRDEV_CONF_SOURCES) \ + $(DEVICE_CONF_SOURCES) \ + $(NULL) + +noinst_LTLIBRARIES += libvirt_conf.la +libvirt_la_BUILT_LIBADD += libvirt_conf.la +libvirt_conf_la_SOURCES = $(CONF_SOURCES) +libvirt_conf_la_CFLAGS = \ + -I$(srcdir)/conf \ + $(AM_CFLAGS) \ + $(NULL) +libvirt_conf_la_LDFLAGS = $(AM_LDFLAGS) +libvirt_conf_la_LIBADD = $(LIBXML_LIBS) -- 2.14.3

Daniel P. Berrangé

4:14 a.m.

New subject: [libvirt] [PATCH 09/17] make: split CPU build rules into cpu/Makefile.inc.am

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/Makefile.am | 15 +-------------- src/cpu/Makefile.inc.am | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 14 deletions(-) create mode 100644 src/cpu/Makefile.inc.am diff --git a/src/Makefile.am b/src/Makefile.am index f4fb9ac242..8f628d2d38 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -92,6 +92,7 @@ sbin_PROGRAMS = man8_MANS = include conf/Makefile.inc.am +include cpu/Makefile.inc.am include uml/Makefile.inc.am include phyp/Makefile.inc.am include test/Makefile.inc.am @@ -692,14 +693,6 @@ ACCESS_DRIVER_POLKIT_POLICY = \ $(srcdir)/access/org.libvirt.api.policy -CPU_SOURCES = \ - cpu/cpu.h cpu/cpu.c \ - cpu/cpu_x86.h cpu/cpu_x86.c cpu/cpu_x86_data.h \ - cpu/cpu_s390.h cpu/cpu_s390.c \ - cpu/cpu_arm.h cpu/cpu_arm.c \ - cpu/cpu_ppc64.h cpu/cpu_ppc64.c \ - cpu/cpu_ppc64_data.h \ - cpu/cpu_map.h cpu/cpu_map.c VMX_SOURCES = \ vmx/vmx.c vmx/vmx.h @@ -731,12 +724,6 @@ libvirt_util_la_LIBADD = $(CAPNG_LIBS) $(YAJL_LIBS) $(LIBNL_LIBS) \ $(POLKIT_LIBS) $(GNUTLS_LIBS) -noinst_LTLIBRARIES += libvirt_cpu.la -libvirt_la_BUILT_LIBADD += libvirt_cpu.la -libvirt_cpu_la_CFLAGS = \ - -I$(srcdir)/conf $(AM_CFLAGS) -libvirt_cpu_la_SOURCES = $(CPU_SOURCES) - if WITH_VMX noinst_LTLIBRARIES += libvirt_vmx.la libvirt_la_BUILT_LIBADD += libvirt_vmx.la diff --git a/src/cpu/Makefile.inc.am b/src/cpu/Makefile.inc.am new file mode 100644 index 0000000000..5020d40583 --- /dev/null +++ b/src/cpu/Makefile.inc.am @@ -0,0 +1,24 @@ +CPU_SOURCES = \ + cpu/cpu.h \ + cpu/cpu.c \ + cpu/cpu_x86.h \ + cpu/cpu_x86.c \ + cpu/cpu_x86_data.h \ + cpu/cpu_s390.h \ + cpu/cpu_s390.c \ + cpu/cpu_arm.h \ + cpu/cpu_arm.c \ + cpu/cpu_ppc64.h \ + cpu/cpu_ppc64.c \ + cpu/cpu_ppc64_data.h \ + cpu/cpu_map.h \ + cpu/cpu_map.c \ + $(NULL) + +noinst_LTLIBRARIES += libvirt_cpu.la +libvirt_la_BUILT_LIBADD += libvirt_cpu.la +libvirt_cpu_la_CFLAGS = \ + -I$(srcdir)/conf \ + $(AM_CFLAGS) \ + $(NULL) +libvirt_cpu_la_SOURCES = $(CPU_SOURCES) -- 2.14.3

Daniel P. Berrangé

4:14 a.m.

New subject: [libvirt] [PATCH 10/17] make: split security driver build rules into security/Makefile.inc.am

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/Makefile.am | 65 +---------------------------------- src/security/Makefile.inc.am | 80 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 81 insertions(+), 64 deletions(-) create mode 100644 src/security/Makefile.inc.am diff --git a/src/Makefile.am b/src/Makefile.am index 8f628d2d38..7dd50dacec 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -93,6 +93,7 @@ man8_MANS = include conf/Makefile.inc.am include cpu/Makefile.inc.am +include security/Makefile.inc.am include uml/Makefile.inc.am include phyp/Makefile.inc.am include test/Makefile.inc.am @@ -636,30 +637,12 @@ check-local: check-protocol check-symfile check-symsorting \ .PHONY: check-protocol $(PROTOCOL_STRUCTS:structs=struct) -SECURITY_DRIVER_APPARMOR_HELPER_SOURCES = \ - $(DATATYPES_SOURCES) \ - security/virt-aa-helper.c - UTIL_IO_HELPER_SOURCES = \ util/iohelper.c -# Security framework and drivers for various models -SECURITY_DRIVER_SOURCES = \ - security/security_driver.h security/security_driver.c \ - security/security_nop.h security/security_nop.c \ - security/security_stack.h security/security_stack.c \ - security/security_dac.h security/security_dac.c \ - security/security_manager.h security/security_manager.c - -SECURITY_DRIVER_SELINUX_SOURCES = \ - security/security_selinux.h security/security_selinux.c - -SECURITY_DRIVER_APPARMOR_SOURCES = \ - security/security_apparmor.h security/security_apparmor.c - ACCESS_DRIVER_GENERATED = \ access/viraccessapicheck.h \ access/viraccessapicheck.c \ @@ -768,22 +751,6 @@ GENERATED_SYM_FILES += \ -libvirt_security_manager_la_SOURCES = $(SECURITY_DRIVER_SOURCES) -noinst_LTLIBRARIES += libvirt_security_manager.la -libvirt_la_BUILT_LIBADD += libvirt_security_manager.la -libvirt_security_manager_la_CFLAGS = \ - -I$(srcdir)/conf $(AM_CFLAGS) -libvirt_security_manager_la_LDFLAGS = $(AM_LDFLAGS) -libvirt_security_manager_la_LIBADD = $(SECDRIVER_LIBS) -if WITH_SECDRIVER_SELINUX -libvirt_security_manager_la_SOURCES += $(SECURITY_DRIVER_SELINUX_SOURCES) -libvirt_security_manager_la_CFLAGS += $(SELINUX_CFLAGS) -endif WITH_SECDRIVER_SELINUX -if WITH_SECDRIVER_APPARMOR -libvirt_security_manager_la_SOURCES += $(SECURITY_DRIVER_APPARMOR_SOURCES) -libvirt_security_manager_la_CFLAGS += $(APPARMOR_CFLAGS) -endif WITH_SECDRIVER_APPARMOR - libvirt_driver_access_la_SOURCES = \ $(ACCESS_DRIVER_SOURCES) $(ACCESS_DRIVER_GENERATED) noinst_LTLIBRARIES += libvirt_driver_access.la @@ -878,8 +845,6 @@ access/viraccessapichecklxc.c: $(srcdir)/rpc/gendispatch.pl \ # Add all conditional sources just in case... EXTRA_DIST += \ - $(SECURITY_DRIVER_SELINUX_SOURCES) \ - $(SECURITY_DRIVER_APPARMOR_SOURCES) \ $(ACCESS_DRIVER_POLKIT_POLICY) check-local: check-augeas @@ -1872,34 +1837,6 @@ libvirt_sanlock_helper_LDADD = libvirt.la endif WITH_SANLOCK -if WITH_SECDRIVER_APPARMOR -if WITH_LIBVIRTD -libexec_PROGRAMS += virt-aa-helper - -virt_aa_helper_SOURCES = $(SECURITY_DRIVER_APPARMOR_HELPER_SOURCES) - -virt_aa_helper_LDFLAGS = \ - $(AM_LDFLAGS) \ - $(PIE_LDFLAGS) \ - $(NULL) -virt_aa_helper_LDADD = \ - libvirt.la \ - libvirt_conf.la \ - libvirt_util.la \ - libvirt_driver_storage_impl.la \ - ../gnulib/lib/libgnu.la -if WITH_DTRACE_PROBES -virt_aa_helper_LDADD += libvirt_probes.lo -endif WITH_DTRACE_PROBES -virt_aa_helper_CFLAGS = \ - -I$(srcdir)/conf \ - -I$(srcdir)/security \ - $(AM_CFLAGS) \ - $(PIE_CFLAGS) \ - $(NULL) -endif WITH_LIBVIRTD -endif WITH_SECDRIVER_APPARMOR -EXTRA_DIST += $(SECURITY_DRIVER_APPARMOR_HELPER_SOURCES) if WITH_NSS noinst_LTLIBRARIES += libvirt-nss.la diff --git a/src/security/Makefile.inc.am b/src/security/Makefile.inc.am new file mode 100644 index 0000000000..f88b82df7b --- /dev/null +++ b/src/security/Makefile.inc.am @@ -0,0 +1,80 @@ +SECURITY_DRIVER_APPARMOR_HELPER_SOURCES = \ + $(DATATYPES_SOURCES) \ + security/virt-aa-helper.c \ + $(NULL) + +SECURITY_DRIVER_SOURCES = \ + security/security_driver.h \ + security/security_driver.c \ + security/security_nop.h \ + security/security_nop.c \ + security/security_stack.h \ + security/security_stack.c \ + security/security_dac.h \ + security/security_dac.c \ + security/security_manager.h \ + security/security_manager.c \ + $(NULL) + +SECURITY_DRIVER_SELINUX_SOURCES = \ + security/security_selinux.h \ + security/security_selinux.c \ + $(NULL) + +SECURITY_DRIVER_APPARMOR_SOURCES = \ + security/security_apparmor.h \ + security/security_apparmor.c \ + $(NULL) + +EXTRA_DIST += \ + $(SECURITY_DRIVER_SELINUX_SOURCES) \ + $(SECURITY_DRIVER_APPARMOR_SOURCES) \ + $(SECURITY_DRIVER_APPARMOR_HELPER_SOURCES) \ + $(NULL) + +libvirt_security_manager_la_SOURCES = $(SECURITY_DRIVER_SOURCES) +noinst_LTLIBRARIES += libvirt_security_manager.la +libvirt_la_BUILT_LIBADD += libvirt_security_manager.la +libvirt_security_manager_la_CFLAGS = \ + -I$(srcdir)/conf \ + $(AM_CFLAGS) \ + $(NULL) +libvirt_security_manager_la_LDFLAGS = $(AM_LDFLAGS) +libvirt_security_manager_la_LIBADD = + +if WITH_SECDRIVER_SELINUX +libvirt_security_manager_la_SOURCES += $(SECURITY_DRIVER_SELINUX_SOURCES) +libvirt_security_manager_la_CFLAGS += $(SELINUX_CFLAGS) +endif WITH_SECDRIVER_SELINUX + +if WITH_SECDRIVER_APPARMOR +libvirt_security_manager_la_SOURCES += $(SECURITY_DRIVER_APPARMOR_SOURCES) +libvirt_security_manager_la_CFLAGS += $(APPARMOR_CFLAGS) + +if WITH_LIBVIRTD +libexec_PROGRAMS += virt-aa-helper + +virt_aa_helper_SOURCES = $(SECURITY_DRIVER_APPARMOR_HELPER_SOURCES) + +virt_aa_helper_LDFLAGS = \ + $(AM_LDFLAGS) \ + $(PIE_LDFLAGS) \ + $(NULL) +virt_aa_helper_LDADD = \ + libvirt.la \ + libvirt_conf.la \ + libvirt_util.la \ + libvirt_driver_storage_impl.la \ + ../gnulib/lib/libgnu.la \ + $(NULL) +if WITH_DTRACE_PROBES +virt_aa_helper_LDADD += libvirt_probes.lo +endif WITH_DTRACE_PROBES +virt_aa_helper_CFLAGS = \ + -I$(srcdir)/conf \ + -I$(srcdir)/security \ + $(AM_CFLAGS) \ + $(PIE_CFLAGS) \ + $(NULL) +endif WITH_LIBVIRTD +endif WITH_SECDRIVER_APPARMOR -- 2.14.3

Daniel P. Berrangé

4:14 a.m.

New subject: [libvirt] [PATCH 11/17] make: split access driver build rules into access/Makefile.inc.am

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/Makefile.am | 130 +-------------------------------------- src/access/Makefile.inc.am | 148 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 149 insertions(+), 129 deletions(-) create mode 100644 src/access/Makefile.inc.am diff --git a/src/Makefile.am b/src/Makefile.am index 7dd50dacec..e4822e1b40 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -94,6 +94,7 @@ man8_MANS = include conf/Makefile.inc.am include cpu/Makefile.inc.am include security/Makefile.inc.am +include access/Makefile.inc.am include uml/Makefile.inc.am include phyp/Makefile.inc.am include test/Makefile.inc.am @@ -643,39 +644,6 @@ UTIL_IO_HELPER_SOURCES = \ util/iohelper.c -ACCESS_DRIVER_GENERATED = \ - access/viraccessapicheck.h \ - access/viraccessapicheck.c \ - access/viraccessapicheckqemu.h \ - access/viraccessapicheckqemu.c \ - access/viraccessapichecklxc.h \ - access/viraccessapichecklxc.c \ - $(NULL) - -ACCESS_DRIVER_SYM_FILES = \ - libvirt_access.syms \ - libvirt_access_qemu.syms \ - libvirt_access_lxc.syms - -ACCESS_DRIVER_API_FILES = \ - libvirt_access.xml \ - libvirt_access_qemu.xml \ - libvirt_access_lxc.xml - -ACCESS_DRIVER_SOURCES = \ - access/viraccessperm.h access/viraccessperm.c \ - access/viraccessmanager.h access/viraccessmanager.c \ - access/viraccessdriver.h \ - access/viraccessdrivernop.h access/viraccessdrivernop.c \ - access/viraccessdriverstack.h access/viraccessdriverstack.c - -ACCESS_DRIVER_POLKIT_SOURCES = \ - access/viraccessdriverpolkit.h access/viraccessdriverpolkit.c - -ACCESS_DRIVER_POLKIT_POLICY = \ - $(srcdir)/access/org.libvirt.api.policy - - VMX_SOURCES = \ vmx/vmx.c vmx/vmx.h @@ -731,7 +699,6 @@ libvirt_driver_la_LIBADD = \ SYM_FILES += $(USED_SYM_FILES) USED_SYM_FILES += $(srcdir)/libvirt_private.syms GENERATED_SYM_FILES += \ - $(ACCESS_DRIVER_SYM_FILES) \ libvirt.syms libvirt.def libvirt_qemu.def libvirt_lxc.def \ libvirt_admin.syms libvirt_admin.def \ $(NULL) @@ -751,101 +718,6 @@ GENERATED_SYM_FILES += \ -libvirt_driver_access_la_SOURCES = \ - $(ACCESS_DRIVER_SOURCES) $(ACCESS_DRIVER_GENERATED) -noinst_LTLIBRARIES += libvirt_driver_access.la -libvirt_la_BUILT_LIBADD += libvirt_driver_access.la -libvirt_driver_access_la_CFLAGS = \ - -I$(srcdir)/conf $(AM_CFLAGS) -libvirt_driver_access_la_LDFLAGS = $(AM_LDFLAGS) -libvirt_driver_access_la_LIBADD = - -EXTRA_DIST += access/genpolkit.pl - -$(ACCESS_DRIVER_POLKIT_POLICY): $(srcdir)/access/viraccessperm.h \ - $(srcdir)/access/genpolkit.pl Makefile.am - $(AM_V_GEN)$(PERL) $(srcdir)/access/genpolkit.pl < $< > $@ || rm -f $@ - -if WITH_POLKIT1 -libvirt_driver_access_la_SOURCES += $(ACCESS_DRIVER_POLKIT_SOURCES) - -polkitactiondir = $(datadir)/polkit-1/actions -if WITH_LIBVIRTD -polkitaction_DATA = $(ACCESS_DRIVER_POLKIT_POLICY) -endif WITH_LIBVIRTD - -CLEANFILES += $(ACCESS_DRIVER_POLKIT_POLICY) -BUILT_SOURCES += $(ACCESS_DRIVER_POLKIT_POLICY) -else ! WITH_POLKIT1 -EXTRA_DIST += $(ACCESS_DRIVER_POLKIT_SOURCES) -endif ! WITH_POLKIT1 - - -BUILT_SOURCES += $(ACCESS_DRIVER_GENERATED) $(ACCESS_DRIVER_API_FILES) -CLEANFILES += $(ACCESS_DRIVER_GENERATED) $(ACCESS_DRIVER_API_FILES) - -libvirt_access.syms: $(srcdir)/rpc/gendispatch.pl \ - $(REMOTE_PROTOCOL) Makefile.am - $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=aclsym \ - remote REMOTE $(REMOTE_PROTOCOL) > $@ -libvirt_access_qemu.syms: $(srcdir)/rpc/gendispatch.pl \ - $(QEMU_PROTOCOL) Makefile.am - $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=aclsym \ - qemu QEMU $(QEMU_PROTOCOL) > $@ -libvirt_access_lxc.syms: $(srcdir)/rpc/gendispatch.pl \ - $(LXC_PROTOCOL) Makefile.am - $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=aclsym \ - lxc LXC $(LXC_PROTOCOL) > $@ - -libvirt_access.xml: $(srcdir)/rpc/gendispatch.pl \ - $(REMOTE_PROTOCOL) Makefile.am - $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=aclapi \ - remote REMOTE $(REMOTE_PROTOCOL) > $@ -libvirt_access_qemu.xml: $(srcdir)/rpc/gendispatch.pl \ - $(QEMU_PROTOCOL) Makefile.am - $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=aclapi \ - qemu QEMU $(QEMU_PROTOCOL) > $@ -libvirt_access_lxc.xml: $(srcdir)/rpc/gendispatch.pl \ - $(LXC_PROTOCOL) Makefile.am - $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=aclapi \ - lxc LXC $(LXC_PROTOCOL) > $@ - -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.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/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.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/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.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 - -# Add all conditional sources just in case... -EXTRA_DIST += \ - $(ACCESS_DRIVER_POLKIT_POLICY) check-local: check-augeas diff --git a/src/access/Makefile.inc.am b/src/access/Makefile.inc.am new file mode 100644 index 0000000000..c68ba5f044 --- /dev/null +++ b/src/access/Makefile.inc.am @@ -0,0 +1,148 @@ +ACCESS_DRIVER_GENERATED = \ + access/viraccessapicheck.h \ + access/viraccessapicheck.c \ + access/viraccessapicheckqemu.h \ + access/viraccessapicheckqemu.c \ + access/viraccessapichecklxc.h \ + access/viraccessapichecklxc.c \ + $(NULL) + +ACCESS_DRIVER_SYM_FILES = \ + libvirt_access.syms \ + libvirt_access_qemu.syms \ + libvirt_access_lxc.syms \ + $(NULL) + +ACCESS_DRIVER_API_FILES = \ + libvirt_access.xml \ + libvirt_access_qemu.xml \ + libvirt_access_lxc.xml \ + $(NULL) + +ACCESS_DRIVER_SOURCES = \ + access/viraccessperm.h \ + access/viraccessperm.c \ + access/viraccessmanager.h \ + access/viraccessmanager.c \ + access/viraccessdriver.h \ + access/viraccessdrivernop.h \ + access/viraccessdrivernop.c \ + access/viraccessdriverstack.h \ + access/viraccessdriverstack.c \ + $(NULL) + +ACCESS_DRIVER_POLKIT_SOURCES = \ + access/viraccessdriverpolkit.h \ + access/viraccessdriverpolkit.c \ + $(NULL) + +ACCESS_DRIVER_POLKIT_POLICY = $(srcdir)/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) \ + $(ACCESS_DRIVER_GENERATED) \ + $(NULL) +noinst_LTLIBRARIES += libvirt_driver_access.la +libvirt_la_BUILT_LIBADD += libvirt_driver_access.la +libvirt_driver_access_la_CFLAGS = \ + -I$(srcdir)/conf \ + $(AM_CFLAGS) \ + $(NULL) +libvirt_driver_access_la_LDFLAGS = $(AM_LDFLAGS) +libvirt_driver_access_la_LIBADD = + + +$(ACCESS_DRIVER_POLKIT_POLICY): $(srcdir)/access/viraccessperm.h \ + $(srcdir)/access/genpolkit.pl Makefile.am + $(AM_V_GEN)$(PERL) $(srcdir)/access/genpolkit.pl < $< > $@ || rm -f $@ + +if WITH_POLKIT1 +libvirt_driver_access_la_SOURCES += $(ACCESS_DRIVER_POLKIT_SOURCES) + +polkitactiondir = $(datadir)/polkit-1/actions +if WITH_LIBVIRTD +polkitaction_DATA = $(ACCESS_DRIVER_POLKIT_POLICY) +endif WITH_LIBVIRTD + +CLEANFILES += $(ACCESS_DRIVER_POLKIT_POLICY) +BUILT_SOURCES += $(ACCESS_DRIVER_POLKIT_POLICY) +else ! WITH_POLKIT1 +EXTRA_DIST += $(ACCESS_DRIVER_POLKIT_SOURCES) +endif ! WITH_POLKIT1 + + +BUILT_SOURCES += \ + $(ACCESS_DRIVER_GENERATED) \ + $(ACCESS_DRIVER_API_FILES) \ + $(NULL) +CLEANFILES += \ + $(ACCESS_DRIVER_GENERATED) \ + $(ACCESS_DRIVER_API_FILES) \ + $(NULL) + +libvirt_access.syms: $(srcdir)/rpc/gendispatch.pl \ + $(REMOTE_PROTOCOL) Makefile.am + $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=aclsym \ + remote REMOTE $(REMOTE_PROTOCOL) > $@ +libvirt_access_qemu.syms: $(srcdir)/rpc/gendispatch.pl \ + $(QEMU_PROTOCOL) Makefile.am + $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=aclsym \ + qemu QEMU $(QEMU_PROTOCOL) > $@ +libvirt_access_lxc.syms: $(srcdir)/rpc/gendispatch.pl \ + $(LXC_PROTOCOL) Makefile.am + $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=aclsym \ + lxc LXC $(LXC_PROTOCOL) > $@ + +libvirt_access.xml: $(srcdir)/rpc/gendispatch.pl \ + $(REMOTE_PROTOCOL) Makefile.am + $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=aclapi \ + remote REMOTE $(REMOTE_PROTOCOL) > $@ +libvirt_access_qemu.xml: $(srcdir)/rpc/gendispatch.pl \ + $(QEMU_PROTOCOL) Makefile.am + $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=aclapi \ + qemu QEMU $(QEMU_PROTOCOL) > $@ +libvirt_access_lxc.xml: $(srcdir)/rpc/gendispatch.pl \ + $(LXC_PROTOCOL) Makefile.am + $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=aclapi \ + lxc LXC $(LXC_PROTOCOL) > $@ + +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.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/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.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/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.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 -- 2.14.3

Daniel P. Berrangé

4:14 a.m.

New subject: [libvirt] [PATCH 12/17] make: split logging daemon build rules into logging/Makefile.inc.am

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/Makefile.am | 144 ++++------------------------------------ src/logging/Makefile.inc.am | 155 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 166 insertions(+), 133 deletions(-) create mode 100644 src/logging/Makefile.inc.am diff --git a/src/Makefile.am b/src/Makefile.am index e4822e1b40..c59faf9aeb 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -90,11 +90,13 @@ UPSTART_FILES = SYSCONF_FILES = sbin_PROGRAMS = man8_MANS = +DRIVER_SOURCES = include conf/Makefile.inc.am include cpu/Makefile.inc.am include security/Makefile.inc.am include access/Makefile.inc.am +include logging/Makefile.inc.am include uml/Makefile.inc.am include phyp/Makefile.inc.am include test/Makefile.inc.am @@ -327,7 +329,7 @@ CLEANFILES += $(KEYMANS) $(KEYPODS) # Internal generic driver infrastructure DATATYPES_SOURCES = datatypes.h datatypes.c -DRIVER_SOURCES = \ +DRIVER_SOURCES += \ driver.c driver.h \ driver-hypervisor.h \ driver-interface.h \ @@ -355,7 +357,6 @@ DRIVER_SOURCES = \ locking/lock_driver.h \ locking/lock_driver_nop.h locking/lock_driver_nop.c \ locking/domain_lock.h locking/domain_lock.c \ - logging/log_manager.c logging/log_manager.h \ $(NULL) LOCK_DRIVER_SANLOCK_SOURCES = \ @@ -404,45 +405,6 @@ locking/lock_daemon_dispatch_stubs.h: $(LOCK_PROTOCOL) \ $(LOCK_PROTOCOL) > $(srcdir)/locking/lock_daemon_dispatch_stubs.h -LOG_PROTOCOL_GENERATED = \ - logging/log_protocol.h \ - logging/log_protocol.c \ - $(NULL) - -DRIVER_SOURCES += $(LOG_PROTOCOL_GENERATED) - -LOG_PROTOCOL = $(srcdir)/logging/log_protocol.x -EXTRA_DIST += $(LOG_PROTOCOL) \ - $(LOG_PROTOCOL_GENERATED) -BUILT_SOURCES += $(LOG_PROTOCOL_GENERATED) -MAINTAINERCLEANFILES += $(LOG_PROTOCOL_GENERATED) - -LOG_DAEMON_GENERATED = \ - logging/log_daemon_dispatch_stubs.h - $(NULL) - -BUILT_SOURCES += $(LOG_DAEMON_GENERATED) -EXTRA_DIST += $(LOG_DAEMON_GENERATED) -MAINTAINERCLEANFILES += $(LOG_DAEMON_GENERATED) - -LOG_DAEMON_SOURCES = \ - logging/log_daemon.h \ - logging/log_daemon.c \ - logging/log_daemon_config.h \ - logging/log_daemon_config.c \ - logging/log_daemon_dispatch.c \ - logging/log_daemon_dispatch.h \ - logging/log_handler.c \ - logging/log_handler.h \ - $(NULL) - -logging/log_daemon_dispatch_stubs.h: $(LOG_PROTOCOL) \ - $(srcdir)/rpc/gendispatch.pl Makefile.am - $(AM_V_GEN)perl -w $(srcdir)/rpc/gendispatch.pl --mode=server \ - virLogManagerProtocol VIR_LOG_MANAGER_PROTOCOL \ - $(LOG_PROTOCOL) > $(srcdir)/logging/log_daemon_dispatch_stubs.h - - ADMIN_PROTOCOL = $(srcdir)/admin/admin_protocol.x @@ -728,8 +690,7 @@ check-local: check-augeas check-augeas: $(AUGEAS_DIRS:%=check-augeas-%) \ check-augeas-sanlock \ - check-augeas-lockd check-augeas-virtlockd \ - check-augeas-virtlogd + check-augeas-lockd check-augeas-virtlockd AUG_GENTEST = $(PERL) $(top_srcdir)/build-aux/augeas-gentest.pl EXTRA_DIST += $(top_srcdir)/build-aux/augeas-gentest.pl @@ -774,16 +735,6 @@ check-augeas-virtlockd: test_virtlockd.aug '$(AUGPARSE)' -I $(srcdir)/locking test_virtlockd.aug; \ fi - -test_virtlogd.aug: logging/test_virtlogd.aug.in \ - logging/virtlogd.conf $(AUG_GENTEST) - $(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/logging/virtlogd.conf $< $@ - -check-augeas-virtlogd: test_virtlogd.aug - $(AM_V_GEN)if test -x '$(AUGPARSE)'; then \ - '$(AUGPARSE)' -I $(srcdir)/logging test_virtlogd.aug; \ - fi - # # Build our version script. This is composed of three parts: # @@ -1190,7 +1141,7 @@ locking/%-lockd.conf: $(srcdir)/locking/lockd.conf cp $< $@ -sbin_PROGRAMS += virtlockd virtlogd +sbin_PROGRAMS += virtlockd virtlockd_SOURCES = \ $(LOCK_DAEMON_SOURCES) \ @@ -1220,42 +1171,14 @@ virtlockd_LDADD += libvirt_probes.lo endif WITH_DTRACE_PROBES -virtlogd_SOURCES = \ - $(LOG_DAEMON_SOURCES) \ - $(LOG_PROTOCOL_GENERATED) \ - $(LOG_DAEMON_GENERATED) \ - $(NULL) -virtlogd_CFLAGS = \ - $(AM_CFLAGS) \ - $(PIE_CFLAGS) \ - $(XDR_CFLAGS) \ - $(NULL) -virtlogd_LDFLAGS = \ - $(AM_LDFLAGS) \ - $(PIE_LDFLAGS) \ - $(NO_UNDEFINED_LDFLAGS) \ - $(NULL) -virtlogd_LDADD = \ - libvirt_driver_admin.la \ - libvirt-net-rpc-server.la \ - libvirt-net-rpc.la \ - libvirt_util.la \ - ../gnulib/lib/libgnu.la \ - $(CYGWIN_EXTRA_LIBADD) \ - $(NULL) -if WITH_DTRACE_PROBES -virtlogd_LDADD += libvirt_probes.lo -endif WITH_DTRACE_PROBES else ! WITH_LIBVIRTD EXTRA_DIST += $(LOCK_DAEMON_SOURCES) \ - $(LOCK_DRIVER_LOCKD_SOURCES) \ - $(LOG_DAEMON_SOURCES) + $(LOCK_DRIVER_LOCKD_SOURCES) endif ! WITH_LIBVIRTD SYSCONF_FILES += \ locking/virtlockd.sysconf \ - logging/virtlogd.sysconf \ $(NULL) EXTRA_DIST += \ @@ -1284,7 +1207,6 @@ uninstall-sysconfig: SYSVINIT_FILES_IN += \ locking/virtlockd.init.in \ - logging/virtlogd.init.in \ $(NULL) SYSVINIT_FILES = $(notdir $(SYSVINIT_FILES_IN:%.in=%)) @@ -1351,15 +1273,6 @@ virtlockd.init: locking/virtlockd.init.in $(top_builddir)/config.status chmod a+x $@-t && \ mv $@-t $@ -virtlogd.init: logging/virtlogd.init.in $(top_builddir)/config.status - $(AM_V_GEN)sed \ - -e 's|[@]localstatedir[@]|$(localstatedir)|g' \ - -e 's|[@]sbindir[@]|$(sbindir)|g' \ - -e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \ - < $< > $@-t && \ - chmod a+x $@-t && \ - mv $@-t $@ - virtlockd.8.in: locking/virtlockd.pod $(AM_V_GEN)$(POD2MAN) --section=8 $< $@-t1 && \ if grep 'POD ERROR' $@-t1; then rm $@-t1; exit 1; fi && \ @@ -1370,15 +1283,6 @@ virtlockd.8.in: locking/virtlockd.pod rm -f $@-t1 && \ mv $@-t2 $@ -virtlogd.8.in: logging/virtlogd.pod - $(AM_V_GEN)$(POD2MAN) --section=8 $< $@-t1 && \ - if grep 'POD ERROR' $@-t1; then rm $@-t1; exit 1; fi && \ - sed \ - -e 's|SYSCONFDIR|\@sysconfdir\@|g' \ - -e 's|LOCALSTATEDIR|\@localstatedir\@|g' \ - < $@-t1 > $@-t2 && \ - rm -f $@-t1 && \ - mv $@-t2 $@ %.8: %.8.in $(top_srcdir)/configure.ac $(AM_V_GEN)sed \ @@ -1388,34 +1292,29 @@ virtlogd.8.in: logging/virtlogd.pod mv $@-t $@ if WITH_LIBVIRTD -man8_MANS += virtlockd.8 virtlogd.8 +man8_MANS += virtlockd.8 -conf_DATA += locking/virtlockd.conf logging/virtlogd.conf +conf_DATA += locking/virtlockd.conf -augeas_DATA += locking/virtlockd.aug logging/virtlogd.aug -augeastest_DATA += test_virtlockd.aug test_virtlogd.aug +augeas_DATA += locking/virtlockd.aug +augeastest_DATA += test_virtlockd.aug endif WITH_LIBVIRTD 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) +CLEANFILES += test_virtlockd.aug $(man8_MANS) MAINTAINERCLEANFILES += $(MANINFILES) SYSTEMD_UNIT_FILES_IN += \ locking/virtlockd.service.in \ locking/virtlockd.socket.in \ locking/virtlockd-admin.socket.in \ - logging/virtlogd.service.in \ - logging/virtlogd.socket.in \ - logging/virtlogd-admin.socket.in \ $(NULL) EXTRA_DIST += \ @@ -1423,9 +1322,6 @@ EXTRA_DIST += \ locking/virtlockd.aug \ locking/virtlockd.conf \ locking/test_virtlockd.aug.in \ - logging/virtlogd.aug \ - logging/virtlogd.conf \ - logging/test_virtlogd.aug.in \ $(PODFILES) \ $(MANINFILES) \ $(NULL) @@ -1478,24 +1374,6 @@ virtlockd-admin.socket: locking/virtlockd-admin.socket.in \ < $< > $@-t && \ mv $@-t $@ -virtlogd.service: logging/virtlogd.service.in $(top_builddir)/config.status - $(AM_V_GEN)sed \ - -e 's|[@]sbindir[@]|$(sbindir)|g' \ - < $< > $@-t && \ - mv $@-t $@ - -virtlogd.socket: logging/virtlogd.socket.in $(top_builddir)/config.status - $(AM_V_GEN)sed \ - -e 's|[@]localstatedir[@]|$(localstatedir)|g' \ - < $< > $@-t && \ - mv $@-t $@ - -virtlogd-admin.socket: logging/virtlogd-admin.socket.in \ - $(top_builddir)/config.status - $(AM_V_GEN)sed \ - -e 's|[@]localstatedir[@]|$(localstatedir)|g' \ - < $< > $@-t && \ - mv $@-t $@ EXTRA_DIST += $(UPSTART_FILES) diff --git a/src/logging/Makefile.inc.am b/src/logging/Makefile.inc.am new file mode 100644 index 0000000000..ae022ade0b --- /dev/null +++ b/src/logging/Makefile.inc.am @@ -0,0 +1,155 @@ +LOG_PROTOCOL_GENERATED = \ + logging/log_protocol.h \ + logging/log_protocol.c \ + $(NULL) + +LOG_DAEMON_GENERATED = \ + logging/log_daemon_dispatch_stubs.h + $(NULL) + +DRIVER_SOURCES += \ + $(LOG_PROTOCOL_GENERATED) \ + logging/log_manager.c \ + logging/log_manager.h \ + $(NULL) + +LOG_DAEMON_SOURCES = \ + logging/log_daemon.h \ + logging/log_daemon.c \ + logging/log_daemon_config.h \ + logging/log_daemon_config.c \ + logging/log_daemon_dispatch.c \ + logging/log_daemon_dispatch.h \ + logging/log_handler.c \ + logging/log_handler.h \ + $(NULL) + +LOG_PROTOCOL = $(srcdir)/logging/log_protocol.x + +SYSVINIT_FILES_IN += logging/virtlogd.init.in + +EXTRA_DIST += \ + $(LOG_PROTOCOL) \ + $(LOG_PROTOCOL_GENERATED) \ + $(LOG_DAEMON_GENERATED) \ + $(LOG_DAEMON_SOURCES) \ + logging/virtlogd.aug \ + logging/virtlogd.conf \ + logging/test_virtlogd.aug.in \ + $(NULL) +BUILT_SOURCES += \ + $(LOG_PROTOCOL_GENERATED) \ + $(LOG_DAEMON_GENERATED) \ + $(NULL) +MAINTAINERCLEANFILES += \ + $(LOG_PROTOCOL_GENERATED) \ + $(LOG_DAEMON_GENERATED) \ + $(NULL) + +CLEANFILES += test_virtlogd.aug + +PODFILES += logging/virtlogd.pod +MANINFILES += virtlogd.8.in +SYSCONF_FILES += logging/virtlogd.sysconf + +SYSTEMD_UNIT_FILES_IN += \ + logging/virtlogd.service.in \ + logging/virtlogd.socket.in \ + logging/virtlogd-admin.socket.in \ + $(NULL) + +if WITH_LIBVIRTD +sbin_PROGRAMS += virtlogd + +man8_MANS += virtlogd.8 + +virtlogd_SOURCES = \ + $(LOG_DAEMON_SOURCES) \ + $(LOG_PROTOCOL_GENERATED) \ + $(LOG_DAEMON_GENERATED) \ + $(NULL) +virtlogd_CFLAGS = \ + $(AM_CFLAGS) \ + $(PIE_CFLAGS) \ + $(XDR_CFLAGS) \ + $(NULL) +virtlogd_LDFLAGS = \ + $(AM_LDFLAGS) \ + $(PIE_LDFLAGS) \ + $(NO_UNDEFINED_LDFLAGS) \ + $(NULL) +virtlogd_LDADD = \ + libvirt_driver_admin.la \ + libvirt-net-rpc-server.la \ + libvirt-net-rpc.la \ + libvirt_util.la \ + ../gnulib/lib/libgnu.la \ + $(CYGWIN_EXTRA_LIBADD) \ + $(NULL) +if WITH_DTRACE_PROBES +virtlogd_LDADD += libvirt_probes.lo +endif WITH_DTRACE_PROBES + +conf_DATA += logging/virtlogd.conf + +augeas_DATA += logging/virtlogd.aug +augeastest_DATA += test_virtlogd.aug + +test_virtlogd.aug: logging/test_virtlogd.aug.in \ + logging/virtlogd.conf $(AUG_GENTEST) + $(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/logging/virtlogd.conf $< $@ + +AUGEAS_DIRS += logging + +check-augeas-logging: test_virtlogd.aug + $(AM_V_GEN)if test -x '$(AUGPARSE)'; then \ + '$(AUGPARSE)' -I $(srcdir)/logging test_virtlogd.aug; \ + fi + +endif WITH_LIBVIRTD + +.PHONY: check-augeas-logging + +logging/log_daemon_dispatch_stubs.h: $(LOG_PROTOCOL) \ + $(srcdir)/rpc/gendispatch.pl Makefile.am + $(AM_V_GEN)perl -w $(srcdir)/rpc/gendispatch.pl --mode=server \ + virLogManagerProtocol VIR_LOG_MANAGER_PROTOCOL \ + $(LOG_PROTOCOL) > $(srcdir)/logging/log_daemon_dispatch_stubs.h + +virtlogd.init: logging/virtlogd.init.in $(top_builddir)/config.status + $(AM_V_GEN)sed \ + -e 's|[@]localstatedir[@]|$(localstatedir)|g' \ + -e 's|[@]sbindir[@]|$(sbindir)|g' \ + -e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \ + < $< > $@-t && \ + chmod a+x $@-t && \ + mv $@-t $@ + +virtlogd.8.in: logging/virtlogd.pod + $(AM_V_GEN)$(POD2MAN) --section=8 $< $@-t1 && \ + if grep 'POD ERROR' $@-t1; then rm $@-t1; exit 1; fi && \ + sed \ + -e 's|SYSCONFDIR|\@sysconfdir\@|g' \ + -e 's|LOCALSTATEDIR|\@localstatedir\@|g' \ + < $@-t1 > $@-t2 && \ + rm -f $@-t1 && \ + mv $@-t2 $@ + +virtlogd.service: logging/virtlogd.service.in $(top_builddir)/config.status + $(AM_V_GEN)sed \ + -e 's|[@]sbindir[@]|$(sbindir)|g' \ + < $< > $@-t && \ + mv $@-t $@ + +virtlogd.socket: logging/virtlogd.socket.in $(top_builddir)/config.status + $(AM_V_GEN)sed \ + -e 's|[@]localstatedir[@]|$(localstatedir)|g' \ + < $< > $@-t && \ + mv $@-t $@ + +virtlogd-admin.socket: logging/virtlogd-admin.socket.in \ + $(top_builddir)/config.status + $(AM_V_GEN)sed \ + -e 's|[@]localstatedir[@]|$(localstatedir)|g' \ + < $< > $@-t && \ + mv $@-t $@ -- 2.14.3

Daniel P. Berrangé

4:14 a.m.

New subject: [libvirt] [PATCH 13/17] make: split lock daemon build rules into locking/Makefile.inc.am

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/Makefile.am | 316 +------------------------------------------ src/locking/Makefile.inc.am | 321 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 325 insertions(+), 312 deletions(-) create mode 100644 src/locking/Makefile.inc.am diff --git a/src/Makefile.am b/src/Makefile.am index c59faf9aeb..a45f9df894 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -97,6 +97,7 @@ include cpu/Makefile.inc.am include security/Makefile.inc.am include access/Makefile.inc.am include logging/Makefile.inc.am +include locking/Makefile.inc.am include uml/Makefile.inc.am include phyp/Makefile.inc.am include test/Makefile.inc.am @@ -353,57 +354,8 @@ DRIVER_SOURCES += \ libvirt-secret.c \ libvirt-storage.c \ libvirt-stream.c \ - locking/lock_manager.c locking/lock_manager.h \ - locking/lock_driver.h \ - locking/lock_driver_nop.h locking/lock_driver_nop.c \ - locking/domain_lock.h locking/domain_lock.c \ $(NULL) -LOCK_DRIVER_SANLOCK_SOURCES = \ - locking/lock_driver_sanlock.c - -LOCK_DRIVER_SANLOCK_HELPER_SOURCES = \ - locking/sanlock_helper.c - -LOCK_PROTOCOL_GENERATED = \ - locking/lock_protocol.h \ - locking/lock_protocol.c \ - $(NULL) - -LOCK_PROTOCOL = $(srcdir)/locking/lock_protocol.x -EXTRA_DIST += $(LOCK_PROTOCOL) \ - $(LOCK_PROTOCOL_GENERATED) -BUILT_SOURCES += $(LOCK_PROTOCOL_GENERATED) -MAINTAINERCLEANFILES += $(LOCK_PROTOCOL_GENERATED) - -LOCK_DAEMON_GENERATED = \ - locking/lock_daemon_dispatch_stubs.h - $(NULL) - -BUILT_SOURCES += $(LOCK_DAEMON_GENERATED) -EXTRA_DIST += $(LOCK_DAEMON_GENERATED) -MAINTAINERCLEANFILES += $(LOCK_DAEMON_GENERATED) - -LOCK_DRIVER_LOCKD_SOURCES = \ - locking/lock_driver_lockd.c \ - locking/lock_driver_lockd.h \ - $(NULL) - -LOCK_DAEMON_SOURCES = \ - locking/lock_daemon.h \ - locking/lock_daemon.c \ - locking/lock_daemon_config.h \ - locking/lock_daemon_config.c \ - locking/lock_daemon_dispatch.c \ - locking/lock_daemon_dispatch.h \ - $(NULL) - -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 - ADMIN_PROTOCOL = $(srcdir)/admin/admin_protocol.x @@ -683,58 +635,12 @@ GENERATED_SYM_FILES += \ check-local: check-augeas -.PHONY: check-augeas \ - check-augeas-sanlock \ - check-augeas-lockd \ - $(NULL) - -check-augeas: $(AUGEAS_DIRS:%=check-augeas-%) \ - check-augeas-sanlock \ - check-augeas-lockd check-augeas-virtlockd +check-augeas: $(AUGEAS_DIRS:%=check-augeas-%) AUG_GENTEST = $(PERL) $(top_srcdir)/build-aux/augeas-gentest.pl EXTRA_DIST += $(top_srcdir)/build-aux/augeas-gentest.pl -if WITH_SANLOCK -test_libvirt_sanlock.aug: locking/test_libvirt_sanlock.aug.in \ - locking/qemu-sanlock.conf $(AUG_GENTEST) - $(AM_V_GEN)$(AUG_GENTEST) locking/qemu-sanlock.conf $< $@ - -check-augeas-sanlock: test_libvirt_sanlock.aug - $(AM_V_GEN)if test -x '$(AUGPARSE)'; then \ - '$(AUGPARSE)' -I $(srcdir)/locking test_libvirt_sanlock.aug; \ - fi -else ! WITH_SANLOCK -check-augeas-sanlock: -endif ! WITH_SANLOCK - -if WITH_QEMU -test_libvirt_lockd.aug: locking/test_libvirt_lockd.aug.in \ - locking/qemu-lockd.conf $(AUG_GENTEST) - $(AM_V_GEN)$(AUG_GENTEST) locking/qemu-lockd.conf $< $@ -else ! WITH_QEMU -test_libvirt_lockd.aug: -endif ! WITH_QEMU - -test_virtlockd.aug: locking/test_virtlockd.aug.in \ - locking/virtlockd.conf $(AUG_GENTEST) - $(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/locking/virtlockd.conf $< $@ - -if WITH_QEMU -check-augeas-lockd: test_libvirt_lockd.aug - $(AM_V_GEN)if test -x '$(AUGPARSE)'; then \ - '$(AUGPARSE)' -I $(srcdir)/locking test_libvirt_lockd.aug; \ - fi -else ! WITH_QEMU -check-augeas-lockd: -endif ! WITH_QEMU - -check-augeas-virtlockd: test_virtlockd.aug - $(AM_V_GEN)if test -x '$(AUGPARSE)'; then \ - '$(AUGPARSE)' -I $(srcdir)/locking test_virtlockd.aug; \ - fi - # # Build our version script. This is composed of three parts: # @@ -974,7 +880,6 @@ RPC_PROBE_FILES += $(srcdir)/rpc/virnetprotocol.x \ $(srcdir)/remote/remote_protocol.x \ $(srcdir)/remote/lxc_protocol.x \ $(srcdir)/remote/qemu_protocol.x \ - $(srcdir)/locking/lock_protocol.x \ $(srcdir)/admin/admin_protocol.x libvirt_functions.stp: $(RPC_PROBE_FILES) $(srcdir)/rpc/gensystemtap.pl @@ -1104,89 +1009,7 @@ libvirt_setuid_rpc_client_la_CFLAGS = \ $(NULL) endif WITH_SETUID_RPC_CLIENT -lockdriverdir = $(libdir)/libvirt/lock-driver -lockdriver_LTLIBRARIES = - -if WITH_LIBVIRTD -lockdriver_LTLIBRARIES += lockd.la -lockd_la_SOURCES = \ - $(LOCK_DRIVER_LOCKD_SOURCES) \ - $(LOCK_PROTOCOL_GENERATED) \ - $(NULL) -lockd_la_CFLAGS = -I$(srcdir)/conf \ - $(XDR_CFLAGS) \ - $(AM_CFLAGS) -lockd_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF) -lockd_la_LIBADD = libvirt.la ../gnulib/lib/libgnu.la -augeas_DATA += locking/libvirt_lockd.aug -if WITH_DTRACE_PROBES -lockd_la_LIBADD += libvirt_probes.lo -endif WITH_DTRACE_PROBES -if WITH_QEMU -augeastest_DATA += test_libvirt_lockd.aug -CLEANFILES += 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 - -locking/%-lockd.conf: $(srcdir)/locking/lockd.conf - $(AM_V_GEN)$(MKDIR_P) locking ; \ - cp $< $@ - - -sbin_PROGRAMS += virtlockd - -virtlockd_SOURCES = \ - $(LOCK_DAEMON_SOURCES) \ - $(LOCK_PROTOCOL_GENERATED) \ - $(LOCK_DAEMON_GENERATED) \ - $(NULL) -virtlockd_CFLAGS = \ - $(AM_CFLAGS) \ - $(PIE_CFLAGS) \ - $(XDR_CFLAGS) \ - $(NULL) -virtlockd_LDFLAGS = \ - $(AM_LDFLAGS) \ - $(PIE_LDFLAGS) \ - $(NO_UNDEFINED_LDFLAGS) \ - $(NULL) -virtlockd_LDADD = \ - libvirt_driver_admin.la \ - libvirt-net-rpc-server.la \ - libvirt-net-rpc.la \ - libvirt_util.la \ - ../gnulib/lib/libgnu.la \ - $(CYGWIN_EXTRA_LIBADD) \ - $(NULL) -if WITH_DTRACE_PROBES -virtlockd_LDADD += libvirt_probes.lo -endif WITH_DTRACE_PROBES - - - -else ! WITH_LIBVIRTD -EXTRA_DIST += $(LOCK_DAEMON_SOURCES) \ - $(LOCK_DRIVER_LOCKD_SOURCES) -endif ! WITH_LIBVIRTD - -SYSCONF_FILES += \ - locking/virtlockd.sysconf \ - $(NULL) - -EXTRA_DIST += \ - locking/lockd.conf \ - locking/libvirt_lockd.aug \ - locking/test_libvirt_lockd.aug.in \ - $(SYSCONF_FILES) \ - $(NULL) +EXTRA_DIST += $(SYSCONF_FILES) install-sysconfig: $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig @@ -1264,26 +1087,6 @@ uninstall-init:: endif ! LIBVIRT_INIT_SCRIPT_RED_HAT -virtlockd.init: locking/virtlockd.init.in $(top_builddir)/config.status - $(AM_V_GEN)sed \ - -e 's|[@]localstatedir[@]|$(localstatedir)|g' \ - -e 's|[@]sbindir[@]|$(sbindir)|g' \ - -e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \ - < $< > $@-t && \ - chmod a+x $@-t && \ - mv $@-t $@ - -virtlockd.8.in: locking/virtlockd.pod - $(AM_V_GEN)$(POD2MAN) --section=8 $< $@-t1 && \ - if grep 'POD ERROR' $@-t1; then rm $@-t1; exit 1; fi && \ - sed \ - -e 's|SYSCONFDIR|\@sysconfdir\@|g' \ - -e 's|LOCALSTATEDIR|\@localstatedir\@|g' \ - < $@-t1 > $@-t2 && \ - rm -f $@-t1 && \ - mv $@-t2 $@ - - %.8: %.8.in $(top_srcdir)/configure.ac $(AM_V_GEN)sed \ -e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \ @@ -1291,37 +1094,11 @@ virtlockd.8.in: locking/virtlockd.pod < $< > $@-t && \ mv $@-t $@ -if WITH_LIBVIRTD -man8_MANS += virtlockd.8 - -conf_DATA += locking/virtlockd.conf - -augeas_DATA += locking/virtlockd.aug -augeastest_DATA += test_virtlockd.aug -endif WITH_LIBVIRTD - -PODFILES += \ - locking/virtlockd.pod \ - $(NULL) - -MANINFILES += \ - virtlockd.8.in \ - $(NULL) - -CLEANFILES += test_virtlockd.aug $(man8_MANS) +CLEANFILES += $(man8_MANS) MAINTAINERCLEANFILES += $(MANINFILES) -SYSTEMD_UNIT_FILES_IN += \ - locking/virtlockd.service.in \ - locking/virtlockd.socket.in \ - locking/virtlockd-admin.socket.in \ - $(NULL) - EXTRA_DIST += \ $(SYSTEMD_UNIT_FILES_IN) \ - locking/virtlockd.aug \ - locking/virtlockd.conf \ - locking/test_virtlockd.aug.in \ $(PODFILES) \ $(MANINFILES) \ $(NULL) @@ -1355,26 +1132,6 @@ install-systemd: uninstall-systemd: endif ! WITH_LIBVIRTD -virtlockd.service: locking/virtlockd.service.in $(top_builddir)/config.status - $(AM_V_GEN)sed \ - -e 's|[@]sbindir[@]|$(sbindir)|g' \ - < $< > $@-t && \ - mv $@-t $@ - -virtlockd.socket: locking/virtlockd.socket.in $(top_builddir)/config.status - $(AM_V_GEN)sed \ - -e 's|[@]localstatedir[@]|$(localstatedir)|g' \ - < $< > $@-t && \ - mv $@-t $@ - -virtlockd-admin.socket: locking/virtlockd-admin.socket.in \ - $(top_builddir)/config.status - $(AM_V_GEN)sed \ - -e 's|[@]localstatedir[@]|$(localstatedir)|g' \ - < $< > $@-t && \ - mv $@-t $@ - - EXTRA_DIST += $(UPSTART_FILES) @@ -1406,38 +1163,6 @@ install-upstart: uninstall-upstart: endif ! WITH_LIBVIRTD -if WITH_SANLOCK -lockdriver_LTLIBRARIES += sanlock.la -sanlock_la_SOURCES = $(LOCK_DRIVER_SANLOCK_SOURCES) -sanlock_la_CFLAGS = -I$(srcdir)/conf $(AM_CFLAGS) -sanlock_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF) -sanlock_la_LIBADD = -lsanlock_client libvirt.la ../gnulib/lib/libgnu.la - -augeas_DATA += locking/libvirt_sanlock.aug -augeastest_DATA += test_libvirt_sanlock.aug -CLEANFILES += test_libvirt_sanlock.aug - -locking/%-sanlock.conf: $(srcdir)/locking/sanlock.conf - $(AM_V_GEN)$(MKDIR_P) locking ; \ - cp $< $@ - -if WITH_QEMU -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 -else ! WITH_SANLOCK -EXTRA_DIST += $(LOCK_DRIVER_SANLOCK_SOURCES) -endif ! WITH_SANLOCK -EXTRA_DIST += locking/sanlock.conf \ - locking/libvirt_sanlock.aug \ - locking/test_libvirt_sanlock.aug.in noinst_LTLIBRARIES += \ libvirt-net-rpc.la \ @@ -1570,23 +1295,6 @@ libvirt_iohelper_CFLAGS = \ endif WITH_LIBVIRTD -if WITH_SANLOCK -libexec_PROGRAMS += libvirt_sanlock_helper - -libvirt_sanlock_helper_SOURCES = $(LOCK_DRIVER_SANLOCK_HELPER_SOURCES) -libvirt_sanlock_helper_CFLAGS = \ - -I$(srcdir)/conf \ - $(AM_CFLAGS) \ - $(PIE_CFLAGS) \ - $(NULL) -libvirt_sanlock_helper_LDFLAGS = \ - $(AM_LDFLAGS) \ - $(PIE_LDFLAGS) \ - $(NULL) -libvirt_sanlock_helper_LDADD = libvirt.la -endif WITH_SANLOCK - - if WITH_NSS noinst_LTLIBRARIES += libvirt-nss.la @@ -1660,34 +1368,18 @@ endif WITH_NSS install-data-local: install-init install-systemd install-upstart \ install-sysctl install-polkit install-sasl \ install-logrotate $(INSTALL_DATA_DIRS:%=install-data-%) -if WITH_LIBVIRTD - $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/lockd" - $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/lockd/files" - $(MKDIR_P) "$(DESTDIR)$(localstatedir)/run/libvirt/lockd" -endif WITH_LIBVIRTD $(MKDIR_P) "$(DESTDIR)$(localstatedir)/cache/libvirt" $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/images" $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/filesystems" $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/boot" -if WITH_SANLOCK - $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/sanlock" -endif WITH_SANLOCK uninstall-local:: uninstall-init uninstall-systemd uninstall-upstart \ uninstall-sysctl uninstall-polkit uninstall-sasl \ uninstall-logrotate $(INSTALL_DATA_DIRS:%=uninstall-data-%) -if WITH_LIBVIRTD - rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/lockd/files" ||: - rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/lockd" ||: - rmdir "$(DESTDIR)$(localstatedir)/run/libvirt/lockd" ||: -endif WITH_LIBVIRTD rmdir "$(DESTDIR)$(localstatedir)/cache/libvirt" ||: rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/images" ||: rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/filesystems" ||: rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/boot" ||: -if WITH_SANLOCK - rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/sanlock" ||: -endif WITH_SANLOCK rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt" ||: CLEANFILES += *.gcov .libs/*.gcda .libs/*.gcno *.gcno *.gcda *.i *.s diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am new file mode 100644 index 0000000000..649c769e00 --- /dev/null +++ b/src/locking/Makefile.inc.am @@ -0,0 +1,321 @@ +DRIVER_SOURCES += \ + locking/lock_manager.c \ + locking/lock_manager.h \ + locking/lock_driver.h \ + locking/lock_driver_nop.h \ + locking/lock_driver_nop.c \ + locking/domain_lock.h \ + locking/domain_lock.c \ + $(NULL) + +LOCK_DRIVER_SANLOCK_SOURCES = \ + locking/lock_driver_sanlock.c + +LOCK_DRIVER_SANLOCK_HELPER_SOURCES = \ + locking/sanlock_helper.c + +LOCK_PROTOCOL_GENERATED = \ + locking/lock_protocol.h \ + locking/lock_protocol.c \ + $(NULL) + +LOCK_DAEMON_GENERATED = \ + locking/lock_daemon_dispatch_stubs.h + $(NULL) + +LOCK_PROTOCOL = $(srcdir)/locking/lock_protocol.x + +LOCK_DRIVER_LOCKD_SOURCES = \ + locking/lock_driver_lockd.c \ + locking/lock_driver_lockd.h \ + $(NULL) + +LOCK_DAEMON_SOURCES = \ + locking/lock_daemon.h \ + locking/lock_daemon.c \ + locking/lock_daemon_config.h \ + locking/lock_daemon_config.c \ + locking/lock_daemon_dispatch.c \ + locking/lock_daemon_dispatch.h \ + $(NULL) + +EXTRA_DIST += \ + $(LOCK_PROTOCOL) \ + $(LOCK_PROTOCOL_GENERATED) \ + $(LOCK_DAEMON_GENERATED) \ + $(LOCK_DAEMON_SOURCES) \ + $(LOCK_DRIVER_LOCKD_SOURCES) \ + locking/sanlock.conf \ + locking/libvirt_sanlock.aug \ + locking/test_libvirt_sanlock.aug.in \ + locking/lockd.conf \ + locking/libvirt_lockd.aug \ + locking/test_libvirt_lockd.aug.in \ + locking/virtlockd.aug \ + locking/virtlockd.conf \ + locking/test_virtlockd.aug.in \ + $(NULL) + +BUILT_SOURCES += \ + $(LOCK_PROTOCOL_GENERATED) \ + $(LOCK_DAEMON_GENERATED) \ + $(NULL) + +MAINTAINERCLEANFILES += \ + $(LOCK_PROTOCOL_GENERATED) \ + $(LOCK_DAEMON_GENERATED) \ + $(NULL) + +RPC_PROBE_FILES += $(srcdir)/locking/lock_protocol.x +SYSCONF_FILES += locking/virtlockd.sysconf + +PODFILES += locking/virtlockd.pod +MANINFILES += virtlockd.8.in + +CLEANFILES += test_virtlockd.aug $(man8_MANS) +MAINTAINERCLEANFILES += $(MANINFILES) + +SYSTEMD_UNIT_FILES_IN += \ + locking/virtlockd.service.in \ + locking/virtlockd.socket.in \ + locking/virtlockd-admin.socket.in \ + $(NULL) + +lockdriverdir = $(libdir)/libvirt/lock-driver +lockdriver_LTLIBRARIES = + +if WITH_LIBVIRTD +lockdriver_LTLIBRARIES += lockd.la +lockd_la_SOURCES = \ + $(LOCK_DRIVER_LOCKD_SOURCES) \ + $(LOCK_PROTOCOL_GENERATED) \ + $(NULL) +lockd_la_CFLAGS = \ + -I$(srcdir)/conf \ + $(XDR_CFLAGS) \ + $(AM_CFLAGS) \ + $(NULL) +lockd_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF) +lockd_la_LIBADD = \ + libvirt.la \ + ../gnulib/lib/libgnu.la \ + $(NULL) +augeas_DATA += locking/libvirt_lockd.aug +if WITH_DTRACE_PROBES +lockd_la_LIBADD += libvirt_probes.lo +endif WITH_DTRACE_PROBES + +if WITH_QEMU +augeastest_DATA += test_libvirt_lockd.aug +CLEANFILES += 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 + +virtlockd_SOURCES = \ + $(LOCK_DAEMON_SOURCES) \ + $(LOCK_PROTOCOL_GENERATED) \ + $(LOCK_DAEMON_GENERATED) \ + $(NULL) +virtlockd_CFLAGS = \ + $(AM_CFLAGS) \ + $(PIE_CFLAGS) \ + $(XDR_CFLAGS) \ + $(NULL) +virtlockd_LDFLAGS = \ + $(AM_LDFLAGS) \ + $(PIE_LDFLAGS) \ + $(NO_UNDEFINED_LDFLAGS) \ + $(NULL) +virtlockd_LDADD = \ + libvirt_driver_admin.la \ + libvirt-net-rpc-server.la \ + libvirt-net-rpc.la \ + libvirt_util.la \ + ../gnulib/lib/libgnu.la \ + $(CYGWIN_EXTRA_LIBADD) \ + $(NULL) +if WITH_DTRACE_PROBES +virtlockd_LDADD += libvirt_probes.lo +endif WITH_DTRACE_PROBES + +if WITH_SANLOCK +lockdriver_LTLIBRARIES += sanlock.la +sanlock_la_SOURCES = $(LOCK_DRIVER_SANLOCK_SOURCES) +sanlock_la_CFLAGS = -I$(srcdir)/conf $(AM_CFLAGS) +sanlock_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF) +sanlock_la_LIBADD = -lsanlock_client libvirt.la ../gnulib/lib/libgnu.la + +augeas_DATA += locking/libvirt_sanlock.aug +augeastest_DATA += test_libvirt_sanlock.aug +CLEANFILES += test_libvirt_sanlock.aug + +if WITH_QEMU +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 + +libvirt_sanlock_helper_SOURCES = $(LOCK_DRIVER_SANLOCK_HELPER_SOURCES) +libvirt_sanlock_helper_CFLAGS = \ + -I$(srcdir)/conf \ + $(AM_CFLAGS) \ + $(PIE_CFLAGS) \ + $(NULL) +libvirt_sanlock_helper_LDFLAGS = \ + $(AM_LDFLAGS) \ + $(PIE_LDFLAGS) \ + $(NULL) +libvirt_sanlock_helper_LDADD = libvirt.la +endif WITH_SANLOCK + +man8_MANS += virtlockd.8 + +conf_DATA += locking/virtlockd.conf + +augeas_DATA += locking/virtlockd.aug +augeastest_DATA += test_virtlockd.aug + + +INSTALL_DATA_DIRS += locking + +install-data-locking: + $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/lockd" + $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/lockd/files" + $(MKDIR_P) "$(DESTDIR)$(localstatedir)/run/libvirt/lockd" +if WITH_SANLOCK + $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/sanlock" +endif WITH_SANLOCK + +uninstall-data-locking: + rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/lockd/files" ||: + rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/lockd" ||: + rmdir "$(DESTDIR)$(localstatedir)/run/libvirt/lockd" ||: +if WITH_SANLOCK + rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/sanlock" ||: +endif WITH_SANLOCK + +if WITH_SANLOCK +test_libvirt_sanlock.aug: locking/test_libvirt_sanlock.aug.in \ + locking/qemu-sanlock.conf $(AUG_GENTEST) + $(AM_V_GEN)$(AUG_GENTEST) locking/qemu-sanlock.conf $< $@ + +check-augeas-sanlock: test_libvirt_sanlock.aug + $(AM_V_GEN)if test -x '$(AUGPARSE)'; then \ + '$(AUGPARSE)' -I $(srcdir)/locking test_libvirt_sanlock.aug; \ + fi +else ! WITH_SANLOCK +check-augeas-sanlock: +endif ! WITH_SANLOCK + +if WITH_QEMU +test_libvirt_lockd.aug: locking/test_libvirt_lockd.aug.in \ + locking/qemu-lockd.conf $(AUG_GENTEST) + $(AM_V_GEN)$(AUG_GENTEST) locking/qemu-lockd.conf $< $@ +else ! WITH_QEMU +test_libvirt_lockd.aug: +endif ! WITH_QEMU + +test_virtlockd.aug: locking/test_virtlockd.aug.in \ + locking/virtlockd.conf $(AUG_GENTEST) + $(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/locking/virtlockd.conf $< $@ + +if WITH_QEMU +check-augeas-lockd: test_libvirt_lockd.aug + $(AM_V_GEN)if test -x '$(AUGPARSE)'; then \ + '$(AUGPARSE)' -I $(srcdir)/locking test_libvirt_lockd.aug; \ + fi +else ! WITH_QEMU +check-augeas-lockd: +endif ! WITH_QEMU + +check-augeas-virtlockd: test_virtlockd.aug + $(AM_V_GEN)if test -x '$(AUGPARSE)'; then \ + '$(AUGPARSE)' -I $(srcdir)/locking test_virtlockd.aug; \ + fi + +AUGEAS_DIRS += locking + +check-augeas-locking: check-augeas-virtlockd check-augeas-lockd check-augeas-sanlock + +endif WITH_LIBVIRTD + +.PHONY: \ + install-data-locking \ + uninstall-data-locking \ + check-augeas-locking \ + check-augeas-virtlockd \ + check-augeas-lockd \ + check-augeas-sanlock \ + $(NULL) + +locking/%-lockd.conf: $(srcdir)/locking/lockd.conf + $(AM_V_GEN)$(MKDIR_P) locking ; \ + cp $< $@ + +locking/%-sanlock.conf: $(srcdir)/locking/sanlock.conf + $(AM_V_GEN)$(MKDIR_P) locking ; \ + cp $< $@ + + +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 + + +virtlockd.service: locking/virtlockd.service.in $(top_builddir)/config.status + $(AM_V_GEN)sed \ + -e 's|[@]sbindir[@]|$(sbindir)|g' \ + < $< > $@-t && \ + mv $@-t $@ + +virtlockd.socket: locking/virtlockd.socket.in $(top_builddir)/config.status + $(AM_V_GEN)sed \ + -e 's|[@]localstatedir[@]|$(localstatedir)|g' \ + < $< > $@-t && \ + mv $@-t $@ + +virtlockd-admin.socket: locking/virtlockd-admin.socket.in \ + $(top_builddir)/config.status + $(AM_V_GEN)sed \ + -e 's|[@]localstatedir[@]|$(localstatedir)|g' \ + < $< > $@-t && \ + mv $@-t $@ + +virtlockd.init: locking/virtlockd.init.in $(top_builddir)/config.status + $(AM_V_GEN)sed \ + -e 's|[@]localstatedir[@]|$(localstatedir)|g' \ + -e 's|[@]sbindir[@]|$(sbindir)|g' \ + -e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \ + < $< > $@-t && \ + chmod a+x $@-t && \ + mv $@-t $@ + +virtlockd.8.in: locking/virtlockd.pod + $(AM_V_GEN)$(POD2MAN) --section=8 $< $@-t1 && \ + if grep 'POD ERROR' $@-t1; then rm $@-t1; exit 1; fi && \ + sed \ + -e 's|SYSCONFDIR|\@sysconfdir\@|g' \ + -e 's|LOCALSTATEDIR|\@localstatedir\@|g' \ + < $@-t1 > $@-t2 && \ + rm -f $@-t1 && \ + mv $@-t2 $@ -- 2.14.3

Daniel P. Berrangé

4:14 a.m.

New subject: [libvirt] [PATCH 14/17] make: split admin driver build rules into admin/Makefile.inc.am

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/Makefile.am | 50 +---------------------------------------------- src/admin/Makefile.inc.am | 50 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 49 deletions(-) create mode 100644 src/admin/Makefile.inc.am diff --git a/src/Makefile.am b/src/Makefile.am index a45f9df894..b39b846f99 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -98,6 +98,7 @@ include security/Makefile.inc.am include access/Makefile.inc.am include logging/Makefile.inc.am include locking/Makefile.inc.am +include admin/Makefile.inc.am include uml/Makefile.inc.am include phyp/Makefile.inc.am include test/Makefile.inc.am @@ -358,30 +359,6 @@ DRIVER_SOURCES += \ -ADMIN_PROTOCOL = $(srcdir)/admin/admin_protocol.x - -ADMIN_PROTOCOL_GENERATED = \ - admin/admin_protocol.c \ - admin/admin_protocol.h \ - admin/admin_client.h \ - admin/admin_server_dispatch_stubs.h \ - $(NULL) - -admin/admin_client.h: $(srcdir)/rpc/gendispatch.pl \ - $(ADMIN_PROTOCOL) Makefile.am - $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=client \ - admin ADMIN $(ADMIN_PROTOCOL) \ - > $(srcdir)/admin/admin_client.h - -admin/admin_server_dispatch_stubs.h: $(srcdir)/rpc/gendispatch.pl \ - $(ADMIN_PROTOCOL) Makefile.am - $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=server \ - admin ADMIN $(ADMIN_PROTOCOL) \ - > $(srcdir)/admin/admin_server_dispatch_stubs.h - -EXTRA_DIST += $(ADMIN_PROTOCOL) $(ADMIN_PROTOCOL_GENERATED) -BUILT_SOURCES += $(ADMIN_PROTOCOL_GENERATED) -MAINTAINERCLEANFILES += $(ADMIN_PROTOCOL_GENERATED) # Ensure that we don't change the struct or member names or member ordering # in remote_protocol.x The embedded perl below needs a few comments, and @@ -751,31 +728,6 @@ libvirt_admin.syms: libvirt_admin_public.syms $(ADMIN_SYM_FILES) \ mv $@-tmp libvirt_admin.syms -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) -libvirt_driver_admin_la_CFLAGS = \ - $(AM_CFLAGS) \ - $(XDR_CFLAGS) \ - -I$(top_srcdir)/src/util \ - -I$(top_srcdir)/src/admin \ - $(NULL) -libvirt_driver_admin_la_LIBADD = ../gnulib/lib/libgnu.la -libvirt_driver_admin_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS) - -# admin/admin_remote.c is being included in libvirt-admin.c, so we -# need to include it in the dist -EXTRA_DIST += admin/admin_remote.c - lib_LTLIBRARIES += libvirt-admin.la libvirt_admin_la_SOURCES = \ libvirt-admin.c \ diff --git a/src/admin/Makefile.inc.am b/src/admin/Makefile.inc.am new file mode 100644 index 0000000000..55d721f0bf --- /dev/null +++ b/src/admin/Makefile.inc.am @@ -0,0 +1,50 @@ +ADMIN_PROTOCOL = $(srcdir)/admin/admin_protocol.x + +ADMIN_PROTOCOL_GENERATED = \ + admin/admin_protocol.c \ + admin/admin_protocol.h \ + admin/admin_client.h \ + admin/admin_server_dispatch_stubs.h \ + $(NULL) + +EXTRA_DIST += $(ADMIN_PROTOCOL) $(ADMIN_PROTOCOL_GENERATED) +BUILT_SOURCES += $(ADMIN_PROTOCOL_GENERATED) +MAINTAINERCLEANFILES += $(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) +libvirt_driver_admin_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(XDR_CFLAGS) \ + -I$(top_srcdir)/src/util \ + -I$(top_srcdir)/src/admin \ + $(NULL) +libvirt_driver_admin_la_LIBADD = ../gnulib/lib/libgnu.la +libvirt_driver_admin_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS) + +# admin/admin_remote.c is being included in libvirt-admin.c, so we +# need to include it in the dist +EXTRA_DIST += admin/admin_remote.c + + +admin/admin_client.h: $(srcdir)/rpc/gendispatch.pl \ + $(ADMIN_PROTOCOL) Makefile.am + $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=client \ + admin ADMIN $(ADMIN_PROTOCOL) \ + > $(srcdir)/admin/admin_client.h + +admin/admin_server_dispatch_stubs.h: $(srcdir)/rpc/gendispatch.pl \ + $(ADMIN_PROTOCOL) Makefile.am + $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=server \ + admin ADMIN $(ADMIN_PROTOCOL) \ + > $(srcdir)/admin/admin_server_dispatch_stubs.h -- 2.14.3

Daniel P. Berrangé

4:14 a.m.

New subject: [libvirt] [PATCH 15/17] make: split RPC build rules into rpc/Makefile.inc.am

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/Makefile.am | 111 +----------------------------------- src/rpc/Makefile.inc.am | 147 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 149 insertions(+), 109 deletions(-) create mode 100644 src/rpc/Makefile.inc.am diff --git a/src/Makefile.am b/src/Makefile.am index b39b846f99..edc72e9b18 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -99,6 +99,7 @@ include access/Makefile.inc.am include logging/Makefile.inc.am include locking/Makefile.inc.am include admin/Makefile.inc.am +include rpc/Makefile.inc.am include uml/Makefile.inc.am include phyp/Makefile.inc.am include test/Makefile.inc.am @@ -1116,113 +1117,8 @@ uninstall-upstart: endif ! WITH_LIBVIRTD -noinst_LTLIBRARIES += \ - libvirt-net-rpc.la \ - libvirt-net-rpc-server.la \ - libvirt-net-rpc-client.la +EXTRA_DIST += dtrace2systemtap.pl -libvirt_la_BUILT_LIBADD += \ - libvirt-net-rpc.la \ - libvirt-net-rpc-server.la \ - libvirt-net-rpc-client.la - -EXTRA_DIST += \ - dtrace2systemtap.pl \ - rpc/gendispatch.pl \ - rpc/genprotocol.pl \ - rpc/gensystemtap.pl \ - rpc/virnetprotocol.x \ - rpc/virkeepaliveprotocol.x - -VIR_NET_RPC_GENERATED = \ - rpc/virnetprotocol.h \ - rpc/virnetprotocol.c \ - rpc/virkeepaliveprotocol.h \ - rpc/virkeepaliveprotocol.c - -BUILT_SOURCES += $(VIR_NET_RPC_GENERATED) - -libvirt_net_rpc_la_SOURCES = \ - rpc/virnetmessage.h rpc/virnetmessage.c \ - rpc/virnetsocket.h rpc/virnetsocket.c \ - rpc/virkeepalive.h rpc/virkeepalive.c \ - $(VIR_NET_RPC_GENERATED) -if WITH_SSH2 -libvirt_net_rpc_la_SOURCES += \ - rpc/virnetsshsession.h rpc/virnetsshsession.c -else ! WITH_SSH2 -EXTRA_DIST += \ - rpc/virnetsshsession.h rpc/virnetsshsession.c -endif ! WITH_SSH2 -if WITH_GNUTLS -libvirt_net_rpc_la_SOURCES += \ - rpc/virnettlscontext.h rpc/virnettlscontext.c -else ! WITH_GNUTLS -EXTRA_DIST += \ - rpc/virnettlscontext.h rpc/virnettlscontext.c -endif ! WITH_GNUTLS -if WITH_SASL -libvirt_net_rpc_la_SOURCES += \ - rpc/virnetsaslcontext.h rpc/virnetsaslcontext.c -else ! WITH_SASL -EXTRA_DIST += \ - rpc/virnetsaslcontext.h rpc/virnetsaslcontext.c -endif ! WITH_SASL -if WITH_LIBSSH -libvirt_net_rpc_la_SOURCES += \ - rpc/virnetlibsshsession.h rpc/virnetlibsshsession.c -else ! WITH_LIBSSH -EXTRA_DIST += \ - rpc/virnetlibsshsession.h rpc/virnetlibsshsession.c -endif ! WITH_LIBSSH -libvirt_net_rpc_la_CFLAGS = \ - $(GNUTLS_CFLAGS) \ - $(SASL_CFLAGS) \ - $(SSH2_CFLAGS) \ - $(LIBSSH_CFLAGS) \ - $(XDR_CFLAGS) \ - $(AM_CFLAGS) -libvirt_net_rpc_la_LDFLAGS = \ - $(GNUTLS_LIBS) \ - $(SASL_LIBS) \ - $(SSH2_LIBS)\ - $(LIBSSH_LIBS) \ - $(SECDRIVER_LIBS) \ - $(AM_LDFLAGS) \ - $(NULL) -libvirt_net_rpc_la_LIBADD = \ - $(CYGWIN_EXTRA_LIBADD) - -libvirt_net_rpc_server_la_SOURCES = \ - rpc/virnetserverprogram.h rpc/virnetserverprogram.c \ - rpc/virnetserverservice.h rpc/virnetserverservice.c \ - rpc/virnetserverclient.h rpc/virnetserverclient.c \ - rpc/virnetservermdns.h rpc/virnetservermdns.c \ - rpc/virnetdaemon.h rpc/virnetdaemon.c \ - rpc/virnetserver.h rpc/virnetserver.c -libvirt_net_rpc_server_la_CFLAGS = \ - $(AVAHI_CFLAGS) \ - $(DBUS_CFLAGS) \ - $(XDR_CFLAGS) \ - $(AM_CFLAGS) -libvirt_net_rpc_server_la_LDFLAGS = \ - $(AM_LDFLAGS) \ - $(AVAHI_LIBS) \ - $(DBUS_LIBS) \ - $(NULL) -libvirt_net_rpc_server_la_LIBADD = \ - $(CYGWIN_EXTRA_LIBADD) - -libvirt_net_rpc_client_la_SOURCES = \ - rpc/virnetclientprogram.h rpc/virnetclientprogram.c \ - rpc/virnetclientstream.h rpc/virnetclientstream.c \ - rpc/virnetclient.h rpc/virnetclient.c -libvirt_net_rpc_client_la_CFLAGS = \ - $(AM_CFLAGS) \ - $(XDR_CFLAGS) -libvirt_net_rpc_client_la_LDFLAGS = $(AM_LDFLAGS) -libvirt_net_rpc_client_la_LIBADD = \ - $(CYGWIN_EXTRA_LIBADD) if WITH_LIBVIRTD libexec_PROGRAMS += libvirt_iohelper @@ -1336,6 +1232,3 @@ uninstall-local:: uninstall-init uninstall-systemd uninstall-upstart \ CLEANFILES += *.gcov .libs/*.gcda .libs/*.gcno *.gcno *.gcda *.i *.s DISTCLEANFILES += $(GENERATED_SYM_FILES) -MAINTAINERCLEANFILES += \ - $(VIR_NET_RPC_GENERATED) \ - $(NULL) diff --git a/src/rpc/Makefile.inc.am b/src/rpc/Makefile.inc.am new file mode 100644 index 0000000000..14c798d05d --- /dev/null +++ b/src/rpc/Makefile.inc.am @@ -0,0 +1,147 @@ +EXTRA_DIST += \ + rpc/gendispatch.pl \ + rpc/genprotocol.pl \ + rpc/gensystemtap.pl \ + rpc/virnetprotocol.x \ + rpc/virkeepaliveprotocol.x \ + $(NULL) + +VIR_NET_RPC_GENERATED = \ + rpc/virnetprotocol.h \ + rpc/virnetprotocol.c \ + rpc/virkeepaliveprotocol.h \ + rpc/virkeepaliveprotocol.c \ + $(NULL) + +BUILT_SOURCES += $(VIR_NET_RPC_GENERATED) +MAINTAINERCLEANFILES += $(VIR_NET_RPC_GENERATED) + +noinst_LTLIBRARIES += \ + libvirt-net-rpc.la \ + libvirt-net-rpc-server.la \ + libvirt-net-rpc-client.la \ + $(NULL) + +libvirt_la_BUILT_LIBADD += \ + libvirt-net-rpc.la \ + libvirt-net-rpc-server.la \ + libvirt-net-rpc-client.la \ + $(NULL) + +libvirt_net_rpc_la_SOURCES = \ + rpc/virnetmessage.h \ + rpc/virnetmessage.c \ + rpc/virnetsocket.h \ + rpc/virnetsocket.c \ + rpc/virkeepalive.h \ + rpc/virkeepalive.c \ + $(VIR_NET_RPC_GENERATED) \ + $(NULL) + +if WITH_SSH2 +libvirt_net_rpc_la_SOURCES += \ + rpc/virnetsshsession.h \ + rpc/virnetsshsession.c \ + $(NULL) +else ! WITH_SSH2 +EXTRA_DIST += \ + rpc/virnetsshsession.h \ + rpc/virnetsshsession.c \ + $(NULL) +endif ! WITH_SSH2 + +if WITH_GNUTLS +libvirt_net_rpc_la_SOURCES += \ + rpc/virnettlscontext.h \ + rpc/virnettlscontext.c \ + $(NULL) +else ! WITH_GNUTLS +EXTRA_DIST += \ + rpc/virnettlscontext.h \ + rpc/virnettlscontext.c \ + $(NULL) +endif ! WITH_GNUTLS + +if WITH_SASL +libvirt_net_rpc_la_SOURCES += \ + rpc/virnetsaslcontext.h \ + rpc/virnetsaslcontext.c \ + $(NULL) +else ! WITH_SASL +EXTRA_DIST += \ + rpc/virnetsaslcontext.h \ + rpc/virnetsaslcontext.c \ + $(NULL) +endif ! WITH_SASL + +if WITH_LIBSSH +libvirt_net_rpc_la_SOURCES += \ + rpc/virnetlibsshsession.h \ + rpc/virnetlibsshsession.c \ + $(NULL) +else ! WITH_LIBSSH +EXTRA_DIST += \ + rpc/virnetlibsshsession.h \ + rpc/virnetlibsshsession.c \ + $(NULL) +endif ! WITH_LIBSSH + +libvirt_net_rpc_la_CFLAGS = \ + $(GNUTLS_CFLAGS) \ + $(SASL_CFLAGS) \ + $(SSH2_CFLAGS) \ + $(LIBSSH_CFLAGS) \ + $(XDR_CFLAGS) \ + $(AM_CFLAGS) \ + $(NULL) +libvirt_net_rpc_la_LDFLAGS = \ + $(GNUTLS_LIBS) \ + $(SASL_LIBS) \ + $(SSH2_LIBS)\ + $(LIBSSH_LIBS) \ + $(SECDRIVER_LIBS) \ + $(AM_LDFLAGS) \ + $(NULL) +libvirt_net_rpc_la_LIBADD = $(CYGWIN_EXTRA_LIBADD) + +libvirt_net_rpc_server_la_SOURCES = \ + rpc/virnetserverprogram.h \ + rpc/virnetserverprogram.c \ + rpc/virnetserverservice.h \ + rpc/virnetserverservice.c \ + rpc/virnetserverclient.h \ + rpc/virnetserverclient.c \ + rpc/virnetservermdns.h \ + rpc/virnetservermdns.c \ + rpc/virnetdaemon.h \ + rpc/virnetdaemon.c \ + rpc/virnetserver.h \ + rpc/virnetserver.c \ + $(NULL) +libvirt_net_rpc_server_la_CFLAGS = \ + $(AVAHI_CFLAGS) \ + $(DBUS_CFLAGS) \ + $(XDR_CFLAGS) \ + $(AM_CFLAGS) \ + $(NULL) +libvirt_net_rpc_server_la_LDFLAGS = \ + $(AM_LDFLAGS) \ + $(AVAHI_LIBS) \ + $(DBUS_LIBS) \ + $(NULL) +libvirt_net_rpc_server_la_LIBADD = $(CYGWIN_EXTRA_LIBADD) + +libvirt_net_rpc_client_la_SOURCES = \ + rpc/virnetclientprogram.h \ + rpc/virnetclientprogram.c \ + rpc/virnetclientstream.h \ + rpc/virnetclientstream.c \ + rpc/virnetclient.h \ + rpc/virnetclient.c \ + $(NULL) +libvirt_net_rpc_client_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(XDR_CFLAGS) \ + $(NULL) +libvirt_net_rpc_client_la_LDFLAGS = $(AM_LDFLAGS) +libvirt_net_rpc_client_la_LIBADD = $(CYGWIN_EXTRA_LIBADD) -- 2.14.3

Daniel P. Berrangé

4:14 a.m.

New subject: [libvirt] [PATCH 16/17] make: split util build rules into util/Makefile.inc.am

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/Makefile.am | 202 +---------------------------- src/util/Makefile.inc.am | 325 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 327 insertions(+), 200 deletions(-) create mode 100644 src/util/Makefile.inc.am diff --git a/src/Makefile.am b/src/Makefile.am index edc72e9b18..6437cea8ae 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -91,7 +91,9 @@ SYSCONF_FILES = sbin_PROGRAMS = man8_MANS = DRIVER_SOURCES = +man7_MANS = +include util/Makefile.inc.am include conf/Makefile.inc.am include cpu/Makefile.inc.am include security/Makefile.inc.am @@ -150,185 +152,6 @@ augeasdir = $(datadir)/augeas/lenses augeastestdir = $(datadir)/augeas/lenses/tests -# These files are not related to driver APIs. Simply generic -# helper APIs for various purposes -UTIL_SOURCES = \ - util/viralloc.c util/viralloc.h \ - util/virarch.h util/virarch.c \ - util/viratomic.h util/viratomic.c \ - util/viraudit.c util/viraudit.h \ - util/virauth.c util/virauth.h \ - util/virauthconfig.c util/virauthconfig.h \ - util/virbitmap.c util/virbitmap.h \ - util/virbuffer.c util/virbuffer.h \ - util/virperf.c util/virperf.h \ - util/vircgroup.c util/vircgroup.h util/vircgrouppriv.h \ - util/virclosecallbacks.c util/virclosecallbacks.h \ - util/vircommand.c util/vircommand.h util/vircommandpriv.h \ - util/virconf.c util/virconf.h \ - util/vircrypto.c util/vircrypto.h \ - util/virdbus.c util/virdbus.h util/virdbuspriv.h \ - util/virdnsmasq.c util/virdnsmasq.h \ - util/virebtables.c util/virebtables.h \ - util/virendian.h \ - util/virerror.c util/virerror.h \ - util/virevent.c util/virevent.h \ - util/vireventpoll.c util/vireventpoll.h \ - util/virfcp.c util/virfcp.h \ - util/virfdstream.c util/virfdstream.h \ - util/virfile.c util/virfile.h \ - util/virfirewall.c util/virfirewall.h \ - util/virfirewallpriv.h \ - util/virfirmware.c util/virfirmware.h \ - util/virgettext.c util/virgettext.h \ - util/virgic.c util/virgic.h \ - util/virhash.c util/virhash.h \ - util/virhashcode.c util/virhashcode.h \ - util/virhook.c util/virhook.h \ - util/virhostcpu.c util/virhostcpu.h util/virhostcpupriv.h \ - util/virhostdev.c util/virhostdev.h \ - util/virhostmem.c util/virhostmem.h \ - util/viridentity.c util/viridentity.h \ - util/virinitctl.c util/virinitctl.h \ - util/viriptables.c util/viriptables.h \ - util/viriscsi.c util/viriscsi.h \ - util/virjson.c util/virjson.h \ - util/virkeycode.c util/virkeycode.h \ - util/virkeyfile.c util/virkeyfile.h \ - util/virlease.c util/virlease.h \ - util/virlockspace.c util/virlockspace.h \ - util/virlog.c util/virlog.h \ - util/virmacaddr.h util/virmacaddr.c \ - util/virmacmap.h util/virmacmap.c \ - util/virnetdev.h util/virnetdev.c \ - util/virnetdevbandwidth.h util/virnetdevbandwidth.c \ - util/virnetdevbridge.h util/virnetdevbridge.c \ - util/virnetdevip.h util/virnetdevip.c \ - util/virnetdevmacvlan.c util/virnetdevmacvlan.h \ - util/virnetdevmidonet.h util/virnetdevmidonet.c \ - util/virnetdevopenvswitch.h util/virnetdevopenvswitch.c \ - util/virnetdevtap.h util/virnetdevtap.c \ - util/virnetdevveth.h util/virnetdevveth.c \ - util/virnetdevvlan.h util/virnetdevvlan.c \ - util/virnetdevvportprofile.h util/virnetdevvportprofile.c \ - util/virnetlink.c util/virnetlink.h \ - util/virnodesuspend.c util/virnodesuspend.h \ - util/virkmod.c util/virkmod.h \ - util/virnuma.c util/virnuma.h \ - util/virobject.c util/virobject.h \ - util/virpci.c util/virpci.h \ - util/virpidfile.c util/virpidfile.h \ - util/virpolkit.c util/virpolkit.h \ - util/virportallocator.c util/virportallocator.h \ - util/virprobe.h \ - util/virprocess.c util/virprocess.h \ - util/virqemu.c util/virqemu.h \ - util/virrandom.h util/virrandom.c \ - util/virresctrl.h util/virresctrl.c util/virresctrlpriv.h \ - util/virrotatingfile.h util/virrotatingfile.c \ - util/virscsi.c util/virscsi.h \ - util/virscsihost.c util/virscsihost.h \ - util/virscsivhost.c util/virscsivhost.h \ - util/virseclabel.c util/virseclabel.h \ - util/virsecret.c util/virsecret.h \ - util/virsexpr.c util/virsexpr.h \ - util/virsocketaddr.h util/virsocketaddr.c \ - util/virstorageencryption.c util/virstorageencryption.h \ - util/virstoragefile.c util/virstoragefile.h \ - util/virstoragefilebackend.c util/virstoragefilebackend.h \ - util/virstring.h util/virstring.c \ - util/virsysinfo.c util/virsysinfo.h util/virsysinfopriv.h \ - util/virsystemd.c util/virsystemd.h util/virsystemdpriv.h \ - util/virthread.c util/virthread.h \ - util/virthreadjob.c util/virthreadjob.h \ - util/virthreadpool.c util/virthreadpool.h \ - util/virtime.h util/virtime.c \ - util/virtpm.h util/virtpm.c \ - util/virtypedparam.c util/virtypedparam.h \ - util/virusb.c util/virusb.h \ - util/viruri.h util/viruri.c \ - util/virutil.c util/virutil.h \ - util/viruuid.c util/viruuid.h \ - util/virvhba.c util/virvhba.h \ - util/virxdrdefs.h \ - util/virxml.c util/virxml.h \ - util/virmdev.c util/virmdev.h \ - util/virfilecache.c util/virfilecache.h \ - $(NULL) - -EXTRA_DIST += \ - $(srcdir)/keycodemapdb/data/keymaps.csv \ - $(srcdir)/keycodemapdb/tools/keymap-gen \ - $(NULL) - -util/virkeycodetable_%.h: $(srcdir)/keycodemapdb/data/keymaps.csv \ - $(srcdir)/keycodemapdb/tools/keymap-gen Makefile.am - $(AM_V_GEN)export NAME=`echo $@ | sed -e 's,util/virkeycodetable_,,' \ - -e 's,\.h,,'` && \ - $(MKDIR_P) util/ && \ - $(PYTHON) $(srcdir)/keycodemapdb/tools/keymap-gen \ - --lang stdc --varname virKeyCodeTable_$$NAME code-table \ - $(srcdir)/keycodemapdb/data/keymaps.csv $$NAME > $@-tmp && \ - mv $@-tmp $@ || rm -f $@-tmp - -util/virkeynametable_%.h: $(srcdir)/keycodemapdb/data/keymaps.csv \ - $(srcdir)/keycodemapdb/tools/keymap-gen Makefile.am - $(AM_V_GEN)export NAME=`echo $@ | sed -e 's,util/virkeynametable_,,' \ - -e 's,\.h,,'` && \ - $(MKDIR_P) util/ && \ - $(PYTHON) $(srcdir)/keycodemapdb/tools/keymap-gen \ - --lang stdc --varname virKeyNameTable_$$NAME name-table \ - $(srcdir)/keycodemapdb/data/keymaps.csv $$NAME > $@-tmp && \ - mv $@-tmp $@ || rm -f $@-tmp - -util/virkeycode-%.pod: $(srcdir)/keycodemapdb/data/keymaps.csv \ - $(srcdir)/keycodemapdb/tools/keymap-gen Makefile.am - $(AM_V_GEN)export NAME=`echo $@ | sed -e 's,util/virkeycode-,,' \ - -e 's,\.pod,,'` && \ - $(MKDIR_P) util/ && \ - $(PYTHON) $(srcdir)/keycodemapdb/tools/keymap-gen \ - --lang pod --varname "Key code values for $$NAME" code-docs \ - $(srcdir)/keycodemapdb/data/keymaps.csv $$NAME > \ - $@-tmp && mv $@-tmp $@ || rm $@-tmp - -util/virkeyname-%.pod: $(srcdir)/keycodemapdb/data/keymaps.csv \ - $(srcdir)/keycodemapdb/tools/keymap-gen Makefile.am - $(AM_V_GEN)export NAME=`echo $@ | sed -e 's,util/virkeyname-,,' \ - -e 's,\.pod,,'` && \ - $(MKDIR_P) util/ && \ - $(PYTHON) $(srcdir)/keycodemapdb/tools/keymap-gen \ - --lang pod --varname "Key name values for $$NAME" name-docs \ - $(srcdir)/keycodemapdb/data/keymaps.csv $$NAME > \ - $@-tmp && mv $@-tmp $@ || rm $@-tmp - -util/virkey%.7: util/virkey%.pod - $(AM_V_GEN)$(POD2MAN) --section=7 $< $@-t1 && \ - if grep 'POD ERROR' $@-t1; then rm $@-t1; exit 1; fi && \ - sed \ - -e 's|SYSCONFDIR|\@sysconfdir\@|g' \ - -e 's|LOCALSTATEDIR|\@localstatedir\@|g' \ - < $@-t1 > $@-t2 && \ - rm -f $@-t1 && \ - mv $@-t2 $@ - -KEYCODES = linux osx atset1 atset2 atset3 xtkbd usb win32 rfb -KEYNAMES = linux osx win32 - -KEYTABLES = \ - $(KEYCODES:%=util/virkeycodetable_%.h) \ - $(KEYNAMES:%=util/virkeynametable_%.h) \ - $(NULL) - -KEYPODS = $(KEYCODES:%=util/virkeycode-%.pod) \ - $(KEYNAMES:%=util/virkeyname-%.pod) -KEYMANS = $(KEYPODS:%.pod=%.7) - -man7_MANS = $(KEYMANS) - -UTIL_SOURCES += $(KEYTABLES) -BUILT_SOURCES += $(KEYTABLES) -MAINTAINERCLEANFILES += $(KEYTABLES) -CLEANFILES += $(KEYMANS) $(KEYPODS) # Internal generic driver infrastructure DATATYPES_SOURCES = datatypes.h datatypes.c @@ -531,12 +354,6 @@ check-local: check-protocol check-symfile check-symsorting \ - -UTIL_IO_HELPER_SOURCES = \ - util/iohelper.c - - - VMX_SOURCES = \ vmx/vmx.c vmx/vmx.h @@ -551,21 +368,6 @@ EXTRA_DIST += $(pkgdata_DATA) # # First deal with sources usable in non-daemon context -noinst_LTLIBRARIES += libvirt_util.la -libvirt_la_LIBADD = $(libvirt_la_BUILT_LIBADD) -libvirt_la_BUILT_LIBADD += libvirt_util.la -libvirt_util_la_SOURCES = \ - $(UTIL_SOURCES) -libvirt_util_la_CFLAGS = $(CAPNG_CFLAGS) $(YAJL_CFLAGS) $(LIBNL_CFLAGS) \ - $(AM_CFLAGS) $(AUDIT_CFLAGS) $(DEVMAPPER_CFLAGS) \ - $(DBUS_CFLAGS) $(LDEXP_LIBM) $(NUMACTL_CFLAGS) \ - $(POLKIT_CFLAGS) $(GNUTLS_CFLAGS) $(ACL_CFLAGS) -libvirt_util_la_LIBADD = $(CAPNG_LIBS) $(YAJL_LIBS) $(LIBNL_LIBS) \ - $(THREAD_LIBS) $(AUDIT_LIBS) $(DEVMAPPER_LIBS) \ - $(LIB_CLOCK_GETTIME) $(DBUS_LIBS) $(WIN32_EXTRA_LIBS) $(LIBXML_LIBS) \ - $(SECDRIVER_LIBS) $(NUMACTL_LIBS) $(ACL_LIBS) \ - $(POLKIT_LIBS) $(GNUTLS_LIBS) - if WITH_VMX noinst_LTLIBRARIES += libvirt_vmx.la diff --git a/src/util/Makefile.inc.am b/src/util/Makefile.inc.am new file mode 100644 index 0000000000..a91b30dca5 --- /dev/null +++ b/src/util/Makefile.inc.am @@ -0,0 +1,325 @@ +# These files are not related to driver APIs. Simply generic +# helper APIs for various purposes +UTIL_SOURCES = \ + util/viralloc.c \ + util/viralloc.h \ + util/virarch.c \ + util/virarch.h \ + util/viratomic.c \ + util/viratomic.h \ + util/viraudit.c \ + util/viraudit.h \ + util/virauth.c \ + util/virauth.h \ + util/virauthconfig.c \ + util/virauthconfig.h \ + util/virbitmap.c \ + util/virbitmap.h \ + util/virbuffer.c \ + util/virbuffer.h \ + util/virperf.c \ + util/virperf.h \ + util/vircgroup.c \ + util/vircgroup.h util/vircgrouppriv.h \ + util/virclosecallbacks.c \ + util/virclosecallbacks.h \ + util/vircommand.c \ + util/vircommand.h \ + util/vircommandpriv.h \ + util/virconf.c \ + util/virconf.h \ + util/vircrypto.c \ + util/vircrypto.h \ + util/virdbus.c \ + util/virdbus.h \ + util/virdbuspriv.h \ + util/virdnsmasq.c \ + util/virdnsmasq.h \ + util/virebtables.c \ + util/virebtables.h \ + util/virendian.h \ + util/virerror.c \ + util/virerror.h \ + util/virevent.c \ + util/virevent.h \ + util/vireventpoll.c \ + util/vireventpoll.h \ + util/virfcp.c \ + util/virfcp.h \ + util/virfdstream.c \ + util/virfdstream.h \ + util/virfile.c \ + util/virfile.h \ + util/virfirewall.c \ + util/virfirewall.h \ + util/virfirewallpriv.h \ + util/virfirmware.c \ + util/virfirmware.h \ + util/virgettext.c \ + util/virgettext.h \ + util/virgic.c \ + util/virgic.h \ + util/virhash.c \ + util/virhash.h \ + util/virhashcode.c \ + util/virhashcode.h \ + util/virhook.c \ + util/virhook.h \ + util/virhostcpu.c \ + util/virhostcpu.h \ + util/virhostcpupriv.h \ + util/virhostdev.c \ + util/virhostdev.h \ + util/virhostmem.c \ + util/virhostmem.h \ + util/viridentity.c \ + util/viridentity.h \ + util/virinitctl.c \ + util/virinitctl.h \ + util/viriptables.c \ + util/viriptables.h \ + util/viriscsi.c \ + util/viriscsi.h \ + util/virjson.c \ + util/virjson.h \ + util/virkeycode.c \ + util/virkeycode.h \ + util/virkeyfile.c \ + util/virkeyfile.h \ + util/virlease.c \ + util/virlease.h \ + util/virlockspace.c \ + util/virlockspace.h \ + util/virlog.c \ + util/virlog.h \ + util/virmacaddr.c \ + util/virmacaddr.h \ + util/virmacmap.c \ + util/virmacmap.h \ + util/virnetdev.c \ + util/virnetdev.h \ + util/virnetdevbandwidth.c \ + util/virnetdevbandwidth.h \ + util/virnetdevbridge.c \ + util/virnetdevbridge.h \ + util/virnetdevip.c \ + util/virnetdevip.h \ + util/virnetdevmacvlan.c \ + util/virnetdevmacvlan.h \ + util/virnetdevmidonet.c \ + util/virnetdevmidonet.h \ + util/virnetdevopenvswitch.c \ + util/virnetdevopenvswitch.h \ + util/virnetdevtap.c \ + util/virnetdevtap.h \ + util/virnetdevveth.c \ + util/virnetdevveth.h \ + util/virnetdevvlan.c \ + util/virnetdevvlan.h \ + util/virnetdevvportprofile.c \ + util/virnetdevvportprofile.h \ + util/virnetlink.c \ + util/virnetlink.h \ + util/virnodesuspend.c \ + util/virnodesuspend.h \ + util/virkmod.c \ + util/virkmod.h \ + util/virnuma.c \ + util/virnuma.h \ + util/virobject.c \ + util/virobject.h \ + util/virpci.c \ + util/virpci.h \ + util/virpidfile.c \ + util/virpidfile.h \ + util/virpolkit.c \ + util/virpolkit.h \ + util/virportallocator.c \ + util/virportallocator.h \ + util/virprobe.h \ + util/virprocess.c \ + util/virprocess.h \ + util/virqemu.c \ + util/virqemu.h \ + util/virrandom.c \ + util/virrandom.h \ + util/virresctrl.c \ + util/virresctrl.h \ + util/virresctrlpriv.h \ + util/virrotatingfile.c \ + util/virrotatingfile.h \ + util/virscsi.c \ + util/virscsi.h \ + util/virscsihost.c \ + util/virscsihost.h \ + util/virscsivhost.c \ + util/virscsivhost.h \ + util/virseclabel.c \ + util/virseclabel.h \ + util/virsecret.c \ + util/virsecret.h \ + util/virsexpr.c \ + util/virsexpr.h \ + util/virsocketaddr.c \ + util/virsocketaddr.h \ + util/virstorageencryption.c \ + util/virstorageencryption.h \ + util/virstoragefile.c \ + util/virstoragefile.h \ + util/virstoragefilebackend.c \ + util/virstoragefilebackend.h \ + util/virstring.c \ + util/virstring.h \ + util/virsysinfo.c \ + util/virsysinfo.h \ + util/virsysinfopriv.h \ + util/virsystemd.c \ + util/virsystemd.h \ + util/virsystemdpriv.h \ + util/virthread.c \ + util/virthread.h \ + util/virthreadjob.c \ + util/virthreadjob.h \ + util/virthreadpool.c \ + util/virthreadpool.h \ + util/virtime.c \ + util/virtime.h \ + util/virtpm.c \ + util/virtpm.h \ + util/virtypedparam.c \ + util/virtypedparam.h \ + util/virusb.c \ + util/virusb.h \ + util/viruri.c \ + util/viruri.h \ + util/virutil.c \ + util/virutil.h \ + util/viruuid.c \ + util/viruuid.h \ + util/virvhba.c \ + util/virvhba.h \ + util/virxdrdefs.h \ + util/virxml.c \ + util/virxml.h \ + util/virmdev.c \ + util/virmdev.h \ + util/virfilecache.c \ + util/virfilecache.h \ + $(NULL) + + +EXTRA_DIST += \ + $(srcdir)/keycodemapdb/data/keymaps.csv \ + $(srcdir)/keycodemapdb/tools/keymap-gen \ + $(NULL) + + +KEYCODES = linux osx atset1 atset2 atset3 xtkbd usb win32 rfb +KEYNAMES = linux osx win32 + +KEYTABLES = \ + $(KEYCODES:%=util/virkeycodetable_%.h) \ + $(KEYNAMES:%=util/virkeynametable_%.h) \ + $(NULL) + +KEYPODS = $(KEYCODES:%=util/virkeycode-%.pod) \ + $(KEYNAMES:%=util/virkeyname-%.pod) +KEYMANS = $(KEYPODS:%.pod=%.7) + +man7_MANS += $(KEYMANS) + +UTIL_SOURCES += $(KEYTABLES) +BUILT_SOURCES += $(KEYTABLES) +MAINTAINERCLEANFILES += $(KEYTABLES) +CLEANFILES += $(KEYMANS) $(KEYPODS) + +UTIL_IO_HELPER_SOURCES = util/iohelper.c + +noinst_LTLIBRARIES += libvirt_util.la +libvirt_la_LIBADD = $(libvirt_la_BUILT_LIBADD) +libvirt_la_BUILT_LIBADD += libvirt_util.la +libvirt_util_la_SOURCES = \ + $(UTIL_SOURCES) \ + $(NULL) +libvirt_util_la_CFLAGS = \ + $(CAPNG_CFLAGS) \ + $(YAJL_CFLAGS) \ + $(LIBNL_CFLAGS) \ + $(AM_CFLAGS) \ + $(AUDIT_CFLAGS) \ + $(DEVMAPPER_CFLAGS) \ + $(DBUS_CFLAGS) \ + $(LDEXP_LIBM) \ + $(NUMACTL_CFLAGS) \ + $(POLKIT_CFLAGS) \ + $(GNUTLS_CFLAGS) \ + $(ACL_CFLAGS) \ + $(NULL) +libvirt_util_la_LIBADD = \ + $(CAPNG_LIBS) \ + $(YAJL_LIBS) \ + $(LIBNL_LIBS) \ + $(THREAD_LIBS) \ + $(AUDIT_LIBS) \ + $(DEVMAPPER_LIBS) \ + $(LIB_CLOCK_GETTIME) \ + $(DBUS_LIBS) \ + $(WIN32_EXTRA_LIBS) \ + $(LIBXML_LIBS) \ + $(SECDRIVER_LIBS) \ + $(NUMACTL_LIBS) \ + $(ACL_LIBS) \ + $(POLKIT_LIBS) \ + $(GNUTLS_LIBS) \ + $(NULL) + + +util/virkeycodetable_%.h: $(srcdir)/keycodemapdb/data/keymaps.csv \ + $(srcdir)/keycodemapdb/tools/keymap-gen Makefile.am + $(AM_V_GEN)export NAME=`echo $@ | sed -e 's,util/virkeycodetable_,,' \ + -e 's,\.h,,'` && \ + $(MKDIR_P) util/ && \ + $(PYTHON) $(srcdir)/keycodemapdb/tools/keymap-gen \ + --lang stdc --varname virKeyCodeTable_$$NAME code-table \ + $(srcdir)/keycodemapdb/data/keymaps.csv $$NAME > $@-tmp && \ + mv $@-tmp $@ || rm -f $@-tmp + +util/virkeynametable_%.h: $(srcdir)/keycodemapdb/data/keymaps.csv \ + $(srcdir)/keycodemapdb/tools/keymap-gen Makefile.am + $(AM_V_GEN)export NAME=`echo $@ | sed -e 's,util/virkeynametable_,,' \ + -e 's,\.h,,'` && \ + $(MKDIR_P) util/ && \ + $(PYTHON) $(srcdir)/keycodemapdb/tools/keymap-gen \ + --lang stdc --varname virKeyNameTable_$$NAME name-table \ + $(srcdir)/keycodemapdb/data/keymaps.csv $$NAME > $@-tmp && \ + mv $@-tmp $@ || rm -f $@-tmp + +util/virkeycode-%.pod: $(srcdir)/keycodemapdb/data/keymaps.csv \ + $(srcdir)/keycodemapdb/tools/keymap-gen Makefile.am + $(AM_V_GEN)export NAME=`echo $@ | sed -e 's,util/virkeycode-,,' \ + -e 's,\.pod,,'` && \ + $(MKDIR_P) util/ && \ + $(PYTHON) $(srcdir)/keycodemapdb/tools/keymap-gen \ + --lang pod --varname "Key code values for $$NAME" code-docs \ + $(srcdir)/keycodemapdb/data/keymaps.csv $$NAME > \ + $@-tmp && mv $@-tmp $@ || rm $@-tmp + +util/virkeyname-%.pod: $(srcdir)/keycodemapdb/data/keymaps.csv \ + $(srcdir)/keycodemapdb/tools/keymap-gen Makefile.am + $(AM_V_GEN)export NAME=`echo $@ | sed -e 's,util/virkeyname-,,' \ + -e 's,\.pod,,'` && \ + $(MKDIR_P) util/ && \ + $(PYTHON) $(srcdir)/keycodemapdb/tools/keymap-gen \ + --lang pod --varname "Key name values for $$NAME" name-docs \ + $(srcdir)/keycodemapdb/data/keymaps.csv $$NAME > \ + $@-tmp && mv $@-tmp $@ || rm $@-tmp + +util/virkey%.7: util/virkey%.pod + $(AM_V_GEN)$(POD2MAN) --section=7 $< $@-t1 && \ + if grep 'POD ERROR' $@-t1; then rm $@-t1; exit 1; fi && \ + sed \ + -e 's|SYSCONFDIR|\@sysconfdir\@|g' \ + -e 's|LOCALSTATEDIR|\@localstatedir\@|g' \ + < $@-t1 > $@-t2 && \ + rm -f $@-t1 && \ + mv $@-t2 $@ -- 2.14.3

Daniel P. Berrangé

4:14 a.m.

New subject: [libvirt] [PATCH 17/17] make: split vmx driver build rules into vmx/Makefile.inc.am

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/Makefile.am | 19 +------------------ src/vmx/Makefile.inc.am | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+), 18 deletions(-) create mode 100644 src/vmx/Makefile.inc.am diff --git a/src/Makefile.am b/src/Makefile.am index 6437cea8ae..70cb28bbf7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -107,6 +107,7 @@ include phyp/Makefile.inc.am include test/Makefile.inc.am include esx/Makefile.inc.am include hyperv/Makefile.inc.am +include vmx/Makefile.inc.am include vmware/Makefile.inc.am include vbox/Makefile.inc.am include openvz/Makefile.inc.am @@ -354,9 +355,6 @@ check-local: check-protocol check-symfile check-symsorting \ -VMX_SOURCES = \ - vmx/vmx.c vmx/vmx.h - pkgdata_DATA = cpu/cpu_map.xml @@ -369,15 +367,6 @@ EXTRA_DIST += $(pkgdata_DATA) # First deal with sources usable in non-daemon context -if WITH_VMX -noinst_LTLIBRARIES += libvirt_vmx.la -libvirt_la_BUILT_LIBADD += libvirt_vmx.la -libvirt_vmx_la_CFLAGS = \ - -I$(srcdir)/conf $(AM_CFLAGS) -libvirt_vmx_la_SOURCES = $(VMX_SOURCES) -endif WITH_VMX - - noinst_LTLIBRARIES += libvirt_driver.la libvirt_la_BUILT_LIBADD += libvirt_driver.la libvirt_driver_la_SOURCES = $(DRIVER_SOURCES) @@ -448,12 +437,6 @@ else ! WITH_LINUX SYM_FILES += $(srcdir)/libvirt_linux.syms endif ! WITH_LINUX -if WITH_VMX -USED_SYM_FILES += $(srcdir)/libvirt_vmx.syms -else ! WITH_VMX -SYM_FILES += $(srcdir)/libvirt_vmx.syms -endif ! WITH_VMX - if WITH_SASL USED_SYM_FILES += $(srcdir)/libvirt_sasl.syms else ! WITH_SASL diff --git a/src/vmx/Makefile.inc.am b/src/vmx/Makefile.inc.am new file mode 100644 index 0000000000..b9bf6ef690 --- /dev/null +++ b/src/vmx/Makefile.inc.am @@ -0,0 +1,22 @@ +VMX_SOURCES = \ + vmx/vmx.c \ + vmx/vmx.h \ + $(NULL) + +EXTRA_DIST += $(VMX_SOURCES) + +if WITH_VMX +noinst_LTLIBRARIES += libvirt_vmx.la +libvirt_la_BUILT_LIBADD += libvirt_vmx.la +libvirt_vmx_la_CFLAGS = \ + -I$(srcdir)/conf \ + $(AM_CFLAGS) \ + $(NULL) +libvirt_vmx_la_SOURCES = $(VMX_SOURCES) +endif WITH_VMX + +if WITH_VMX +USED_SYM_FILES += $(srcdir)/libvirt_vmx.syms +else ! WITH_VMX +SYM_FILES += $(srcdir)/libvirt_vmx.syms +endif ! WITH_VMX -- 2.14.3

Michal Privoznik

Monday, 5 March Mon, 5 Mar

10:39 a.m.

On 02/28/2018 11:14 AM, Daniel P. Berrangé wrote:

...

Which is why I waited until the release :-)

...

Daniel P. Berrangé (17): make: split interface driver build rules into interface/Makefile.inc.am make: split network driver build rules into network/Makefile.inc.am make: split nwfilter driver build rules into nwfilter/Makefile.inc.am make: split nodedev driver build rules into node_device/Makefile.inc.am make: split secret driver build rules into secret/Makefile.inc.am make: split storage driver build rules into storage/Makefile.inc.am make: split remote driver & daemon build rules into remote/Makefile.inc.am make: split XML conf build rules into conf/Makefile.inc.am make: split CPU build rules into cpu/Makefile.inc.am make: split security driver build rules into security/Makefile.inc.am make: split access driver build rules into access/Makefile.inc.am make: split logging daemon build rules into logging/Makefile.inc.am make: split lock daemon build rules into locking/Makefile.inc.am make: split admin driver build rules into admin/Makefile.inc.am make: split RPC build rules into rpc/Makefile.inc.am make: split util build rules into util/Makefile.inc.am make: split vmx driver build rules into vmx/Makefile.inc.am src/Makefile.am | 1993 +-------------------------------------- src/access/Makefile.inc.am | 148 +++ src/admin/Makefile.inc.am | 50 + src/conf/Makefile.inc.am | 163 ++++ src/cpu/Makefile.inc.am | 24 + src/interface/Makefile.inc.am | 42 + src/locking/Makefile.inc.am | 321 +++++++ src/logging/Makefile.inc.am | 155 +++ src/network/Makefile.inc.am | 106 +++ src/node_device/Makefile.inc.am | 65 ++ src/nwfilter/Makefile.inc.am | 42 + src/remote/Makefile.inc.am | 342 +++++++ src/rpc/Makefile.inc.am | 147 +++ src/secret/Makefile.inc.am | 38 + src/security/Makefile.inc.am | 80 ++ src/storage/Makefile.inc.am | 323 +++++++ src/util/Makefile.inc.am | 325 +++++++ src/vmx/Makefile.inc.am | 22 + 18 files changed, 2435 insertions(+), 1951 deletions(-) create mode 100644 src/access/Makefile.inc.am create mode 100644 src/admin/Makefile.inc.am create mode 100644 src/conf/Makefile.inc.am create mode 100644 src/cpu/Makefile.inc.am create mode 100644 src/interface/Makefile.inc.am create mode 100644 src/locking/Makefile.inc.am create mode 100644 src/logging/Makefile.inc.am create mode 100644 src/network/Makefile.inc.am create mode 100644 src/node_device/Makefile.inc.am create mode 100644 src/nwfilter/Makefile.inc.am create mode 100644 src/remote/Makefile.inc.am create mode 100644 src/rpc/Makefile.inc.am create mode 100644 src/secret/Makefile.inc.am create mode 100644 src/security/Makefile.inc.am create mode 100644 src/storage/Makefile.inc.am create mode 100644 src/util/Makefile.inc.am create mode 100644 src/vmx/Makefile.inc.am

ACK series. Michal

2488

days inactive

2493

days old

devel@lists.libvirt.org

Manage subscription

18 comments

2 participants

tags (0)

participants (2)

Daniel P. Berrangé
Michal Privoznik

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

[libvirt] [PATCH 00/17] Split up the src/Makefile.am even more