[libvirt] [PATCH v1 09/16] make: split qemu driver build rules into qemu/Makefile.inc.am

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com&gt; --- src/Makefile.am | 122 +++++--------------------------------- src/qemu/Makefile.inc.am | 148 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 162 insertions(+), 108 deletions(-) create mode 100644 src/qemu/Makefile.inc.am diff --git a/src/Makefile.am b/src/Makefile.am index 7927bcbb04..18566ca920 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -72,6 +72,13 @@ libvirt_la_BUILT_LIBADD = SYM_FILES = USED_SYM_FILES = GENERATED_SYM_FILES = +augeas_DATA = +augeastest_DATA = +conf_DATA = +AUGEAS_DIRS = +if WITH_DTRACE_PROBES +tapset_DATA = +endif WITH_DTRACE_PROBES include uml/Makefile.inc.am include phyp/Makefile.inc.am @@ -81,6 +88,7 @@ include hyperv/Makefile.inc.am include vmware/Makefile.inc.am include vbox/Makefile.inc.am include openvz/Makefile.inc.am +include qemu/Makefile.inc.am install-data-extra: $(INSTALL_DATA_DIRS:%=install-data-%) uninstall-data-extra: $(INSTALL_DATA_DIRS:%=install-data-%) @@ -109,13 +117,11 @@ moddir = $(libdir)/libvirt/connection-driver sbin_PROGRAMS = confdir = $(sysconfdir)/libvirt -conf_DATA = libvirt.conf libvirt-admin.conf +conf_DATA += libvirt.conf libvirt-admin.conf augeasdir = $(datadir)/augeas/lenses -augeas_DATA = augeastestdir = $(datadir)/augeas/lenses/tests -augeastest_DATA = # These files are not related to driver APIs. Simply generic # helper APIs for various purposes @@ -778,7 +784,6 @@ DRIVER_SOURCE_FILES += \ $(NODE_DEVICE_DRIVER_UDEV_SOURCES) \ $(NWFILTER_DRIVER_SOURCES) \ $(VZ_DRIVER_SOURCES) \ - $(QEMU_DRIVER_SOURCES) \ $(REMOTE_DRIVER_SOURCES) \ $(SECRET_DRIVER_SOURCES) \ $(STORAGE_DRIVER_SOURCES) \ @@ -794,7 +799,6 @@ STATEFUL_DRIVER_SOURCE_FILES += \ $(NETWORK_DRIVER_SOURCES) \ $(NODE_DEVICE_DRIVER_SOURCES) \ $(NWFILTER_DRIVER_SOURCES) \ - $(QEMU_DRIVER_SOURCES) \ $(SECRET_DRIVER_SOURCES) \ $(STORAGE_DRIVER_SOURCES) \ $(XEN_DRIVER_SOURCES) \ @@ -908,35 +912,6 @@ SECURITY_DRIVER_APPARMOR_HELPER_SOURCES = \ $(DATATYPES_SOURCES) \ security/virt-aa-helper.c -QEMU_DRIVER_SOURCES = \ - qemu/qemu_agent.c qemu/qemu_agent.h \ - qemu/qemu_alias.c qemu/qemu_alias.h \ - qemu/qemu_block.c qemu/qemu_block.h \ - qemu/qemu_blockjob.c qemu/qemu_blockjob.h \ - qemu/qemu_capabilities.c qemu/qemu_capabilities.h \ - qemu/qemu_command.c qemu/qemu_command.h \ - qemu/qemu_parse_command.c qemu/qemu_parse_command.h \ - qemu/qemu_domain.c qemu/qemu_domain.h \ - qemu/qemu_domain_address.c qemu/qemu_domain_address.h \ - qemu/qemu_cgroup.c qemu/qemu_cgroup.h \ - qemu/qemu_hostdev.c qemu/qemu_hostdev.h \ - qemu/qemu_hotplug.c qemu/qemu_hotplug.h \ - qemu/qemu_hotplugpriv.h \ - qemu/qemu_conf.c qemu/qemu_conf.h \ - qemu/qemu_process.c qemu/qemu_process.h \ - qemu/qemu_processpriv.h \ - qemu/qemu_migration.c qemu/qemu_migration.h \ - qemu/qemu_migration_cookie.c qemu/qemu_migration_cookie.h \ - qemu/qemu_monitor.c qemu/qemu_monitor.h \ - qemu/qemu_monitor_text.c \ - qemu/qemu_monitor_text.h \ - qemu/qemu_monitor_json.c \ - qemu/qemu_monitor_json.h \ - qemu/qemu_driver.c qemu/qemu_driver.h \ - qemu/qemu_interface.c qemu/qemu_interface.h \ - qemu/qemu_capspriv.h \ - qemu/qemu_security.c qemu/qemu_security.h - XENAPI_DRIVER_SOURCES = \ xenapi/xenapi_driver.c xenapi/xenapi_driver.h \ xenapi/xenapi_driver_private.h \ @@ -1418,41 +1393,6 @@ endif WITH_LIBXL EXTRA_DIST += libxl/libxl.conf libxl/libvirtd_libxl.aug \ libxl/test_libvirtd_libxl.aug.in -if WITH_QEMU -noinst_LTLIBRARIES += libvirt_driver_qemu_impl.la -libvirt_driver_qemu_la_SOURCES = -libvirt_driver_qemu_la_LIBADD = libvirt_driver_qemu_impl.la -mod_LTLIBRARIES += libvirt_driver_qemu.la -libvirt_driver_qemu_la_LIBADD += libvirt.la ../gnulib/lib/libgnu.la -libvirt_driver_qemu_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF) - -libvirt_driver_qemu_impl_la_CFLAGS = \ - $(GNUTLS_CFLAGS) \ - $(LIBNL_CFLAGS) \ - $(SELINUX_CFLAGS) \ - $(XDR_CFLAGS) \ - -I$(srcdir)/access \ - -I$(srcdir)/conf \ - -I$(srcdir)/secret \ - $(AM_CFLAGS) -libvirt_driver_qemu_impl_la_LDFLAGS = $(AM_LDFLAGS) -libvirt_driver_qemu_impl_la_LIBADD = $(CAPNG_LIBS) \ - $(GNUTLS_LIBS) \ - $(LIBNL_LIBS) \ - $(SELINUX_LIBS) \ - $(LIBXML_LIBS) \ - $(NULL) -libvirt_driver_qemu_impl_la_SOURCES = $(QEMU_DRIVER_SOURCES) - -conf_DATA += qemu/qemu.conf - -augeas_DATA += qemu/libvirtd_qemu.aug -augeastest_DATA += test_libvirtd_qemu.aug -CLEANFILES += test_libvirtd_qemu.aug - -endif WITH_QEMU -EXTRA_DIST += qemu/qemu.conf qemu/libvirtd_qemu.aug \ - qemu/test_libvirtd_qemu.aug.in qemu/THREADS.txt if WITH_LXC @@ -1920,7 +1860,6 @@ access/viraccessapichecklxc.c: $(srcdir)/rpc/gendispatch.pl \ EXTRA_DIST += \ $(REMOTE_DRIVER_SOURCES) \ $(XEN_DRIVER_SOURCES) \ - $(QEMU_DRIVER_SOURCES) \ $(LXC_DRIVER_SOURCES) \ $(XENAPI_DRIVER_SOURCES) \ $(LIBXL_DRIVER_SOURCES) \ @@ -1955,7 +1894,6 @@ EXTRA_DIST += \ check-local: check-augeas .PHONY: check-augeas \ - check-augeas-qemu \ check-augeas-lxc \ check-augeas-sanlock \ check-augeas-lockd \ @@ -1964,26 +1902,14 @@ check-local: check-augeas check-augeas-libvirtd \ $(NULL) -check-augeas: check-augeas-qemu check-augeas-lxc check-augeas-sanlock \ +check-augeas: $(AUGEAS_DIRS:%=check-augeas-%) \ + check-augeas-lxc check-augeas-sanlock \ check-augeas-lockd check-augeas-virtlockd check-augeas-libxl \ check-augeas-bhyve check-augeas-virtlogd check-augeas-libvirtd AUG_GENTEST = $(PERL) $(top_srcdir)/build-aux/augeas-gentest.pl EXTRA_DIST += $(top_srcdir)/build-aux/augeas-gentest.pl -if WITH_QEMU -test_libvirtd_qemu.aug: qemu/test_libvirtd_qemu.aug.in \ - $(srcdir)/qemu/qemu.conf $(AUG_GENTEST) - $(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/qemu/qemu.conf $< $@ - -check-augeas-qemu: test_libvirtd_qemu.aug - $(AM_V_GEN)if test -x '$(AUGPARSE)'; then \ - '$(AUGPARSE)' -I $(srcdir)/qemu test_libvirtd_qemu.aug; \ - fi -else ! WITH_QEMU -check-augeas-qemu: -endif ! WITH_QEMU - if WITH_LXC test_libvirtd_lxc.aug: lxc/test_libvirtd_lxc.aug.in \ $(srcdir)/lxc/lxc.conf $(AUG_GENTEST) @@ -2308,14 +2234,9 @@ DTRACE2SYSTEMTAP_FLAGS = --with-modules BUILT_SOURCES += libvirt_probes.h libvirt_probes.stp libvirt_functions.stp -if WITH_QEMU -libvirt_driver_qemu_la_LIBADD += libvirt_qemu_probes.lo -nodist_libvirt_driver_qemu_la_SOURCES = libvirt_qemu_probes.h -BUILT_SOURCES += libvirt_qemu_probes.h -endif WITH_QEMU tapsetdir = $(datadir)/systemtap/tapset -tapset_DATA = libvirt_probes.stp libvirt_qemu_probes.stp libvirt_functions.stp +tapset_DATA += libvirt_probes.stp libvirt_functions.stp %_probes.h: %_probes.d $(AM_V_GEN)$(DTRACE) -o $@ -h -s $< @@ -2352,13 +2273,10 @@ libvirt_functions.stp: $(RPC_PROBE_FILES) $(srcdir)/rpc/gensystemtap.pl $(DTRACE2SYSTEMTAP_FLAGS) $(bindir) $(sbindir) $(libdir) $< > $@ CLEANFILES += libvirt_probes.h libvirt_probes.o libvirt_probes.lo \ - libvirt_qemu_probes.h libvirt_qemu_probes.o \ - libvirt_qemu_probes.lo\ - libvirt_functions.stp libvirt_probes.stp \ - libvirt_qemu_probes.stp + libvirt_functions.stp libvirt_probes.stp endif WITH_DTRACE_PROBES -EXTRA_DIST += libvirt_probes.d libvirt_qemu_probes.d +EXTRA_DIST += libvirt_probes.d libvirt_qemu_la_SOURCES = libvirt-qemu.c libvirt_qemu_la_LDFLAGS = \ @@ -3340,12 +3258,6 @@ endif WITH_LIBVIRTD if WITH_SANLOCK $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/sanlock" endif WITH_SANLOCK -if WITH_QEMU - $(MKDIR_P) -m 0751 "$(DESTDIR)$(localstatedir)/lib/libvirt/qemu" - $(MKDIR_P) "$(DESTDIR)$(localstatedir)/run/libvirt/qemu" - $(MKDIR_P) "$(DESTDIR)$(localstatedir)/cache/libvirt/qemu" - $(MKDIR_P) "$(DESTDIR)$(localstatedir)/log/libvirt/qemu" -endif WITH_QEMU if WITH_LXC $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/lxc" $(MKDIR_P) "$(DESTDIR)$(localstatedir)/run/libvirt/lxc" @@ -3395,12 +3307,6 @@ endif WITH_LIBVIRTD if WITH_SANLOCK rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/sanlock" ||: endif WITH_SANLOCK -if WITH_QEMU - rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/qemu" ||: - rmdir "$(DESTDIR)$(localstatedir)/run/libvirt/qemu" ||: - rmdir "$(DESTDIR)$(localstatedir)/cache/libvirt/qemu" ||: - rmdir "$(DESTDIR)$(localstatedir)/log/libvirt/qemu" ||: -endif WITH_QEMU if WITH_LXC rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/lxc" ||: rmdir "$(DESTDIR)$(localstatedir)/run/libvirt/lxc" ||: diff --git a/src/qemu/Makefile.inc.am b/src/qemu/Makefile.inc.am new file mode 100644 index 0000000000..2ad062cdb5 --- /dev/null +++ b/src/qemu/Makefile.inc.am @@ -0,0 +1,148 @@ +QEMU_DRIVER_SOURCES = \ + qemu/qemu_agent.c \ + qemu/qemu_agent.h \ + qemu/qemu_alias.c \ + qemu/qemu_alias.h \ + qemu/qemu_block.c \ + qemu/qemu_block.h \ + qemu/qemu_blockjob.c \ + qemu/qemu_blockjob.h \ + qemu/qemu_capabilities.c \ + qemu/qemu_capabilities.h \ + qemu/qemu_command.c \ + qemu/qemu_command.h \ + qemu/qemu_parse_command.c \ + qemu/qemu_parse_command.h \ + qemu/qemu_domain.c \ + qemu/qemu_domain.h \ + qemu/qemu_domain_address.c \ + qemu/qemu_domain_address.h \ + qemu/qemu_cgroup.c \ + qemu/qemu_cgroup.h \ + qemu/qemu_hostdev.c \ + qemu/qemu_hostdev.h \ + qemu/qemu_hotplug.c \ + qemu/qemu_hotplug.h \ + qemu/qemu_hotplugpriv.h \ + qemu/qemu_conf.c \ + qemu/qemu_conf.h \ + qemu/qemu_process.c \ + qemu/qemu_process.h \ + qemu/qemu_processpriv.h \ + qemu/qemu_migration.c \ + qemu/qemu_migration.h \ + qemu/qemu_migration_cookie.c \ + qemu/qemu_migration_cookie.h \ + qemu/qemu_monitor.c \ + qemu/qemu_monitor.h \ + qemu/qemu_monitor_text.c \ + qemu/qemu_monitor_text.h \ + qemu/qemu_monitor_json.c \ + qemu/qemu_monitor_json.h \ + qemu/qemu_driver.c \ + qemu/qemu_driver.h \ + qemu/qemu_interface.c \ + qemu/qemu_interface.h \ + qemu/qemu_capspriv.h \ + qemu/qemu_security.c \ + qemu/qemu_security.h \ + $(NULL) + + +DRIVER_SOURCE_FILES += $(QEMU_DRIVER_SOURCES) +STATEFUL_DRIVER_SOURCE_FILES += $(QEMU_DRIVER_SOURCES) +EXTRA_DIST += $(QEMU_DRIVER_SOURCES) + +if WITH_QEMU +noinst_LTLIBRARIES += libvirt_driver_qemu_impl.la +libvirt_driver_qemu_la_SOURCES = +libvirt_driver_qemu_la_LIBADD = \ + libvirt_driver_qemu_impl.la \ + libvirt.la \ + ../gnulib/lib/libgnu.la \ + $(NULL) +mod_LTLIBRARIES += libvirt_driver_qemu.la +libvirt_driver_qemu_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF) + +libvirt_driver_qemu_impl_la_CFLAGS = \ + $(GNUTLS_CFLAGS) \ + $(LIBNL_CFLAGS) \ + $(SELINUX_CFLAGS) \ + $(XDR_CFLAGS) \ + -I$(srcdir)/access \ + -I$(srcdir)/conf \ + -I$(srcdir)/secret \ + $(AM_CFLAGS) \ + $(NULL) +libvirt_driver_qemu_impl_la_LDFLAGS = $(AM_LDFLAGS) +libvirt_driver_qemu_impl_la_LIBADD = \ + $(CAPNG_LIBS) \ + $(GNUTLS_LIBS) \ + $(LIBNL_LIBS) \ + $(SELINUX_LIBS) \ + $(LIBXML_LIBS) \ + $(NULL) +libvirt_driver_qemu_impl_la_SOURCES = $(QEMU_DRIVER_SOURCES) + +if WITH_DTRACE_PROBES +libvirt_driver_qemu_la_LIBADD += libvirt_qemu_probes.lo +nodist_libvirt_driver_qemu_la_SOURCES = libvirt_qemu_probes.h +BUILT_SOURCES += libvirt_qemu_probes.h + +tapset_DATA += libvirt_qemu_probes.stp + +CLEANFILES += \ + libvirt_qemu_probes.h \ + libvirt_qemu_probes.o \ + libvirt_qemu_probes.lo \ + libvirt_qemu_probes.stp \ + $(NULL) + +endif WITH_DTRACE_PROBES + +conf_DATA += qemu/qemu.conf + +augeas_DATA += qemu/libvirtd_qemu.aug +augeastest_DATA += test_libvirtd_qemu.aug +CLEANFILES += test_libvirtd_qemu.aug + +AUGEAS_DIRS += qemu + +test_libvirtd_qemu.aug: qemu/test_libvirtd_qemu.aug.in \ + $(srcdir)/qemu/qemu.conf $(AUG_GENTEST) + $(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/qemu/qemu.conf $< $@ + +check-augeas-qemu: test_libvirtd_qemu.aug + $(AM_V_GEN)if test -x '$(AUGPARSE)'; then \ + '$(AUGPARSE)' -I $(srcdir)/qemu test_libvirtd_qemu.aug; \ + fi + +INSTALL_DATA_DIRS += qemu + +install-data-qemu: + $(MKDIR_P) -m 0751 "$(DESTDIR)$(localstatedir)/lib/libvirt/qemu" + $(MKDIR_P) "$(DESTDIR)$(localstatedir)/run/libvirt/qemu" + $(MKDIR_P) "$(DESTDIR)$(localstatedir)/cache/libvirt/qemu" + $(MKDIR_P) "$(DESTDIR)$(localstatedir)/log/libvirt/qemu" + +uninstall-data-qemu: + rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/qemu" ||: + rmdir "$(DESTDIR)$(localstatedir)/run/libvirt/qemu" ||: + rmdir "$(DESTDIR)$(localstatedir)/cache/libvirt/qemu" ||: + rmdir "$(DESTDIR)$(localstatedir)/log/libvirt/qemu" ||: + +endif WITH_QEMU + +.PHONY: \ + check-augeas-qemu \ + install-data-qemu \ + uninstall-data-qemu \ + $(NULL) + +EXTRA_DIST += \ + qemu/qemu.conf \ + qemu/libvirtd_qemu.aug \ + qemu/test_libvirtd_qemu.aug.in \ + qemu/THREADS.txt \ + libvirt_qemu_probes.d \ + $(NULL) -- 2.14.3