6:56 a.m.
The src/Makefile.am is quite large and has quite poor grouping of rules
/ variables / etc. This makes it increasingly hard to identify all the
rules relating to a particular area of code.
Traditionally one might create Makefile.am's in each sub-directory and
let make recurse into each. Recursive make is quite a bad idea in
general though because it harms parallelization and means that make does
not have a full view of dependencies.
This series thus takes a different approach to modularization which is
to make use of the "include" statement to pull in makefile fragments
from subdirectories. automake fully expands all "include" statements
when generating the Makefile.in, so we still end up with a single
monolithic file for the eventual build. Aside from ensuring make still
has a full view of dependencies, this also means that all variables are
still in a global namespace.
In doing this split, I've taken the opportunity to santize the variable
declarations into a consistent style. Any variable that is assigned more
than one value now uses line continuations with exactly one value per
line and a trailing $(NULL). It would be nice to enforce this style with
a syntax-check rule but I've not figured this out yet.
This series only moves the virt drivers. So there's obviously a further
series to follow behind this to finish the job for other drivers.
Daniel P. Berrangé (16):
make: split UML driver build rules into uml/Makefile.inc.am
make: split PHyp driver build rules into phyp/Makefile.inc.am
make: split test driver build rules into test/Makefile.inc.am
make: split ESX driver build rules into esx/Makefile.inc.am
make: split hyperv driver build rules into hyperv/Makefile.inc.am
make: split vmware driver build rules into vmware/Makefile.inc.am
make: split vbox driver build rules into vbox/Makefile.inc.am
make: split openvz driver build rules into openvz/Makefile.inc.am
make: split qemu driver build rules into qemu/Makefile.inc.am
make: split bhyve driver build rules into bhyve/Makefile.inc.am
make: split xenconfig driver build rules into
xenconfig/Makefile.inc.am
make: split libxl driver build rules into libxl/Makefile.inc.am
make: split xen driver build rules into xen/Makefile.inc.am
make: split xenapi driver build rules into xenapi/Makefile.inc.am
make: split vz driver build rules into vz/Makefile.inc.am
make: split lxc driver build rules into lxc/Makefile.inc.am
src/Makefile.am | 872 +++---------------------------------------
src/bhyve/Makefile.inc.am | 73 ++++
src/esx/Makefile.inc.am | 90 +++++
src/hyperv/Makefile.inc.am | 59 +++
src/libxl/Makefile.inc.am | 104 +++++
src/lxc/Makefile.inc.am | 207 ++++++++++
src/openvz/Makefile.inc.am | 28 ++
src/phyp/Makefile.inc.am | 19 +
src/qemu/Makefile.inc.am | 148 +++++++
src/test/Makefile.inc.am | 26 ++
src/uml/Makefile.inc.am | 46 +++
src/vbox/Makefile.inc.am | 76 ++++
src/vmware/Makefile.inc.am | 27 ++
src/vz/Makefile.inc.am | 38 ++
src/xen/Makefile.inc.am | 67 ++++
src/xenapi/Makefile.inc.am | 28 ++
src/xenconfig/Makefile.inc.am | 28 ++
17 files changed, 1122 insertions(+), 814 deletions(-)
create mode 100644 src/bhyve/Makefile.inc.am
create mode 100644 src/esx/Makefile.inc.am
create mode 100644 src/hyperv/Makefile.inc.am
create mode 100644 src/libxl/Makefile.inc.am
create mode 100644 src/lxc/Makefile.inc.am
create mode 100644 src/openvz/Makefile.inc.am
create mode 100644 src/phyp/Makefile.inc.am
create mode 100644 src/qemu/Makefile.inc.am
create mode 100644 src/test/Makefile.inc.am
create mode 100644 src/uml/Makefile.inc.am
create mode 100644 src/vbox/Makefile.inc.am
create mode 100644 src/vmware/Makefile.inc.am
create mode 100644 src/vz/Makefile.inc.am
create mode 100644 src/xen/Makefile.inc.am
create mode 100644 src/xenapi/Makefile.inc.am
create mode 100644 src/xenconfig/Makefile.inc.am
--
2.14.3
6:56 a.m.
New subject: [libvirt] [PATCH v1 01/16] make: split UML driver build rules into uml/Makefile.inc.am
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
src/Makefile.am | 57 +++++++++++++++----------------------------------
src/uml/Makefile.inc.am | 46 +++++++++++++++++++++++++++++++++++++++
2 files changed, 63 insertions(+), 40 deletions(-)
create mode 100644 src/uml/Makefile.inc.am
diff --git a/src/Makefile.am b/src/Makefile.am
index b8e2cbf139..3c346b37aa 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
-## Copyright (C) 2005-2016 Red Hat, Inc.
+## Copyright (C) 2005-2018 Red Hat, Inc.
##
## This library is free software; you can redistribute it and/or
## modify it under the terms of the GNU Lesser General Public
@@ -63,6 +63,17 @@ CLEANFILES =
DISTCLEANFILES =
MAINTAINERCLEANFILES =
nodist_conf_DATA =
+DRIVER_SOURCE_FILES =
+STATEFUL_DRIVER_SOURCE_FILES =
+noinst_LTLIBRARIES =
+mod_LTLIBRARIES =
+INSTALL_DATA_DIRS =
+
+include uml/Makefile.inc.am
+
+install-data-extra: $(INSTALL_DATA_DIRS:%=install-data-%)
+uninstall-data-extra: $(INSTALL_DATA_DIRS:%=install-data-%)
+
THREAD_LIBS = $(LIB_PTHREAD) $(LTLIBMULTITHREAD)
@@ -84,7 +95,6 @@ endif WITH_NETWORK
lib_LTLIBRARIES = libvirt.la libvirt-qemu.la libvirt-lxc.la
moddir = $(libdir)/libvirt/connection-driver
-mod_LTLIBRARIES =
sbin_PROGRAMS =
confdir = $(sysconfdir)/libvirt
@@ -747,7 +757,7 @@ check-drivername:
EXTRA_DIST += check-drivername.pl
-DRIVER_SOURCE_FILES = \
+DRIVER_SOURCE_FILES += \
$(ESX_DRIVER_SOURCES) \
$(HYPERV_DRIVER_SORUCES) \
$(INTERFACE_DRIVER_SOURCES) \
@@ -766,7 +776,6 @@ DRIVER_SOURCE_FILES = \
$(SECRET_DRIVER_SOURCES) \
$(STORAGE_DRIVER_SOURCES) \
$(TEST_DRIVER_SOURCES) \
- $(UML_DRIVER_SOURCES) \
$(VBOX_DRIVER_SOURCES) \
vbox/vbox_tmpl.c \
$(VMWARE_DRIVER_SOURCES) \
@@ -774,7 +783,7 @@ DRIVER_SOURCE_FILES = \
$(XENAPI_DRIVER_SOURCES) \
$(NULL)
-STATEFUL_DRIVER_SOURCE_FILES = \
+STATEFUL_DRIVER_SOURCE_FILES += \
$(BHYVE_DRIVER_SOURCES) \
$(INTERFACE_DRIVER_SOURCES) \
$(LIBXL_DRIVER_SOURCES) \
@@ -785,7 +794,6 @@ STATEFUL_DRIVER_SOURCE_FILES = \
$(QEMU_DRIVER_SOURCES) \
$(SECRET_DRIVER_SOURCES) \
$(STORAGE_DRIVER_SOURCES) \
- $(UML_DRIVER_SOURCES) \
$(XEN_DRIVER_SOURCES) \
$(VZ_DRIVER_SOURCES) \
$(NULL)
@@ -980,10 +988,6 @@ LIBXL_DRIVER_SOURCES = \
libxl/libxl_logger.c libxl/libxl_logger.h \
libxl/libxl_migration.c libxl/libxl_migration.h
-UML_DRIVER_SOURCES = \
- uml/uml_conf.c uml/uml_conf.h \
- uml/uml_driver.c uml/uml_driver.h
-
ESX_DRIVER_SOURCES = \
esx/esx_private.h \
esx/esx_driver.c esx/esx_driver.h \
@@ -1255,7 +1259,7 @@ EXTRA_DIST += $(pkgdata_DATA)
#
# First deal with sources usable in non-daemon context
-noinst_LTLIBRARIES = libvirt_util.la
+noinst_LTLIBRARIES += libvirt_util.la
libvirt_la_LIBADD = $(libvirt_la_BUILT_LIBADD)
libvirt_la_BUILT_LIBADD = libvirt_util.la
libvirt_util_la_SOURCES = \
@@ -1635,22 +1639,6 @@ CLEANFILES += test_libvirtd_lxc.aug
endif WITH_LXC
EXTRA_DIST += lxc/lxc.conf lxc/libvirtd_lxc.aug lxc/test_libvirtd_lxc.aug.in
-if WITH_UML
-noinst_LTLIBRARIES += libvirt_driver_uml_impl.la
-libvirt_driver_uml_la_SOURCES =
-libvirt_driver_uml_la_LIBADD = libvirt_driver_uml_impl.la
-mod_LTLIBRARIES += libvirt_driver_uml.la
-libvirt_driver_uml_la_LIBADD += libvirt.la ../gnulib/lib/libgnu.la
-libvirt_driver_uml_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF)
-
-libvirt_driver_uml_impl_la_CFLAGS = \
- -I$(srcdir)/access \
- -I$(srcdir)/conf \
- $(AM_CFLAGS)
-libvirt_driver_uml_impl_la_LDFLAGS = $(AM_LDFLAGS)
-# libvirt_driver_uml_impl_la_LIBADD =
-libvirt_driver_uml_impl_la_SOURCES = $(UML_DRIVER_SOURCES)
-endif WITH_UML
BUILT_SOURCES += $(ESX_DRIVER_GENERATED)
@@ -2135,7 +2123,6 @@ EXTRA_DIST += \
$(XEN_DRIVER_SOURCES) \
$(QEMU_DRIVER_SOURCES) \
$(LXC_DRIVER_SOURCES) \
- $(UML_DRIVER_SOURCES) \
$(OPENVZ_DRIVER_SOURCES) \
$(PHYP_DRIVER_SOURCES) \
$(VBOX_DRIVER_SOURCES) \
@@ -3567,7 +3554,7 @@ endif WITH_NSS
install-data-local: install-init install-systemd install-upstart \
install-sysctl install-polkit install-sasl \
- install-logrotate
+ install-logrotate install-data-extra
if WITH_LIBVIRTD
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/log/libvirt"
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/lockd"
@@ -3597,11 +3584,6 @@ if WITH_LIBXL
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/run/libvirt/libxl"
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/log/libvirt/libxl"
endif WITH_LIBXL
-if WITH_UML
- $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/uml"
- $(MKDIR_P) "$(DESTDIR)$(localstatedir)/run/libvirt/uml"
- $(MKDIR_P) "$(DESTDIR)$(localstatedir)/log/libvirt/uml"
-endif WITH_UML
if WITH_XEN
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/xen"
endif WITH_XEN
@@ -3627,7 +3609,7 @@ endif WITH_NETWORK
uninstall-local:: uninstall-init uninstall-systemd uninstall-upstart \
uninstall-sysctl uninstall-polkit uninstall-sasl \
- uninstall-logrotate
+ uninstall-logrotate uninstall-data-extra
if WITH_LIBVIRTD
rmdir "$(DESTDIR)$(localstatedir)/log/libvirt" ||:
rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/lockd/files" ||:
@@ -3657,11 +3639,6 @@ if WITH_LIBXL
rmdir "$(DESTDIR)$(localstatedir)/run/libvirt/libxl" ||:
rmdir "$(DESTDIR)$(localstatedir)/log/libvirt/libxl" ||:
endif WITH_LIBXL
-if WITH_UML
- rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/uml" ||:
- rmdir "$(DESTDIR)$(localstatedir)/run/libvirt/uml" ||:
- rmdir "$(DESTDIR)$(localstatedir)/log/libvirt/uml" ||:
-endif WITH_UML
if WITH_XEN
rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/xen" ||:
endif WITH_XEN
diff --git a/src/uml/Makefile.inc.am b/src/uml/Makefile.inc.am
new file mode 100644
index 0000000000..2a53d98efb
--- /dev/null
+++ b/src/uml/Makefile.inc.am
@@ -0,0 +1,46 @@
+UML_DRIVER_SOURCES = \
+ uml/uml_conf.c uml/uml_conf.h \
+ uml/uml_driver.c uml/uml_driver.h \
+ $(NULL)
+
+DRIVER_SOURCE_FILES += $(UML_DRIVER_SOURCES)
+STATEFUL_DRIVER_SOURCE_FILES += $(UML_DRIVER_SOURCES)
+EXTRA_DIST += $(UML_DRIVER_SOURCES)
+
+if WITH_UML
+noinst_LTLIBRARIES += libvirt_driver_uml_impl.la
+libvirt_driver_uml_la_SOURCES =
+libvirt_driver_uml_la_LIBADD = \
+ libvirt_driver_uml_impl.la \
+ libvirt.la \
+ ../gnulib/lib/libgnu.la \
+ $(NULL)
+mod_LTLIBRARIES += libvirt_driver_uml.la
+libvirt_driver_uml_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF)
+
+libvirt_driver_uml_impl_la_CFLAGS = \
+ -I$(srcdir)/access \
+ -I$(srcdir)/conf \
+ $(AM_CFLAGS) \
+ $(NULL)
+libvirt_driver_uml_impl_la_LDFLAGS = $(AM_LDFLAGS)
+libvirt_driver_uml_impl_la_SOURCES = $(UML_DRIVER_SOURCES)
+
+INSTALL_DATA_DIRS += uml
+
+install-data-uml:
+ $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/uml"
+ $(MKDIR_P) "$(DESTDIR)$(localstatedir)/run/libvirt/uml"
+ $(MKDIR_P) "$(DESTDIR)$(localstatedir)/log/libvirt/uml"
+
+uninstall-data-uml:
+ rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/uml" ||:
+ rmdir "$(DESTDIR)$(localstatedir)/run/libvirt/uml" ||:
+ rmdir "$(DESTDIR)$(localstatedir)/log/libvirt/uml" ||:
+
+endif WITH_UML
+
+.PHONY: \
+ install-data-uml \
+ uninstall-data-uml \
+ $(NULL)
--
2.14.3
6:56 a.m.
New subject: [libvirt] [PATCH v1 02/16] make: split PHyp driver build rules into phyp/Makefile.inc.am
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
src/Makefile.am | 18 +++---------------
src/phyp/Makefile.inc.am | 19 +++++++++++++++++++
2 files changed, 22 insertions(+), 15 deletions(-)
create mode 100644 src/phyp/Makefile.inc.am
diff --git a/src/Makefile.am b/src/Makefile.am
index 3c346b37aa..15549ec5b8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -68,8 +68,10 @@ STATEFUL_DRIVER_SOURCE_FILES =
noinst_LTLIBRARIES =
mod_LTLIBRARIES =
INSTALL_DATA_DIRS =
+libvirt_la_BUILT_LIBADD =
include uml/Makefile.inc.am
+include phyp/Makefile.inc.am
install-data-extra: $(INSTALL_DATA_DIRS:%=install-data-%)
uninstall-data-extra: $(INSTALL_DATA_DIRS:%=install-data-%)
@@ -770,7 +772,6 @@ DRIVER_SOURCE_FILES += \
$(NWFILTER_DRIVER_SOURCES) \
$(OPENVZ_DRIVER_SOURCES) \
$(VZ_DRIVER_SOURCES) \
- $(PHYP_DRIVER_SOURCES) \
$(QEMU_DRIVER_SOURCES) \
$(REMOTE_DRIVER_SOURCES) \
$(SECRET_DRIVER_SOURCES) \
@@ -910,9 +911,6 @@ SECURITY_DRIVER_APPARMOR_HELPER_SOURCES = \
$(DATATYPES_SOURCES) \
security/virt-aa-helper.c
-PHYP_DRIVER_SOURCES = \
- phyp/phyp_driver.c phyp/phyp_driver.h
-
OPENVZ_DRIVER_SOURCES = \
openvz/openvz_conf.c openvz/openvz_conf.h \
openvz/openvz_driver.c openvz/openvz_driver.h \
@@ -1261,7 +1259,7 @@ EXTRA_DIST += $(pkgdata_DATA)
noinst_LTLIBRARIES += libvirt_util.la
libvirt_la_LIBADD = $(libvirt_la_BUILT_LIBADD)
-libvirt_la_BUILT_LIBADD = libvirt_util.la
+libvirt_la_BUILT_LIBADD += libvirt_util.la
libvirt_util_la_SOURCES = \
$(UTIL_SOURCES)
libvirt_util_la_CFLAGS = $(CAPNG_CFLAGS) $(YAJL_CFLAGS) $(LIBNL_CFLAGS) \
@@ -1478,15 +1476,6 @@ libvirt_driver_xen_impl_la_LIBADD = $(XEN_LIBS)
libvirt_xenconfig.la
libvirt_driver_xen_impl_la_SOURCES = $(XEN_DRIVER_SOURCES)
endif WITH_XEN
-if WITH_PHYP
-noinst_LTLIBRARIES += libvirt_driver_phyp.la
-libvirt_la_BUILT_LIBADD += libvirt_driver_phyp.la
-libvirt_driver_phyp_la_LIBADD = $(SSH2_LIBS)
-libvirt_driver_phyp_la_CFLAGS = $(SSH2_CFLAGS) \
- -I$(srcdir)/conf $(AM_CFLAGS)
-libvirt_driver_phyp_la_SOURCES = $(PHYP_DRIVER_SOURCES)
-endif WITH_PHYP
-
if WITH_OPENVZ
noinst_LTLIBRARIES += libvirt_driver_openvz.la
libvirt_la_BUILT_LIBADD += libvirt_driver_openvz.la
@@ -2124,7 +2113,6 @@ EXTRA_DIST += \
$(QEMU_DRIVER_SOURCES) \
$(LXC_DRIVER_SOURCES) \
$(OPENVZ_DRIVER_SOURCES) \
- $(PHYP_DRIVER_SOURCES) \
$(VBOX_DRIVER_SOURCES) \
$(XENAPI_DRIVER_SOURCES) \
$(LIBXL_DRIVER_SOURCES) \
diff --git a/src/phyp/Makefile.inc.am b/src/phyp/Makefile.inc.am
new file mode 100644
index 0000000000..496ff25266
--- /dev/null
+++ b/src/phyp/Makefile.inc.am
@@ -0,0 +1,19 @@
+PHYP_DRIVER_SOURCES = \
+ phyp/phyp_driver.c \
+ phyp/phyp_driver.h \
+ $(NULL)
+
+DRIVER_SOURCE_FILES += $(PHYP_DRIVER_SOURCES)
+EXTRA_DIST += $(PHYP_DRIVER_SOURCES)
+
+if WITH_PHYP
+noinst_LTLIBRARIES += libvirt_driver_phyp.la
+libvirt_la_BUILT_LIBADD += libvirt_driver_phyp.la
+libvirt_driver_phyp_la_LIBADD = $(SSH2_LIBS)
+libvirt_driver_phyp_la_CFLAGS = \
+ $(SSH2_CFLAGS) \
+ -I$(srcdir)/conf \
+ $(AM_CFLAGS) \
+ $(NULL)
+libvirt_driver_phyp_la_SOURCES = $(PHYP_DRIVER_SOURCES)
+endif WITH_PHYP
--
2.14.3
6:56 a.m.
New subject: [libvirt] [PATCH v1 03/16] make: split test driver build rules into test/Makefile.inc.am
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
src/Makefile.am | 21 +--------------------
src/test/Makefile.inc.am | 26 ++++++++++++++++++++++++++
2 files changed, 27 insertions(+), 20 deletions(-)
create mode 100644 src/test/Makefile.inc.am
diff --git a/src/Makefile.am b/src/Makefile.am
index 15549ec5b8..bec7930c2b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -72,6 +72,7 @@ libvirt_la_BUILT_LIBADD =
include uml/Makefile.inc.am
include phyp/Makefile.inc.am
+include test/Makefile.inc.am
install-data-extra: $(INSTALL_DATA_DIRS:%=install-data-%)
uninstall-data-extra: $(INSTALL_DATA_DIRS:%=install-data-%)
@@ -776,7 +777,6 @@ DRIVER_SOURCE_FILES += \
$(REMOTE_DRIVER_SOURCES) \
$(SECRET_DRIVER_SOURCES) \
$(STORAGE_DRIVER_SOURCES) \
- $(TEST_DRIVER_SOURCES) \
$(VBOX_DRIVER_SOURCES) \
vbox/vbox_tmpl.c \
$(VMWARE_DRIVER_SOURCES) \
@@ -824,11 +824,6 @@ check-local: check-protocol check-symfile check-symsorting \
check-aclperms check-admin-symfile check-admin-symsorting
.PHONY: check-protocol $(PROTOCOL_STRUCTS:structs=struct)
-# Mock driver, covering domains, storage, networks, etc
-TEST_DRIVER_SOURCES = \
- test/test_driver.c test/test_driver.h
-TEST_DRIVER_ASSETS = test/test-screenshot.png
-
# Now the Hypervisor specific drivers
XEN_DRIVER_SOURCES = \
xen/block_stats.c xen/block_stats.h \
@@ -1338,18 +1333,6 @@ GENERATED_SYM_FILES = \
libvirt_admin.syms libvirt_admin.def \
$(NULL)
-if WITH_TEST
-
-driver_test_asset_DATA = $(TEST_DRIVER_ASSETS)
-driver_test_assetdir = $(pkgdatadir)
-
-noinst_LTLIBRARIES += libvirt_driver_test.la
-libvirt_la_BUILT_LIBADD += libvirt_driver_test.la
-libvirt_driver_test_la_CFLAGS = \
- -I$(srcdir)/conf $(AM_CFLAGS)
-libvirt_driver_test_la_SOURCES = $(TEST_DRIVER_SOURCES)
-endif WITH_TEST
-
if WITH_REMOTE
noinst_LTLIBRARIES += libvirt_driver_remote.la
libvirt_la_BUILT_LIBADD += libvirt_driver_remote.la
@@ -2106,8 +2089,6 @@ access/viraccessapichecklxc.c: $(srcdir)/rpc/gendispatch.pl \
# Add all conditional sources just in case...
EXTRA_DIST += \
- $(TEST_DRIVER_SOURCES) \
- $(TEST_DRIVER_ASSETS) \
$(REMOTE_DRIVER_SOURCES) \
$(XEN_DRIVER_SOURCES) \
$(QEMU_DRIVER_SOURCES) \
diff --git a/src/test/Makefile.inc.am b/src/test/Makefile.inc.am
new file mode 100644
index 0000000000..d52c281545
--- /dev/null
+++ b/src/test/Makefile.inc.am
@@ -0,0 +1,26 @@
+TEST_DRIVER_SOURCES = \
+ test/test_driver.c \
+ test/test_driver.h \
+ $(NULL)
+TEST_DRIVER_ASSETS = test/test-screenshot.png
+
+DRIVER_SOURCE_FILES += $(TEST_DRIVER_SOURCES)
+
+EXTRA_DIST += \
+ $(TEST_DRIVER_SOURCES) \
+ $(TEST_DRIVER_ASSETS) \
+ $(NULL)
+
+if WITH_TEST
+
+driver_test_asset_DATA = $(TEST_DRIVER_ASSETS)
+driver_test_assetdir = $(pkgdatadir)
+
+noinst_LTLIBRARIES += libvirt_driver_test.la
+libvirt_la_BUILT_LIBADD += libvirt_driver_test.la
+libvirt_driver_test_la_CFLAGS = \
+ -I$(srcdir)/conf \
+ $(AM_CFLAGS) \
+ $(NULL)
+libvirt_driver_test_la_SOURCES = $(TEST_DRIVER_SOURCES)
+endif WITH_TEST
--
2.14.3
6:56 a.m.
New subject: [libvirt] [PATCH v1 04/16] make: split ESX driver build rules into esx/Makefile.inc.am
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
src/Makefile.am | 79 ++++---------------------------------------
src/esx/Makefile.inc.am | 90 +++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 97 insertions(+), 72 deletions(-)
create mode 100644 src/esx/Makefile.inc.am
diff --git a/src/Makefile.am b/src/Makefile.am
index bec7930c2b..b952bb00e2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -69,10 +69,14 @@ noinst_LTLIBRARIES =
mod_LTLIBRARIES =
INSTALL_DATA_DIRS =
libvirt_la_BUILT_LIBADD =
+SYM_FILES =
+USED_SYM_FILES =
+GENERATED_SYM_FILES =
include uml/Makefile.inc.am
include phyp/Makefile.inc.am
include test/Makefile.inc.am
+include esx/Makefile.inc.am
install-data-extra: $(INSTALL_DATA_DIRS:%=install-data-%)
uninstall-data-extra: $(INSTALL_DATA_DIRS:%=install-data-%)
@@ -761,7 +765,6 @@ check-drivername:
EXTRA_DIST += check-drivername.pl
DRIVER_SOURCE_FILES += \
- $(ESX_DRIVER_SOURCES) \
$(HYPERV_DRIVER_SORUCES) \
$(INTERFACE_DRIVER_SOURCES) \
$(LIBXL_DRIVER_SOURCES) \
@@ -981,39 +984,6 @@ LIBXL_DRIVER_SOURCES = \
libxl/libxl_logger.c libxl/libxl_logger.h \
libxl/libxl_migration.c libxl/libxl_migration.h
-ESX_DRIVER_SOURCES = \
- esx/esx_private.h \
- esx/esx_driver.c esx/esx_driver.h \
- esx/esx_interface_driver.c esx/esx_interface_driver.h \
- esx/esx_network_driver.c esx/esx_network_driver.h \
- esx/esx_storage_driver.c esx/esx_storage_driver.h \
- esx/esx_storage_backend_vmfs.c esx/esx_storage_backend_vmfs.h \
- esx/esx_storage_backend_iscsi.c esx/esx_storage_backend_iscsi.h \
- esx/esx_stream.c esx/esx_stream.h \
- esx/esx_util.c esx/esx_util.h \
- esx/esx_vi.c esx/esx_vi.h \
- esx/esx_vi_methods.c esx/esx_vi_methods.h \
- esx/esx_vi_types.c esx/esx_vi_types.h
-
-ESX_DRIVER_GENERATED = \
- esx/esx_vi_methods.generated.c \
- esx/esx_vi_methods.generated.h \
- esx/esx_vi_methods.generated.macro \
- esx/esx_vi_types.generated.c \
- esx/esx_vi_types.generated.h \
- esx/esx_vi_types.generated.typedef \
- esx/esx_vi_types.generated.typeenum \
- esx/esx_vi_types.generated.typetostring \
- esx/esx_vi_types.generated.typefromstring \
- esx/esx_vi.generated.c \
- esx/esx_vi.generated.h
-
-ESX_DRIVER_EXTRA_DIST = \
- esx/README \
- esx/esx_vi_generator.input \
- esx/esx_vi_generator.py \
- $(ESX_DRIVER_GENERATED)
-
HYPERV_DRIVER_SOURCES = \
hyperv/hyperv_private.h \
hyperv/hyperv_driver.c hyperv/hyperv_driver.h \
@@ -1325,9 +1295,9 @@ libvirt_driver_la_LIBADD = \
# All .syms files should be placed in exactly one of these three lists,
# depending on whether they are stored in git and/or used in the build.
-SYM_FILES = $(USED_SYM_FILES)
-USED_SYM_FILES = $(srcdir)/libvirt_private.syms
-GENERATED_SYM_FILES = \
+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 \
@@ -1613,33 +1583,6 @@ EXTRA_DIST += lxc/lxc.conf lxc/libvirtd_lxc.aug
lxc/test_libvirtd_lxc.aug.in
-BUILT_SOURCES += $(ESX_DRIVER_GENERATED)
-
-ESX_GENERATED_STAMP = .esx_vi_generator.stamp
-
-EXTRA_DIST += $(ESX_GENERATED_STAMP)
-
-$(ESX_DRIVER_GENERATED): $(ESX_GENERATED_STAMP)
-
-$(ESX_GENERATED_STAMP): $(srcdir)/esx/esx_vi_generator.input \
- $(srcdir)/esx/esx_vi_generator.py
- $(AM_V_GEN)srcdir=$(srcdir) $(PYTHON) $(srcdir)/esx/esx_vi_generator.py \
- && touch $@
-
-MAINTAINERCLEANFILES += $(ESX_DRIVER_GENERATED) $(ESX_GENERATED_STAMP)
-
-
-if WITH_ESX
-noinst_LTLIBRARIES += libvirt_driver_esx.la
-libvirt_la_BUILT_LIBADD += libvirt_driver_esx.la
-libvirt_driver_esx_la_CFLAGS = $(CURL_CFLAGS) \
- -I$(srcdir)/conf -I$(srcdir)/vmx $(AM_CFLAGS)
-libvirt_driver_esx_la_LDFLAGS = $(AM_LDFLAGS)
-libvirt_driver_esx_la_LIBADD = $(CURL_LIBS)
-libvirt_driver_esx_la_SOURCES = $(ESX_DRIVER_SOURCES)
-libvirt_driver_esx_la_DEPENDENCIES = $(ESX_DRIVER_GENERATED)
-endif WITH_ESX
-
BUILT_SOURCES += $(HYPERV_DRIVER_GENERATED)
@@ -2097,8 +2040,6 @@ EXTRA_DIST += \
$(VBOX_DRIVER_SOURCES) \
$(XENAPI_DRIVER_SOURCES) \
$(LIBXL_DRIVER_SOURCES) \
- $(ESX_DRIVER_SOURCES) \
- $(ESX_DRIVER_EXTRA_DIST) \
$(HYPERV_DRIVER_SOURCES) \
$(HYPERV_DRIVER_EXTRA_DIST) \
$(VZ_DRIVER_SOURCES) \
@@ -2289,12 +2230,6 @@ else ! WITH_LINUX
SYM_FILES += $(srcdir)/libvirt_linux.syms
endif ! WITH_LINUX
-if WITH_ESX
-USED_SYM_FILES += $(srcdir)/libvirt_esx.syms
-else ! WITH_ESX
-SYM_FILES += $(srcdir)/libvirt_esx.syms
-endif ! WITH_ESX
-
if WITH_REMOTE
USED_SYM_FILES += $(srcdir)/libvirt_remote.syms
else ! WITH_REMOTE
diff --git a/src/esx/Makefile.inc.am b/src/esx/Makefile.inc.am
new file mode 100644
index 0000000000..152dd7b979
--- /dev/null
+++ b/src/esx/Makefile.inc.am
@@ -0,0 +1,90 @@
+ESX_DRIVER_SOURCES = \
+ esx/esx_private.h \
+ esx/esx_driver.c \
+ esx/esx_driver.h \
+ esx/esx_interface_driver.c \
+ esx/esx_interface_driver.h \
+ esx/esx_network_driver.c \
+ esx/esx_network_driver.h \
+ esx/esx_storage_driver.c \
+ esx/esx_storage_driver.h \
+ esx/esx_storage_backend_vmfs.c \
+ esx/esx_storage_backend_vmfs.h \
+ esx/esx_storage_backend_iscsi.c \
+ esx/esx_storage_backend_iscsi.h \
+ esx/esx_stream.c \
+ esx/esx_stream.h \
+ esx/esx_util.c \
+ esx/esx_util.h \
+ esx/esx_vi.c \
+ esx/esx_vi.h \
+ esx/esx_vi_methods.c \
+ esx/esx_vi_methods.h \
+ esx/esx_vi_types.c \
+ esx/esx_vi_types.h \
+ $(NULL)
+
+ESX_DRIVER_GENERATED = \
+ esx/esx_vi_methods.generated.c \
+ esx/esx_vi_methods.generated.h \
+ esx/esx_vi_methods.generated.macro \
+ esx/esx_vi_types.generated.c \
+ esx/esx_vi_types.generated.h \
+ esx/esx_vi_types.generated.typedef \
+ esx/esx_vi_types.generated.typeenum \
+ esx/esx_vi_types.generated.typetostring \
+ esx/esx_vi_types.generated.typefromstring \
+ esx/esx_vi.generated.c \
+ esx/esx_vi.generated.h \
+ $(NULL)
+
+ESX_DRIVER_EXTRA_DIST = \
+ esx/README \
+ esx/esx_vi_generator.input \
+ esx/esx_vi_generator.py \
+ $(ESX_DRIVER_GENERATED) \
+ $(NULL)
+
+ESX_GENERATED_STAMP = .esx_vi_generator.stamp
+
+DRIVER_SOURCE_FILES += $(ESX_DRIVER_SOURCES)
+
+EXTRA_DIST += \
+ $(ESX_DRIVER_SOURCES) \
+ $(ESX_DRIVER_EXTRA_DIST) \
+ $(ESX_GENERATED_STAMP) \
+ $(NULL)
+
+BUILT_SOURCES += $(ESX_DRIVER_GENERATED)
+
+$(ESX_DRIVER_GENERATED): $(ESX_GENERATED_STAMP)
+
+$(ESX_GENERATED_STAMP): $(srcdir)/esx/esx_vi_generator.input \
+ $(srcdir)/esx/esx_vi_generator.py
+ $(AM_V_GEN)srcdir=$(srcdir) $(PYTHON) $(srcdir)/esx/esx_vi_generator.py \
+ && touch $@
+
+MAINTAINERCLEANFILES += $(ESX_DRIVER_GENERATED) $(ESX_GENERATED_STAMP)
+
+if WITH_ESX
+USED_SYM_FILES += $(srcdir)/libvirt_esx.syms
+else ! WITH_ESX
+SYM_FILES += $(srcdir)/libvirt_esx.syms
+endif ! WITH_ESX
+
+
+if WITH_ESX
+noinst_LTLIBRARIES += libvirt_driver_esx.la
+libvirt_la_BUILT_LIBADD += libvirt_driver_esx.la
+libvirt_driver_esx_la_CFLAGS = \
+ $(CURL_CFLAGS) \
+ -I$(srcdir)/conf \
+ -I$(srcdir)/vmx \
+ $(AM_CFLAGS) \
+ $(NULL)
+libvirt_driver_esx_la_LDFLAGS = $(AM_LDFLAGS)
+libvirt_driver_esx_la_LIBADD = $(CURL_LIBS)
+libvirt_driver_esx_la_SOURCES = $(ESX_DRIVER_SOURCES)
+libvirt_driver_esx_la_DEPENDENCIES = $(ESX_DRIVER_GENERATED)
+
+endif WITH_ESX
--
2.14.3
6:56 a.m.
New subject: [libvirt] [PATCH v1 05/16] make: split hyperv driver build rules into hyperv/Makefile.inc.am
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
src/Makefile.am | 47 +-----------------------------------
src/hyperv/Makefile.inc.am | 59 ++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 60 insertions(+), 46 deletions(-)
create mode 100644 src/hyperv/Makefile.inc.am
diff --git a/src/Makefile.am b/src/Makefile.am
index b952bb00e2..a5986cee99 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -77,6 +77,7 @@ include uml/Makefile.inc.am
include phyp/Makefile.inc.am
include test/Makefile.inc.am
include esx/Makefile.inc.am
+include hyperv/Makefile.inc.am
install-data-extra: $(INSTALL_DATA_DIRS:%=install-data-%)
uninstall-data-extra: $(INSTALL_DATA_DIRS:%=install-data-%)
@@ -765,7 +766,6 @@ check-drivername:
EXTRA_DIST += check-drivername.pl
DRIVER_SOURCE_FILES += \
- $(HYPERV_DRIVER_SORUCES) \
$(INTERFACE_DRIVER_SOURCES) \
$(LIBXL_DRIVER_SOURCES) \
$(LXC_DRIVER_SOURCES) \
@@ -984,24 +984,6 @@ LIBXL_DRIVER_SOURCES = \
libxl/libxl_logger.c libxl/libxl_logger.h \
libxl/libxl_migration.c libxl/libxl_migration.h
-HYPERV_DRIVER_SOURCES = \
- hyperv/hyperv_private.h \
- hyperv/hyperv_driver.c hyperv/hyperv_driver.h \
- hyperv/hyperv_util.c hyperv/hyperv_util.h \
- hyperv/hyperv_wmi.c hyperv/hyperv_wmi.h \
- hyperv/hyperv_wmi_classes.c hyperv/hyperv_wmi_classes.h \
- hyperv/openwsman.h
-
-HYPERV_DRIVER_GENERATED = \
- hyperv/hyperv_wmi_classes.generated.c \
- hyperv/hyperv_wmi_classes.generated.h \
- hyperv/hyperv_wmi_classes.generated.typedef
-
-HYPERV_DRIVER_EXTRA_DIST = \
- hyperv/hyperv_wmi_generator.input \
- hyperv/hyperv_wmi_generator.py \
- $(HYPERV_DRIVER_GENERATED)
-
VZ_DRIVER_SOURCES = \
vz/vz_driver.h \
vz/vz_driver.c \
@@ -1584,31 +1566,6 @@ EXTRA_DIST += lxc/lxc.conf lxc/libvirtd_lxc.aug
lxc/test_libvirtd_lxc.aug.in
-BUILT_SOURCES += $(HYPERV_DRIVER_GENERATED)
-
-HYPERV_GENERATED_STAMP = .hyperv_wmi_generator.stamp
-
-EXTRA_DIST += $(HYPERV_GENERATED_STAMP)
-
-$(HYPERV_DRIVER_GENERATED): $(HYPERV_GENERATED_STAMP)
-
-$(HYPERV_GENERATED_STAMP): $(srcdir)/hyperv/hyperv_wmi_generator.input \
- $(srcdir)/hyperv/hyperv_wmi_generator.py
- $(AM_V_GEN)srcdir=$(srcdir) $(PYTHON) \
- $(srcdir)/hyperv/hyperv_wmi_generator.py \
- && touch $@
-
-MAINTAINERCLEANFILES += $(HYPERV_DRIVER_GENERATED) $(HYPERV_GENERATED_STAMP)
-
-if WITH_HYPERV
-noinst_LTLIBRARIES += libvirt_driver_hyperv.la
-libvirt_la_BUILT_LIBADD += libvirt_driver_hyperv.la
-libvirt_driver_hyperv_la_CFLAGS = $(OPENWSMAN_CFLAGS) \
- -I$(srcdir)/conf $(AM_CFLAGS)
-libvirt_driver_hyperv_la_LDFLAGS = $(AM_LDFLAGS)
-libvirt_driver_hyperv_la_LIBADD = $(OPENWSMAN_LIBS)
-libvirt_driver_hyperv_la_SOURCES = $(HYPERV_DRIVER_SOURCES)
-endif WITH_HYPERV
if WITH_VZ
noinst_LTLIBRARIES += libvirt_driver_vz_impl.la
@@ -2040,8 +1997,6 @@ EXTRA_DIST += \
$(VBOX_DRIVER_SOURCES) \
$(XENAPI_DRIVER_SOURCES) \
$(LIBXL_DRIVER_SOURCES) \
- $(HYPERV_DRIVER_SOURCES) \
- $(HYPERV_DRIVER_EXTRA_DIST) \
$(VZ_DRIVER_SOURCES) \
$(BHYVE_DRIVER_SOURCES) \
$(NETWORK_DRIVER_SOURCES) \
diff --git a/src/hyperv/Makefile.inc.am b/src/hyperv/Makefile.inc.am
new file mode 100644
index 0000000000..1478d77b08
--- /dev/null
+++ b/src/hyperv/Makefile.inc.am
@@ -0,0 +1,59 @@
+HYPERV_DRIVER_SOURCES = \
+ hyperv/hyperv_private.h \
+ hyperv/hyperv_driver.c \
+ hyperv/hyperv_driver.h \
+ hyperv/hyperv_util.c \
+ hyperv/hyperv_util.h \
+ hyperv/hyperv_wmi.c \
+ hyperv/hyperv_wmi.h \
+ hyperv/hyperv_wmi_classes.c \
+ hyperv/hyperv_wmi_classes.h \
+ hyperv/openwsman.h \
+ $(NULL)
+
+HYPERV_DRIVER_GENERATED = \
+ hyperv/hyperv_wmi_classes.generated.c \
+ hyperv/hyperv_wmi_classes.generated.h \
+ hyperv/hyperv_wmi_classes.generated.typedef \
+ $(NULL)
+
+HYPERV_GENERATED_STAMP = .hyperv_wmi_generator.stamp
+
+HYPERV_DRIVER_EXTRA_DIST = \
+ hyperv/hyperv_wmi_generator.input \
+ hyperv/hyperv_wmi_generator.py \
+ $(HYPERV_DRIVER_GENERATED) \
+ $(HYPERV_GENERATED_STAMP) \
+ $(NULL)
+
+DRIVER_SOURCE_FILES += $(HYPERV_DRIVER_SORUCES)
+
+EXTRA_DIST += \
+ $(HYPERV_DRIVER_SORUCES) \
+ $(HYPERV_DRIVER_EXTRA_DIST) \
+ $(NULL)
+
+BUILT_SOURCES += $(HYPERV_DRIVER_GENERATED)
+
+$(HYPERV_DRIVER_GENERATED): $(HYPERV_GENERATED_STAMP)
+
+$(HYPERV_GENERATED_STAMP): $(srcdir)/hyperv/hyperv_wmi_generator.input \
+ $(srcdir)/hyperv/hyperv_wmi_generator.py
+ $(AM_V_GEN)srcdir=$(srcdir) $(PYTHON) \
+ $(srcdir)/hyperv/hyperv_wmi_generator.py \
+ && touch $@
+
+MAINTAINERCLEANFILES += $(HYPERV_DRIVER_GENERATED)
+
+if WITH_HYPERV
+noinst_LTLIBRARIES += libvirt_driver_hyperv.la
+libvirt_la_BUILT_LIBADD += libvirt_driver_hyperv.la
+libvirt_driver_hyperv_la_CFLAGS = \
+ $(OPENWSMAN_CFLAGS) \
+ -I$(srcdir)/conf \
+ $(AM_CFLAGS) \
+ $(NULL)
+libvirt_driver_hyperv_la_LDFLAGS = $(AM_LDFLAGS)
+libvirt_driver_hyperv_la_LIBADD = $(OPENWSMAN_LIBS)
+libvirt_driver_hyperv_la_SOURCES = $(HYPERV_DRIVER_SOURCES)
+endif WITH_HYPERV
--
2.14.3
6:56 a.m.
New subject: [libvirt] [PATCH v1 06/16] make: split vmware driver build rules into vmware/Makefile.inc.am
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
src/Makefile.am | 21 +--------------------
src/vmware/Makefile.inc.am | 27 +++++++++++++++++++++++++++
2 files changed, 28 insertions(+), 20 deletions(-)
create mode 100644 src/vmware/Makefile.inc.am
diff --git a/src/Makefile.am b/src/Makefile.am
index a5986cee99..0c1cf924e8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -78,6 +78,7 @@ include phyp/Makefile.inc.am
include test/Makefile.inc.am
include esx/Makefile.inc.am
include hyperv/Makefile.inc.am
+include vmware/Makefile.inc.am
install-data-extra: $(INSTALL_DATA_DIRS:%=install-data-%)
uninstall-data-extra: $(INSTALL_DATA_DIRS:%=install-data-%)
@@ -782,7 +783,6 @@ DRIVER_SOURCE_FILES += \
$(STORAGE_DRIVER_SOURCES) \
$(VBOX_DRIVER_SOURCES) \
vbox/vbox_tmpl.c \
- $(VMWARE_DRIVER_SOURCES) \
$(XEN_DRIVER_SOURCES) \
$(XENAPI_DRIVER_SOURCES) \
$(NULL)
@@ -914,10 +914,6 @@ OPENVZ_DRIVER_SOURCES = \
openvz/openvz_driver.c openvz/openvz_driver.h \
openvz/openvz_util.c openvz/openvz_util.h
-VMWARE_DRIVER_SOURCES = \
- vmware/vmware_driver.c vmware/vmware_driver.h \
- vmware/vmware_conf.c vmware/vmware_conf.h
-
VBOX_DRIVER_SOURCES = \
vbox/vbox_glue.c vbox/vbox_glue.h \
vbox/vbox_driver.c vbox/vbox_driver.h \
@@ -1419,14 +1415,6 @@ libvirt_driver_openvz_la_CFLAGS = \
libvirt_driver_openvz_la_SOURCES = $(OPENVZ_DRIVER_SOURCES)
endif WITH_OPENVZ
-if WITH_VMWARE
-noinst_LTLIBRARIES += libvirt_driver_vmware.la
-libvirt_la_BUILT_LIBADD += libvirt_driver_vmware.la
-libvirt_driver_vmware_la_CFLAGS = \
- -I$(srcdir)/conf -I$(srcdir)/vmx $(AM_CFLAGS)
-libvirt_driver_vmware_la_SOURCES = $(VMWARE_DRIVER_SOURCES)
-endif WITH_VMWARE
-
if WITH_VBOX
noinst_LTLIBRARIES += \
libvirt_driver_vbox_impl.la
@@ -2022,7 +2010,6 @@ EXTRA_DIST += \
$(SECRET_DRIVER_SOURCES) \
$(SECRET_UTIL_SOURCES) \
$(VBOX_DRIVER_EXTRA_DIST) \
- $(VMWARE_DRIVER_SOURCES) \
$(XENCONFIG_SOURCES) \
$(XENCONFIG_LIBXL_SOURCES) \
$(ACCESS_DRIVER_POLKIT_POLICY)
@@ -2203,12 +2190,6 @@ else ! WITH_VMX
SYM_FILES += $(srcdir)/libvirt_vmx.syms
endif ! WITH_VMX
-if WITH_VMWARE
-USED_SYM_FILES += $(srcdir)/libvirt_vmware.syms
-else ! WITH_VMWARE
-SYM_FILES += $(srcdir)/libvirt_vmware.syms
-endif ! WITH_VMWARE
-
if WITH_XENCONFIG
USED_SYM_FILES += $(srcdir)/libvirt_xenconfig.syms
else ! WITH_XENCONFIG
diff --git a/src/vmware/Makefile.inc.am b/src/vmware/Makefile.inc.am
new file mode 100644
index 0000000000..0fbf866030
--- /dev/null
+++ b/src/vmware/Makefile.inc.am
@@ -0,0 +1,27 @@
+VMWARE_DRIVER_SOURCES = \
+ vmware/vmware_driver.c \
+ vmware/vmware_driver.h \
+ vmware/vmware_conf.c \
+ vmware/vmware_conf.h \
+ $(NULL)
+
+DRIVER_SOURCE_FILES += $(VMWARE_DRIVER_SOURCES)
+
+EXTRA_DIST += $(VMWARE_DRIVER_SOURCES)
+
+if WITH_VMWARE
+noinst_LTLIBRARIES += libvirt_driver_vmware.la
+libvirt_la_BUILT_LIBADD += libvirt_driver_vmware.la
+libvirt_driver_vmware_la_CFLAGS = \
+ -I$(srcdir)/conf \
+ -I$(srcdir)/vmx \
+ $(AM_CFLAGS) \
+ $(NULL)
+libvirt_driver_vmware_la_SOURCES = $(VMWARE_DRIVER_SOURCES)
+endif WITH_VMWARE
+
+if WITH_VMWARE
+USED_SYM_FILES += $(srcdir)/libvirt_vmware.syms
+else ! WITH_VMWARE
+SYM_FILES += $(srcdir)/libvirt_vmware.syms
+endif ! WITH_VMWARE
--
2.14.3
6:56 a.m.
New subject: [libvirt] [PATCH v1 07/16] make: split vbox driver build rules into vbox/Makefile.inc.am
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
src/Makefile.am | 50 +------------------------------
src/vbox/Makefile.inc.am | 76 ++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 77 insertions(+), 49 deletions(-)
create mode 100644 src/vbox/Makefile.inc.am
diff --git a/src/Makefile.am b/src/Makefile.am
index 0c1cf924e8..6100325595 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -79,6 +79,7 @@ include test/Makefile.inc.am
include esx/Makefile.inc.am
include hyperv/Makefile.inc.am
include vmware/Makefile.inc.am
+include vbox/Makefile.inc.am
install-data-extra: $(INSTALL_DATA_DIRS:%=install-data-%)
uninstall-data-extra: $(INSTALL_DATA_DIRS:%=install-data-%)
@@ -781,8 +782,6 @@ DRIVER_SOURCE_FILES += \
$(REMOTE_DRIVER_SOURCES) \
$(SECRET_DRIVER_SOURCES) \
$(STORAGE_DRIVER_SOURCES) \
- $(VBOX_DRIVER_SOURCES) \
- vbox/vbox_tmpl.c \
$(XEN_DRIVER_SOURCES) \
$(XENAPI_DRIVER_SOURCES) \
$(NULL)
@@ -914,30 +913,6 @@ OPENVZ_DRIVER_SOURCES = \
openvz/openvz_driver.c openvz/openvz_driver.h \
openvz/openvz_util.c openvz/openvz_util.h
-VBOX_DRIVER_SOURCES = \
- vbox/vbox_glue.c vbox/vbox_glue.h \
- vbox/vbox_driver.c vbox/vbox_driver.h \
- vbox/vbox_snapshot_conf.c vbox/vbox_snapshot_conf.h \
- vbox/vbox_V4_0.c vbox/vbox_CAPI_v4_0.h \
- vbox/vbox_V4_1.c vbox/vbox_CAPI_v4_1.h \
- vbox/vbox_V4_2.c vbox/vbox_CAPI_v4_2.h \
- vbox/vbox_V4_2_20.c vbox/vbox_CAPI_v4_2_20.h \
- vbox/vbox_V4_3.c vbox/vbox_CAPI_v4_3.h \
- vbox/vbox_V4_3_4.c vbox/vbox_CAPI_v4_3_4.h \
- vbox/vbox_V5_0.c vbox/vbox_CAPI_v5_0.h \
- vbox/vbox_V5_1.c vbox/vbox_CAPI_v5_1.h \
- vbox/vbox_V5_2.c vbox/vbox_CAPI_v5_2.h \
- vbox/vbox_common.c vbox/vbox_common.h \
- vbox/vbox_uniformed_api.h \
- vbox/vbox_get_driver.h \
- vbox/vbox_network.c \
- vbox/vbox_storage.c
-
-VBOX_DRIVER_EXTRA_DIST = \
- vbox/vbox_tmpl.c vbox/README \
- vbox/vbox_MSCOMGlue.c vbox/vbox_MSCOMGlue.h \
- vbox/vbox_XPCOMCGlue.c vbox/vbox_XPCOMCGlue.h
-
QEMU_DRIVER_SOURCES = \
qemu/qemu_agent.c qemu/qemu_agent.h \
qemu/qemu_alias.c qemu/qemu_alias.h \
@@ -1415,27 +1390,6 @@ libvirt_driver_openvz_la_CFLAGS = \
libvirt_driver_openvz_la_SOURCES = $(OPENVZ_DRIVER_SOURCES)
endif WITH_OPENVZ
-if WITH_VBOX
-noinst_LTLIBRARIES += \
- libvirt_driver_vbox_impl.la
-libvirt_driver_vbox_la_SOURCES =
-libvirt_driver_vbox_la_LIBADD = libvirt_driver_vbox_impl.la
-mod_LTLIBRARIES += \
- libvirt_driver_vbox.la
-libvirt_driver_vbox_la_LIBADD += libvirt.la ../gnulib/lib/libgnu.la
-libvirt_driver_vbox_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF)
-
-libvirt_driver_vbox_impl_la_CFLAGS = \
- -I$(srcdir)/conf \
- $(AM_CFLAGS) \
- -DVBOX_DRIVER
-libvirt_driver_vbox_impl_la_LDFLAGS = $(AM_LDFLAGS)
-libvirt_driver_vbox_impl_la_LIBADD = $(DLOPEN_LIBS) \
- $(WIN32_EXTRA_LIBS) \
- $(LIBXML_LIBS)
-libvirt_driver_vbox_impl_la_SOURCES = $(VBOX_DRIVER_SOURCES)
-endif WITH_VBOX
-
if WITH_XENAPI
noinst_LTLIBRARIES += libvirt_driver_xenapi.la
libvirt_la_BUILT_LIBADD += libvirt_driver_xenapi.la
@@ -1982,7 +1936,6 @@ EXTRA_DIST += \
$(QEMU_DRIVER_SOURCES) \
$(LXC_DRIVER_SOURCES) \
$(OPENVZ_DRIVER_SOURCES) \
- $(VBOX_DRIVER_SOURCES) \
$(XENAPI_DRIVER_SOURCES) \
$(LIBXL_DRIVER_SOURCES) \
$(VZ_DRIVER_SOURCES) \
@@ -2009,7 +1962,6 @@ EXTRA_DIST += \
$(SECURITY_DRIVER_APPARMOR_SOURCES) \
$(SECRET_DRIVER_SOURCES) \
$(SECRET_UTIL_SOURCES) \
- $(VBOX_DRIVER_EXTRA_DIST) \
$(XENCONFIG_SOURCES) \
$(XENCONFIG_LIBXL_SOURCES) \
$(ACCESS_DRIVER_POLKIT_POLICY)
diff --git a/src/vbox/Makefile.inc.am b/src/vbox/Makefile.inc.am
new file mode 100644
index 0000000000..8c76f84e82
--- /dev/null
+++ b/src/vbox/Makefile.inc.am
@@ -0,0 +1,76 @@
+VBOX_DRIVER_SOURCES = \
+ vbox/vbox_glue.c \
+ vbox/vbox_glue.h \
+ vbox/vbox_driver.c \
+ vbox/vbox_driver.h \
+ vbox/vbox_snapshot_conf.c \
+ vbox/vbox_snapshot_conf.h \
+ vbox/vbox_V4_0.c \
+ vbox/vbox_CAPI_v4_0.h \
+ vbox/vbox_V4_1.c \
+ vbox/vbox_CAPI_v4_1.h \
+ vbox/vbox_V4_2.c \
+ vbox/vbox_CAPI_v4_2.h \
+ vbox/vbox_V4_2_20.c \
+ vbox/vbox_CAPI_v4_2_20.h \
+ vbox/vbox_V4_3.c \
+ vbox/vbox_CAPI_v4_3.h \
+ vbox/vbox_V4_3_4.c \
+ vbox/vbox_CAPI_v4_3_4.h \
+ vbox/vbox_V5_0.c \
+ vbox/vbox_CAPI_v5_0.h \
+ vbox/vbox_V5_1.c \
+ vbox/vbox_CAPI_v5_1.h \
+ vbox/vbox_V5_2.c \
+ vbox/vbox_CAPI_v5_2.h \
+ vbox/vbox_common.c \
+ vbox/vbox_common.h \
+ vbox/vbox_uniformed_api.h \
+ vbox/vbox_get_driver.h \
+ vbox/vbox_network.c \
+ vbox/vbox_storage.c \
+ $(NULL)
+
+VBOX_DRIVER_EXTRA_DIST = \
+ vbox/vbox_tmpl.c \
+ vbox/README \
+ vbox/vbox_MSCOMGlue.c \
+ vbox/vbox_MSCOMGlue.h \
+ vbox/vbox_XPCOMCGlue.c \
+ vbox/vbox_XPCOMCGlue.h \
+ $(NULL)
+
+DRIVER_SOURCE_FILES += \
+ $(VBOX_DRIVER_SOURCES) \
+ vbox/vbox_tmpl.c \
+ $(NULL)
+
+EXTRA_DIST += \
+ $(VBOX_DRIVER_SOURCES) \
+ $(VBOX_DRIVER_EXTRA_DIST) \
+ $(NULL)
+
+if WITH_VBOX
+noinst_LTLIBRARIES += libvirt_driver_vbox_impl.la
+libvirt_driver_vbox_la_SOURCES =
+libvirt_driver_vbox_la_LIBADD = \
+ libvirt_driver_vbox_impl.la \
+ libvirt.la \
+ ../gnulib/lib/libgnu.la \
+ $(NULL)
+mod_LTLIBRARIES += libvirt_driver_vbox.la
+libvirt_driver_vbox_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF)
+
+libvirt_driver_vbox_impl_la_CFLAGS = \
+ -I$(srcdir)/conf \
+ $(AM_CFLAGS) \
+ -DVBOX_DRIVER \
+ $(NULL)
+libvirt_driver_vbox_impl_la_LDFLAGS = $(AM_LDFLAGS)
+libvirt_driver_vbox_impl_la_LIBADD = \
+ $(DLOPEN_LIBS) \
+ $(WIN32_EXTRA_LIBS) \
+ $(LIBXML_LIBS) \
+ $(NULL)
+libvirt_driver_vbox_impl_la_SOURCES = $(VBOX_DRIVER_SOURCES)
+endif WITH_VBOX
--
2.14.3
6:56 a.m.
New subject: [libvirt] [PATCH v1 08/16] make: split openvz driver build rules into openvz/Makefile.inc.am
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
src/Makefile.am | 22 +---------------------
src/openvz/Makefile.inc.am | 28 ++++++++++++++++++++++++++++
2 files changed, 29 insertions(+), 21 deletions(-)
create mode 100644 src/openvz/Makefile.inc.am
diff --git a/src/Makefile.am b/src/Makefile.am
index 6100325595..7927bcbb04 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -80,6 +80,7 @@ include esx/Makefile.inc.am
include hyperv/Makefile.inc.am
include vmware/Makefile.inc.am
include vbox/Makefile.inc.am
+include openvz/Makefile.inc.am
install-data-extra: $(INSTALL_DATA_DIRS:%=install-data-%)
uninstall-data-extra: $(INSTALL_DATA_DIRS:%=install-data-%)
@@ -776,7 +777,6 @@ DRIVER_SOURCE_FILES += \
$(NODE_DEVICE_DRIVER_HAL_SOURCES) \
$(NODE_DEVICE_DRIVER_UDEV_SOURCES) \
$(NWFILTER_DRIVER_SOURCES) \
- $(OPENVZ_DRIVER_SOURCES) \
$(VZ_DRIVER_SOURCES) \
$(QEMU_DRIVER_SOURCES) \
$(REMOTE_DRIVER_SOURCES) \
@@ -908,11 +908,6 @@ SECURITY_DRIVER_APPARMOR_HELPER_SOURCES = \
$(DATATYPES_SOURCES) \
security/virt-aa-helper.c
-OPENVZ_DRIVER_SOURCES = \
- openvz/openvz_conf.c openvz/openvz_conf.h \
- openvz/openvz_driver.c openvz/openvz_driver.h \
- openvz/openvz_util.c openvz/openvz_util.h
-
QEMU_DRIVER_SOURCES = \
qemu/qemu_agent.c qemu/qemu_agent.h \
qemu/qemu_alias.c qemu/qemu_alias.h \
@@ -1382,14 +1377,6 @@ libvirt_driver_xen_impl_la_LIBADD = $(XEN_LIBS)
libvirt_xenconfig.la
libvirt_driver_xen_impl_la_SOURCES = $(XEN_DRIVER_SOURCES)
endif WITH_XEN
-if WITH_OPENVZ
-noinst_LTLIBRARIES += libvirt_driver_openvz.la
-libvirt_la_BUILT_LIBADD += libvirt_driver_openvz.la
-libvirt_driver_openvz_la_CFLAGS = \
- -I$(srcdir)/conf $(AM_CFLAGS)
-libvirt_driver_openvz_la_SOURCES = $(OPENVZ_DRIVER_SOURCES)
-endif WITH_OPENVZ
-
if WITH_XENAPI
noinst_LTLIBRARIES += libvirt_driver_xenapi.la
libvirt_la_BUILT_LIBADD += libvirt_driver_xenapi.la
@@ -1935,7 +1922,6 @@ EXTRA_DIST += \
$(XEN_DRIVER_SOURCES) \
$(QEMU_DRIVER_SOURCES) \
$(LXC_DRIVER_SOURCES) \
- $(OPENVZ_DRIVER_SOURCES) \
$(XENAPI_DRIVER_SOURCES) \
$(LIBXL_DRIVER_SOURCES) \
$(VZ_DRIVER_SOURCES) \
@@ -2130,12 +2116,6 @@ else ! WITH_REMOTE
SYM_FILES += $(srcdir)/libvirt_remote.syms
endif ! WITH_REMOTE
-if WITH_OPENVZ
-USED_SYM_FILES += $(srcdir)/libvirt_openvz.syms
-else ! WITH_OPENVZ
-SYM_FILES += $(srcdir)/libvirt_openvz.syms
-endif ! WITH_OPENVZ
-
if WITH_VMX
USED_SYM_FILES += $(srcdir)/libvirt_vmx.syms
else ! WITH_VMX
diff --git a/src/openvz/Makefile.inc.am b/src/openvz/Makefile.inc.am
new file mode 100644
index 0000000000..baad737362
--- /dev/null
+++ b/src/openvz/Makefile.inc.am
@@ -0,0 +1,28 @@
+OPENVZ_DRIVER_SOURCES = \
+ openvz/openvz_conf.c \
+ openvz/openvz_conf.h \
+ openvz/openvz_driver.c \
+ openvz/openvz_driver.h \
+ openvz/openvz_util.c \
+ openvz/openvz_util.h \
+ $(NULL)
+
+DRIVER_SOURCE_FILES += $(OPENVZ_DRIVER_SOURCES)
+
+EXTRA_DIST += $(OPENVZ_DRIVER_SOURCES)
+
+if WITH_OPENVZ
+noinst_LTLIBRARIES += libvirt_driver_openvz.la
+libvirt_la_BUILT_LIBADD += libvirt_driver_openvz.la
+libvirt_driver_openvz_la_CFLAGS = \
+ -I$(srcdir)/conf \
+ $(AM_CFLAGS) \
+ $(NULL)
+libvirt_driver_openvz_la_SOURCES = $(OPENVZ_DRIVER_SOURCES)
+endif WITH_OPENVZ
+
+if WITH_OPENVZ
+USED_SYM_FILES += $(srcdir)/libvirt_openvz.syms
+else ! WITH_OPENVZ
+SYM_FILES += $(srcdir)/libvirt_openvz.syms
+endif ! WITH_OPENVZ
--
2.14.3
6:56 a.m.
New subject: [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>
---
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
6:56 a.m.
New subject: [libvirt] [PATCH v1 10/16] make: split bhyve driver build rules into bhyve/Makefile.inc.am
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
src/Makefile.am | 62 ++--------------------------------------
src/bhyve/Makefile.inc.am | 73 +++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 75 insertions(+), 60 deletions(-)
create mode 100644 src/bhyve/Makefile.inc.am
diff --git a/src/Makefile.am b/src/Makefile.am
index 18566ca920..5968f4c5ba 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -89,6 +89,7 @@ include vmware/Makefile.inc.am
include vbox/Makefile.inc.am
include openvz/Makefile.inc.am
include qemu/Makefile.inc.am
+include bhyve/Makefile.inc.am
install-data-extra: $(INSTALL_DATA_DIRS:%=install-data-%)
uninstall-data-extra: $(INSTALL_DATA_DIRS:%=install-data-%)
@@ -792,7 +793,6 @@ DRIVER_SOURCE_FILES += \
$(NULL)
STATEFUL_DRIVER_SOURCE_FILES += \
- $(BHYVE_DRIVER_SOURCES) \
$(INTERFACE_DRIVER_SOURCES) \
$(LIBXL_DRIVER_SOURCES) \
$(LXC_DRIVER_SOURCES) \
@@ -933,28 +933,6 @@ VZ_DRIVER_SOURCES = \
vz/vz_sdk.h \
vz/vz_sdk.c
-BHYVE_DRIVER_SOURCES = \
- bhyve/bhyve_capabilities.c \
- bhyve/bhyve_capabilities.h \
- bhyve/bhyve_command.c \
- bhyve/bhyve_command.h \
- bhyve/bhyve_conf.c \
- bhyve/bhyve_conf.h \
- bhyve/bhyve_parse_command.c \
- bhyve/bhyve_parse_command.h \
- bhyve/bhyve_device.c \
- bhyve/bhyve_device.h \
- bhyve/bhyve_domain.c \
- bhyve/bhyve_domain.h \
- bhyve/bhyve_driver.h \
- bhyve/bhyve_driver.c \
- bhyve/bhyve_monitor.c \
- bhyve/bhyve_monitor.h \
- bhyve/bhyve_process.c \
- bhyve/bhyve_process.h \
- bhyve/bhyve_utils.h \
- $(NULL)
-
NETWORK_DRIVER_SOURCES = \
network/bridge_driver.h network/bridge_driver.c \
network/bridge_driver_platform.h \
@@ -1452,28 +1430,6 @@ libvirt_driver_vz_impl_la_SOURCES = $(VZ_DRIVER_SOURCES)
libvirt_driver_vz_impl_la_LIBADD = $(PARALLELS_SDK_LIBS) $(LIBNL_LIBS)
endif WITH_VZ
-if WITH_BHYVE
-noinst_LTLIBRARIES += libvirt_driver_bhyve_impl.la
-libvirt_driver_bhyve_la_SOURCES =
-libvirt_driver_bhyve_la_LIBADD = libvirt_driver_bhyve_impl.la
-mod_LTLIBRARIES += libvirt_driver_bhyve.la
-libvirt_driver_bhyve_la_LIBADD += libvirt.la ../gnulib/lib/libgnu.la
-libvirt_driver_bhyve_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF)
-
-libvirt_driver_bhyve_impl_la_CFLAGS = \
- -I$(srcdir)/access \
- -I$(srcdir)/conf \
- $(AM_CFLAGS)
-libvirt_driver_bhyve_impl_la_LDFLAGS = $(AM_LDFLAGS)
-libvirt_driver_bhyve_impl_la_SOURCES = $(BHYVE_DRIVER_SOURCES)
-
-conf_DATA += bhyve/bhyve.conf
-augeas_DATA += bhyve/libvirtd_bhyve.aug
-augeastest_DATA += test_libvirtd_bhyve.aug
-endif WITH_BHYVE
-EXTRA_DIST += bhyve/bhyve.conf \
- bhyve/libvirtd_bhyve.aug \
- bhyve/test_libvirtd_bhyve.aug.in
if WITH_NETWORK
noinst_LTLIBRARIES += libvirt_driver_network_impl.la
@@ -1864,7 +1820,6 @@ EXTRA_DIST += \
$(XENAPI_DRIVER_SOURCES) \
$(LIBXL_DRIVER_SOURCES) \
$(VZ_DRIVER_SOURCES) \
- $(BHYVE_DRIVER_SOURCES) \
$(NETWORK_DRIVER_SOURCES) \
$(INTERFACE_DRIVER_SOURCES) \
$(STORAGE_DRIVER_SOURCES) \
@@ -1898,14 +1853,13 @@ check-local: check-augeas
check-augeas-sanlock \
check-augeas-lockd \
check-augeas-libxl \
- check-augeas-bhyve \
check-augeas-libvirtd \
$(NULL)
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
+ 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
@@ -1975,18 +1929,6 @@ else ! WITH_LIBXL
check-augeas-libxl:
endif ! WITH_LIBXL
-if WITH_BHYVE
-test_libvirtd_bhyve.aug: bhyve/test_libvirtd_bhyve.aug.in \
- $(srcdir)/bhyve/bhyve.conf $(AUG_GENTEST)
- $(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/bhyve/bhyve.conf $< $@
-
-check-augeas-bhyve: test_libvirtd_bhyve.aug
- $(AM_V_GEN)if test -x '$(AUGPARSE)'; then \
- '$(AUGPARSE)' -I $(srcdir)/bhyve test_libvirtd_bhyve.aug; \
- fi
-else ! WITH_BHYVE
-check-augeas-bhyve:
-endif ! WITH_BHYVE
test_virtlogd.aug: logging/test_virtlogd.aug.in \
logging/virtlogd.conf $(AUG_GENTEST)
diff --git a/src/bhyve/Makefile.inc.am b/src/bhyve/Makefile.inc.am
new file mode 100644
index 0000000000..fba1b9ef30
--- /dev/null
+++ b/src/bhyve/Makefile.inc.am
@@ -0,0 +1,73 @@
+BHYVE_DRIVER_SOURCES = \
+ bhyve/bhyve_capabilities.c \
+ bhyve/bhyve_capabilities.h \
+ bhyve/bhyve_command.c \
+ bhyve/bhyve_command.h \
+ bhyve/bhyve_conf.c \
+ bhyve/bhyve_conf.h \
+ bhyve/bhyve_parse_command.c \
+ bhyve/bhyve_parse_command.h \
+ bhyve/bhyve_device.c \
+ bhyve/bhyve_device.h \
+ bhyve/bhyve_domain.c \
+ bhyve/bhyve_domain.h \
+ bhyve/bhyve_driver.h \
+ bhyve/bhyve_driver.c \
+ bhyve/bhyve_monitor.c \
+ bhyve/bhyve_monitor.h \
+ bhyve/bhyve_process.c \
+ bhyve/bhyve_process.h \
+ bhyve/bhyve_utils.h \
+ $(NULL)
+
+DRIVER_SOURCE_FILES += $(BHYVE_DRIVER_SOURCES)
+STATEFUL_DRIVER_SOURCE_FILES += $(BHYVE_DRIVER_SOURCES)
+
+EXTRA_DIST += $(BHYVE_DRIVER_SOURCES)
+
+
+if WITH_BHYVE
+noinst_LTLIBRARIES += libvirt_driver_bhyve_impl.la
+libvirt_driver_bhyve_la_SOURCES =
+libvirt_driver_bhyve_la_LIBADD = \
+ libvirt_driver_bhyve_impl.la \
+ libvirt.la \
+ ../gnulib/lib/libgnu.la \
+ $(NULL)
+mod_LTLIBRARIES += libvirt_driver_bhyve.la
+libvirt_driver_bhyve_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF)
+
+libvirt_driver_bhyve_impl_la_CFLAGS = \
+ -I$(srcdir)/access \
+ -I$(srcdir)/conf \
+ $(AM_CFLAGS) \
+ $(NULL)
+libvirt_driver_bhyve_impl_la_LDFLAGS = $(AM_LDFLAGS)
+libvirt_driver_bhyve_impl_la_SOURCES = $(BHYVE_DRIVER_SOURCES)
+
+conf_DATA += bhyve/bhyve.conf
+augeas_DATA += bhyve/libvirtd_bhyve.aug
+augeastest_DATA += test_libvirtd_bhyve.aug
+
+AUGEAS_DIRS += bhyve
+
+test_libvirtd_bhyve.aug: bhyve/test_libvirtd_bhyve.aug.in \
+ $(srcdir)/bhyve/bhyve.conf $(AUG_GENTEST)
+ $(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/bhyve/bhyve.conf $< $@
+
+check-augeas-bhyve: test_libvirtd_bhyve.aug
+ $(AM_V_GEN)if test -x '$(AUGPARSE)'; then \
+ '$(AUGPARSE)' -I $(srcdir)/bhyve test_libvirtd_bhyve.aug; \
+ fi
+
+endif WITH_BHYVE
+
+EXTRA_DIST += \
+ bhyve/bhyve.conf \
+ bhyve/libvirtd_bhyve.aug \
+ bhyve/test_libvirtd_bhyve.aug.in \
+ $(NULL)
+
+.PHONY: \
+ check-augeas-bhyve \
+ $(NULL)
--
2.14.3
6:56 a.m.
New subject: [libvirt] [PATCH v1 11/16] make: split xenconfig driver build rules into xenconfig/Makefile.inc.am
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
src/Makefile.am | 21 +--------------------
src/xenconfig/Makefile.inc.am | 28 ++++++++++++++++++++++++++++
2 files changed, 29 insertions(+), 20 deletions(-)
create mode 100644 src/xenconfig/Makefile.inc.am
diff --git a/src/Makefile.am b/src/Makefile.am
index 5968f4c5ba..2c04d3cc95 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -90,6 +90,7 @@ include vbox/Makefile.inc.am
include openvz/Makefile.inc.am
include qemu/Makefile.inc.am
include bhyve/Makefile.inc.am
+include xenconfig/Makefile.inc.am
install-data-extra: $(INSTALL_DATA_DIRS:%=install-data-%)
uninstall-data-extra: $(INSTALL_DATA_DIRS:%=install-data-%)
@@ -1102,11 +1103,6 @@ CPU_SOURCES = \
VMX_SOURCES = \
vmx/vmx.c vmx/vmx.h
-XENCONFIG_SOURCES = \
- xenconfig/xenxs_private.h \
- xenconfig/xen_common.c xenconfig/xen_common.h \
- xenconfig/xen_sxpr.c xenconfig/xen_sxpr.h \
- xenconfig/xen_xm.c xenconfig/xen_xm.h
if WITH_LIBXL
XENCONFIG_LIBXL_SOURCES = \
$(XENCONFIG_SOURCES) \
@@ -1167,13 +1163,6 @@ libvirt_vmx_la_CFLAGS = \
libvirt_vmx_la_SOURCES = $(VMX_SOURCES)
endif WITH_VMX
-if WITH_XENCONFIG
-noinst_LTLIBRARIES += libvirt_xenconfig.la
-libvirt_la_BUILT_LIBADD += libvirt_xenconfig.la
-libvirt_xenconfig_la_CFLAGS = \
- -I$(srcdir)/conf $(AM_CFLAGS)
-libvirt_xenconfig_la_SOURCES = $(XENCONFIG_SOURCES)
-
if WITH_LIBXL
noinst_LTLIBRARIES += libvirt_xenconfig_libxl.la
libvirt_xenconfig_libxl_la_LIBADD = $(LIBXL_LIBS)
@@ -1181,7 +1170,6 @@ libvirt_xenconfig_libxl_la_CFLAGS = \
-I$(srcdir)/conf -I$(srcdir)/libxl $(AM_CFLAGS)
libvirt_xenconfig_libxl_la_SOURCES = $(XENCONFIG_LIBXL_SOURCES)
endif WITH_LIBXL
-endif WITH_XENCONFIG
noinst_LTLIBRARIES += libvirt_driver.la
@@ -1842,7 +1830,6 @@ EXTRA_DIST += \
$(SECURITY_DRIVER_APPARMOR_SOURCES) \
$(SECRET_DRIVER_SOURCES) \
$(SECRET_UTIL_SOURCES) \
- $(XENCONFIG_SOURCES) \
$(XENCONFIG_LIBXL_SOURCES) \
$(ACCESS_DRIVER_POLKIT_POLICY)
@@ -1990,12 +1977,6 @@ else ! WITH_VMX
SYM_FILES += $(srcdir)/libvirt_vmx.syms
endif ! WITH_VMX
-if WITH_XENCONFIG
-USED_SYM_FILES += $(srcdir)/libvirt_xenconfig.syms
-else ! WITH_XENCONFIG
-SYM_FILES += $(srcdir)/libvirt_xenconfig.syms
-endif ! WITH_XENCONFIG
-
if WITH_SASL
USED_SYM_FILES += $(srcdir)/libvirt_sasl.syms
else ! WITH_SASL
diff --git a/src/xenconfig/Makefile.inc.am b/src/xenconfig/Makefile.inc.am
new file mode 100644
index 0000000000..a87d69990f
--- /dev/null
+++ b/src/xenconfig/Makefile.inc.am
@@ -0,0 +1,28 @@
+XENCONFIG_SOURCES = \
+ xenconfig/xenxs_private.h \
+ xenconfig/xen_common.c \
+ xenconfig/xen_common.h \
+ xenconfig/xen_sxpr.c \
+ xenconfig/xen_sxpr.h \
+ xenconfig/xen_xm.c \
+ xenconfig/xen_xm.h \
+ $(NULL)
+
+EXTRA_DIST += $(XENCONFIG_SOURCES)
+
+if WITH_XENCONFIG
+noinst_LTLIBRARIES += libvirt_xenconfig.la
+libvirt_la_BUILT_LIBADD += libvirt_xenconfig.la
+libvirt_xenconfig_la_CFLAGS = \
+ -I$(srcdir)/conf \
+ $(AM_CFLAGS) \
+ $(NULL)
+libvirt_xenconfig_la_SOURCES = $(XENCONFIG_SOURCES)
+
+endif WITH_XENCONFIG
+
+if WITH_XENCONFIG
+USED_SYM_FILES += $(srcdir)/libvirt_xenconfig.syms
+else ! WITH_XENCONFIG
+SYM_FILES += $(srcdir)/libvirt_xenconfig.syms
+endif ! WITH_XENCONFIG
--
2.14.3
6:56 a.m.
New subject: [libvirt] [PATCH v1 12/16] make: split libxl driver build rules into libxl/Makefile.inc.am
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
src/Makefile.am | 82 +-----------------------------------
src/libxl/Makefile.inc.am | 104 ++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 106 insertions(+), 80 deletions(-)
create mode 100644 src/libxl/Makefile.inc.am
diff --git a/src/Makefile.am b/src/Makefile.am
index 2c04d3cc95..46a5210f8a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -91,6 +91,7 @@ include openvz/Makefile.inc.am
include qemu/Makefile.inc.am
include bhyve/Makefile.inc.am
include xenconfig/Makefile.inc.am
+include libxl/Makefile.inc.am
install-data-extra: $(INSTALL_DATA_DIRS:%=install-data-%)
uninstall-data-extra: $(INSTALL_DATA_DIRS:%=install-data-%)
@@ -778,7 +779,6 @@ EXTRA_DIST += check-drivername.pl
DRIVER_SOURCE_FILES += \
$(INTERFACE_DRIVER_SOURCES) \
- $(LIBXL_DRIVER_SOURCES) \
$(LXC_DRIVER_SOURCES) \
$(NETWORK_DRIVER_SOURCES) \
$(NODE_DEVICE_DRIVER_SOURCES) \
@@ -795,7 +795,6 @@ DRIVER_SOURCE_FILES += \
STATEFUL_DRIVER_SOURCE_FILES += \
$(INTERFACE_DRIVER_SOURCES) \
- $(LIBXL_DRIVER_SOURCES) \
$(LXC_DRIVER_SOURCES) \
$(NETWORK_DRIVER_SOURCES) \
$(NODE_DEVICE_DRIVER_SOURCES) \
@@ -918,14 +917,6 @@ XENAPI_DRIVER_SOURCES = \
xenapi/xenapi_driver_private.h \
xenapi/xenapi_utils.c xenapi/xenapi_utils.h
-LIBXL_DRIVER_SOURCES = \
- libxl/libxl_conf.c libxl/libxl_conf.h \
- libxl/libxl_capabilities.c libxl/libxl_capabilities.h \
- libxl/libxl_domain.c libxl/libxl_domain.h \
- libxl/libxl_driver.c libxl/libxl_driver.h \
- libxl/libxl_logger.c libxl/libxl_logger.h \
- libxl/libxl_migration.c libxl/libxl_migration.h
-
VZ_DRIVER_SOURCES = \
vz/vz_driver.h \
vz/vz_driver.c \
@@ -1103,11 +1094,6 @@ CPU_SOURCES = \
VMX_SOURCES = \
vmx/vmx.c vmx/vmx.h
-if WITH_LIBXL
-XENCONFIG_LIBXL_SOURCES = \
- $(XENCONFIG_SOURCES) \
- xenconfig/xen_xl.c xenconfig/xen_xl.h
-endif WITH_LIBXL
pkgdata_DATA = cpu/cpu_map.xml
@@ -1163,14 +1149,6 @@ libvirt_vmx_la_CFLAGS = \
libvirt_vmx_la_SOURCES = $(VMX_SOURCES)
endif WITH_VMX
-if WITH_LIBXL
-noinst_LTLIBRARIES += libvirt_xenconfig_libxl.la
-libvirt_xenconfig_libxl_la_LIBADD = $(LIBXL_LIBS)
-libvirt_xenconfig_libxl_la_CFLAGS = \
- -I$(srcdir)/conf -I$(srcdir)/libxl $(AM_CFLAGS)
-libvirt_xenconfig_libxl_la_SOURCES = $(XENCONFIG_LIBXL_SOURCES)
-endif WITH_LIBXL
-
noinst_LTLIBRARIES += libvirt_driver.la
libvirt_la_BUILT_LIBADD += libvirt_driver.la
@@ -1328,36 +1306,6 @@ libvirt_driver_xenapi_la_LIBADD = $(XENAPI_LIBS) $(CURL_LIBS)
libvirt_driver_xenapi_la_SOURCES = $(XENAPI_DRIVER_SOURCES)
endif WITH_XENAPI
-if WITH_LIBXL
-noinst_LTLIBRARIES += libvirt_driver_libxl_impl.la
-libvirt_driver_libxl_la_SOURCES =
-libvirt_driver_libxl_la_LIBADD = libvirt_driver_libxl_impl.la
-mod_LTLIBRARIES += libvirt_driver_libxl.la
-libvirt_driver_libxl_la_LIBADD += libvirt.la ../gnulib/lib/libgnu.la
-libvirt_driver_libxl_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF)
-
-libvirt_driver_libxl_impl_la_CFLAGS = \
- $(LIBXL_CFLAGS) \
- $(LIBXML_CFLAGS) \
- -I$(srcdir)/access \
- -I$(srcdir)/conf \
- -I$(srcdir)/secret \
- -I$(srcdir)/xenconfig \
- $(AM_CFLAGS)
-libvirt_driver_libxl_impl_la_LDFLAGS = $(AM_LDFLAGS)
-libvirt_driver_libxl_impl_la_LIBADD = $(LIBXL_LIBS) \
- $(LIBXML_LIBS) \
- libvirt_xenconfig_libxl.la
-libvirt_driver_libxl_impl_la_SOURCES = $(LIBXL_DRIVER_SOURCES)
-
-conf_DATA += libxl/libxl.conf
-augeas_DATA += libxl/libvirtd_libxl.aug
-augeastest_DATA += test_libvirtd_libxl.aug
-CLEANFILES += test_libvirtd_libxl.aug
-
-endif WITH_LIBXL
-EXTRA_DIST += libxl/libxl.conf libxl/libvirtd_libxl.aug \
- libxl/test_libvirtd_libxl.aug.in
@@ -1806,7 +1754,6 @@ EXTRA_DIST += \
$(XEN_DRIVER_SOURCES) \
$(LXC_DRIVER_SOURCES) \
$(XENAPI_DRIVER_SOURCES) \
- $(LIBXL_DRIVER_SOURCES) \
$(VZ_DRIVER_SOURCES) \
$(NETWORK_DRIVER_SOURCES) \
$(INTERFACE_DRIVER_SOURCES) \
@@ -1830,7 +1777,6 @@ EXTRA_DIST += \
$(SECURITY_DRIVER_APPARMOR_SOURCES) \
$(SECRET_DRIVER_SOURCES) \
$(SECRET_UTIL_SOURCES) \
- $(XENCONFIG_LIBXL_SOURCES) \
$(ACCESS_DRIVER_POLKIT_POLICY)
check-local: check-augeas
@@ -1839,13 +1785,12 @@ check-local: check-augeas
check-augeas-lxc \
check-augeas-sanlock \
check-augeas-lockd \
- check-augeas-libxl \
check-augeas-libvirtd \
$(NULL)
check-augeas: $(AUGEAS_DIRS:%=check-augeas-%) \
check-augeas-lxc check-augeas-sanlock \
- check-augeas-lockd check-augeas-virtlockd check-augeas-libxl \
+ check-augeas-lockd check-augeas-virtlockd \
check-augeas-virtlogd check-augeas-libvirtd
AUG_GENTEST = $(PERL) $(top_srcdir)/build-aux/augeas-gentest.pl
@@ -1903,19 +1848,6 @@ check-augeas-virtlockd: test_virtlockd.aug
'$(AUGPARSE)' -I $(srcdir)/locking test_virtlockd.aug; \
fi
-if WITH_LIBXL
-test_libvirtd_libxl.aug: libxl/test_libvirtd_libxl.aug.in \
- $(srcdir)/libxl/libxl.conf $(AUG_GENTEST)
- $(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/libxl/libxl.conf $< $@
-
-check-augeas-libxl: test_libvirtd_libxl.aug
- $(AM_V_GEN)if test -x '$(AUGPARSE)'; then \
- '$(AUGPARSE)' -I $(srcdir)/libxl test_libvirtd_libxl.aug; \
- fi
-else ! WITH_LIBXL
-check-augeas-libxl:
-endif ! WITH_LIBXL
-
test_virtlogd.aug: logging/test_virtlogd.aug.in \
logging/virtlogd.conf $(AUG_GENTEST)
@@ -3186,11 +3118,6 @@ if WITH_LXC
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/run/libvirt/lxc"
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/log/libvirt/lxc"
endif WITH_LXC
-if WITH_LIBXL
- $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/libxl"
- $(MKDIR_P) "$(DESTDIR)$(localstatedir)/run/libvirt/libxl"
- $(MKDIR_P) "$(DESTDIR)$(localstatedir)/log/libvirt/libxl"
-endif WITH_LIBXL
if WITH_XEN
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/xen"
endif WITH_XEN
@@ -3235,11 +3162,6 @@ if WITH_LXC
rmdir "$(DESTDIR)$(localstatedir)/run/libvirt/lxc" ||:
rmdir "$(DESTDIR)$(localstatedir)/log/libvirt/lxc" ||:
endif WITH_LXC
-if WITH_LIBXL
- rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/libxl" ||:
- rmdir "$(DESTDIR)$(localstatedir)/run/libvirt/libxl" ||:
- rmdir "$(DESTDIR)$(localstatedir)/log/libvirt/libxl" ||:
-endif WITH_LIBXL
if WITH_XEN
rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/xen" ||:
endif WITH_XEN
diff --git a/src/libxl/Makefile.inc.am b/src/libxl/Makefile.inc.am
new file mode 100644
index 0000000000..59c136bf4e
--- /dev/null
+++ b/src/libxl/Makefile.inc.am
@@ -0,0 +1,104 @@
+LIBXL_DRIVER_SOURCES = \
+ libxl/libxl_conf.c \
+ libxl/libxl_conf.h \
+ libxl/libxl_capabilities.c \
+ libxl/libxl_capabilities.h \
+ libxl/libxl_domain.c \
+ libxl/libxl_domain.h \
+ libxl/libxl_driver.c \
+ libxl/libxl_driver.h \
+ libxl/libxl_logger.c \
+ libxl/libxl_logger.h \
+ libxl/libxl_migration.c \
+ libxl/libxl_migration.h \
+ $(NULL)
+
+XENCONFIG_LIBXL_SOURCES = \
+ $(XENCONFIG_SOURCES) \
+ xenconfig/xen_xl.c \
+ xenconfig/xen_xl.h \
+ $(NULL)
+
+DRIVER_SOURCE_FILES += $(LIBXL_DRIVER_SOURCES)
+STATEFUL_DRIVER_SOURCE_FILES += $(LIBXL_DRIVER_SOURCES)
+EXTRA_DIST += \
+ $(LIBXL_DRIVER_SOURCES) \
+ $(XENCONFIG_LIBXL_SOURCES) \
+ $(NULL)
+
+if WITH_LIBXL
+noinst_LTLIBRARIES += libvirt_xenconfig_libxl.la
+libvirt_xenconfig_libxl_la_LIBADD = $(LIBXL_LIBS)
+libvirt_xenconfig_libxl_la_CFLAGS = \
+ -I$(srcdir)/conf \
+ -I$(srcdir)/libxl \
+ $(AM_CFLAGS) \
+ $(NULL)
+libvirt_xenconfig_libxl_la_SOURCES = $(XENCONFIG_LIBXL_SOURCES)
+
+noinst_LTLIBRARIES += libvirt_driver_libxl_impl.la
+libvirt_driver_libxl_la_SOURCES =
+libvirt_driver_libxl_la_LIBADD = \
+ libvirt_driver_libxl_impl.la \
+ libvirt.la \
+ ../gnulib/lib/libgnu.la \
+ $(NULL)
+mod_LTLIBRARIES += libvirt_driver_libxl.la
+libvirt_driver_libxl_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF)
+
+libvirt_driver_libxl_impl_la_CFLAGS = \
+ $(LIBXL_CFLAGS) \
+ $(LIBXML_CFLAGS) \
+ -I$(srcdir)/access \
+ -I$(srcdir)/conf \
+ -I$(srcdir)/secret \
+ -I$(srcdir)/xenconfig \
+ $(AM_CFLAGS) \
+ $(NULL)
+libvirt_driver_libxl_impl_la_LDFLAGS = $(AM_LDFLAGS)
+libvirt_driver_libxl_impl_la_LIBADD = \
+ $(LIBXL_LIBS) \
+ $(LIBXML_LIBS) \
+ libvirt_xenconfig_libxl.la \
+ $(NULL)
+libvirt_driver_libxl_impl_la_SOURCES = $(LIBXL_DRIVER_SOURCES)
+
+conf_DATA += libxl/libxl.conf
+augeas_DATA += libxl/libvirtd_libxl.aug
+augeastest_DATA += test_libvirtd_libxl.aug
+CLEANFILES += test_libvirtd_libxl.aug
+
+AUGEAS_DIRS += libxl
+
+test_libvirtd_libxl.aug: libxl/test_libvirtd_libxl.aug.in \
+ $(srcdir)/libxl/libxl.conf $(AUG_GENTEST)
+ $(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/libxl/libxl.conf $< $@
+
+check-augeas-libxl: test_libvirtd_libxl.aug
+ $(AM_V_GEN)if test -x '$(AUGPARSE)'; then \
+ '$(AUGPARSE)' -I $(srcdir)/libxl test_libvirtd_libxl.aug; \
+ fi
+
+INSTALL_DATA_DIRS += libxl
+
+install-data-libxl:
+ $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/libxl"
+ $(MKDIR_P) "$(DESTDIR)$(localstatedir)/run/libvirt/libxl"
+ $(MKDIR_P) "$(DESTDIR)$(localstatedir)/log/libvirt/libxl"
+
+uninstall-data-libxl:
+ rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/libxl" ||:
+ rmdir "$(DESTDIR)$(localstatedir)/run/libvirt/libxl" ||:
+ rmdir "$(DESTDIR)$(localstatedir)/log/libvirt/libxl" ||:
+
+endif WITH_LIBXL
+
+.PHONY: \
+ check-augeas-libxl \
+ $(NULL)
+
+EXTRA_DIST += \
+ libxl/libxl.conf \
+ libxl/libvirtd_libxl.aug \
+ libxl/test_libvirtd_libxl.aug.in \
+ $(NULL)
--
2.14.3
6:56 a.m.
New subject: [libvirt] [PATCH v1 13/16] make: split xen driver build rules into xen/Makefile.inc.am
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
src/Makefile.am | 39 +---------------------------
src/xen/Makefile.inc.am | 67 +++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 68 insertions(+), 38 deletions(-)
create mode 100644 src/xen/Makefile.inc.am
diff --git a/src/Makefile.am b/src/Makefile.am
index 46a5210f8a..1692ed6304 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -92,6 +92,7 @@ include qemu/Makefile.inc.am
include bhyve/Makefile.inc.am
include xenconfig/Makefile.inc.am
include libxl/Makefile.inc.am
+include xen/Makefile.inc.am
install-data-extra: $(INSTALL_DATA_DIRS:%=install-data-%)
uninstall-data-extra: $(INSTALL_DATA_DIRS:%=install-data-%)
@@ -789,7 +790,6 @@ DRIVER_SOURCE_FILES += \
$(REMOTE_DRIVER_SOURCES) \
$(SECRET_DRIVER_SOURCES) \
$(STORAGE_DRIVER_SOURCES) \
- $(XEN_DRIVER_SOURCES) \
$(XENAPI_DRIVER_SOURCES) \
$(NULL)
@@ -801,7 +801,6 @@ STATEFUL_DRIVER_SOURCE_FILES += \
$(NWFILTER_DRIVER_SOURCES) \
$(SECRET_DRIVER_SOURCES) \
$(STORAGE_DRIVER_SOURCES) \
- $(XEN_DRIVER_SOURCES) \
$(VZ_DRIVER_SOURCES) \
$(NULL)
@@ -830,17 +829,6 @@ check-local: check-protocol check-symfile check-symsorting \
check-aclperms check-admin-symfile check-admin-symsorting
.PHONY: check-protocol $(PROTOCOL_STRUCTS:structs=struct)
-# Now the Hypervisor specific drivers
-XEN_DRIVER_SOURCES = \
- xen/block_stats.c xen/block_stats.h \
- xen/xen_hypervisor.c xen/xen_hypervisor.h \
- xen/xen_driver.c xen/xen_driver.h \
- xen/xend_internal.c xen/xend_internal.h \
- xen/xm_internal.c xen/xm_internal.h \
- xen/xs_internal.c xen/xs_internal.h
-if WITH_XEN_INOTIFY
-XEN_DRIVER_SOURCES += xen/xen_inotify.c xen/xen_inotify.h
-endif WITH_XEN_INOTIFY
LXC_MONITOR_PROTOCOL_GENERATED = \
lxc/lxc_monitor_protocol.h \
@@ -1277,24 +1265,6 @@ EXTRA_DIST += \
$(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/genprotocol.pl $(RPCGEN) -h \
$< $(srcdir)/$(subst $(srcdir)/,,$@)
-if WITH_XEN
-noinst_LTLIBRARIES += libvirt_driver_xen_impl.la
-libvirt_driver_xen_la_SOURCES =
-libvirt_driver_xen_la_LIBADD = libvirt_driver_xen_impl.la
-mod_LTLIBRARIES += libvirt_driver_xen.la
-libvirt_driver_xen_la_LIBADD += libvirt.la ../gnulib/lib/libgnu.la
-libvirt_driver_xen_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF)
-
-libvirt_driver_xen_impl_la_CFLAGS = \
- $(XEN_CFLAGS) \
- -I$(srcdir)/access \
- -I$(srcdir)/conf \
- -I$(srcdir)/xenconfig \
- $(AM_CFLAGS)
-libvirt_driver_xen_impl_la_LDFLAGS = $(AM_LDFLAGS)
-libvirt_driver_xen_impl_la_LIBADD = $(XEN_LIBS) libvirt_xenconfig.la
-libvirt_driver_xen_impl_la_SOURCES = $(XEN_DRIVER_SOURCES)
-endif WITH_XEN
if WITH_XENAPI
noinst_LTLIBRARIES += libvirt_driver_xenapi.la
@@ -1751,7 +1721,6 @@ access/viraccessapichecklxc.c: $(srcdir)/rpc/gendispatch.pl \
# Add all conditional sources just in case...
EXTRA_DIST += \
$(REMOTE_DRIVER_SOURCES) \
- $(XEN_DRIVER_SOURCES) \
$(LXC_DRIVER_SOURCES) \
$(XENAPI_DRIVER_SOURCES) \
$(VZ_DRIVER_SOURCES) \
@@ -3118,9 +3087,6 @@ if WITH_LXC
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/run/libvirt/lxc"
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/log/libvirt/lxc"
endif WITH_LXC
-if WITH_XEN
- $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/xen"
-endif WITH_XEN
if WITH_NETWORK
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/network"
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/dnsmasq"
@@ -3162,9 +3128,6 @@ if WITH_LXC
rmdir "$(DESTDIR)$(localstatedir)/run/libvirt/lxc" ||:
rmdir "$(DESTDIR)$(localstatedir)/log/libvirt/lxc" ||:
endif WITH_LXC
-if WITH_XEN
- rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/xen" ||:
-endif WITH_XEN
if WITH_NETWORK
rm -f $(DESTDIR)$(confdir)/qemu/networks/autostart/default.xml
rm -f $(DESTDIR)$(confdir)/qemu/networks/default.xml
diff --git a/src/xen/Makefile.inc.am b/src/xen/Makefile.inc.am
new file mode 100644
index 0000000000..85260251ec
--- /dev/null
+++ b/src/xen/Makefile.inc.am
@@ -0,0 +1,67 @@
+XEN_DRIVER_SOURCES = \
+ xen/block_stats.c \
+ xen/block_stats.h \
+ xen/xen_hypervisor.c \
+ xen/xen_hypervisor.h \
+ xen/xen_driver.c \
+ xen/xen_driver.h \
+ xen/xend_internal.c \
+ xen/xend_internal.h \
+ xen/xm_internal.c \
+ xen/xm_internal.h \
+ xen/xs_internal.c \
+ xen/xs_internal.h \
+ $(NULL)
+
+XEN_DRIVER_INOTIFY_SOURCES = \
+ xen/xen_inotify.c \
+ xen/xen_inotify.h \
+ $(NULL)
+
+if WITH_XEN_INOTIFY
+XEN_DRIVER_SOURCES += $(XEN_DRIVER_INOTIFY_SOURCES)
+endif WITH_XEN_INOTIFY
+
+DRIVER_SOURCE_FILES += $(XEN_DRIVER_SOURCES)
+STATEFUL_DRIVER_SOURCE_FILES += $(XEN_DRIVER_SOURCES)
+EXTRA_DIST += $(XEN_DRIVER_SOURCES) $(XEN_DRIVER_INOTIFY_SOURCES)
+
+if WITH_XEN
+noinst_LTLIBRARIES += libvirt_driver_xen_impl.la
+libvirt_driver_xen_la_SOURCES =
+libvirt_driver_xen_la_LIBADD = \
+ libvirt_driver_xen_impl.la \
+ libvirt.la \
+ ../gnulib/lib/libgnu.la \
+ $(NULL)
+mod_LTLIBRARIES += libvirt_driver_xen.la
+libvirt_driver_xen_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF)
+
+libvirt_driver_xen_impl_la_CFLAGS = \
+ $(XEN_CFLAGS) \
+ -I$(srcdir)/access \
+ -I$(srcdir)/conf \
+ -I$(srcdir)/xenconfig \
+ $(AM_CFLAGS) \
+ $(NULL)
+libvirt_driver_xen_impl_la_LDFLAGS = $(AM_LDFLAGS)
+libvirt_driver_xen_impl_la_LIBADD = \
+ $(XEN_LIBS) \
+ libvirt_xenconfig.la \
+ $(NULL)
+libvirt_driver_xen_impl_la_SOURCES = $(XEN_DRIVER_SOURCES)
+
+INSTALL_DATA_DIRS += xen
+
+install-data-xen:
+ $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/xen"
+
+uninstall-data-xen:
+ rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/xen" ||:
+
+endif WITH_XEN
+
+.PHONY: \
+ install-data-xen \
+ uninstall-data-xen \
+ $(NULL)
--
2.14.3
6:56 a.m.
New subject: [libvirt] [PATCH v1 14/16] make: split xenapi driver build rules into xenapi/Makefile.inc.am
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
src/Makefile.am | 18 +-----------------
src/xenapi/Makefile.inc.am | 28 ++++++++++++++++++++++++++++
2 files changed, 29 insertions(+), 17 deletions(-)
create mode 100644 src/xenapi/Makefile.inc.am
diff --git a/src/Makefile.am b/src/Makefile.am
index 1692ed6304..1fcb864c21 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -93,6 +93,7 @@ include bhyve/Makefile.inc.am
include xenconfig/Makefile.inc.am
include libxl/Makefile.inc.am
include xen/Makefile.inc.am
+include xenapi/Makefile.inc.am
install-data-extra: $(INSTALL_DATA_DIRS:%=install-data-%)
uninstall-data-extra: $(INSTALL_DATA_DIRS:%=install-data-%)
@@ -790,7 +791,6 @@ DRIVER_SOURCE_FILES += \
$(REMOTE_DRIVER_SOURCES) \
$(SECRET_DRIVER_SOURCES) \
$(STORAGE_DRIVER_SOURCES) \
- $(XENAPI_DRIVER_SOURCES) \
$(NULL)
STATEFUL_DRIVER_SOURCE_FILES += \
@@ -900,11 +900,6 @@ SECURITY_DRIVER_APPARMOR_HELPER_SOURCES = \
$(DATATYPES_SOURCES) \
security/virt-aa-helper.c
-XENAPI_DRIVER_SOURCES = \
- xenapi/xenapi_driver.c xenapi/xenapi_driver.h \
- xenapi/xenapi_driver_private.h \
- xenapi/xenapi_utils.c xenapi/xenapi_utils.h
-
VZ_DRIVER_SOURCES = \
vz/vz_driver.h \
vz/vz_driver.c \
@@ -1266,16 +1261,6 @@ EXTRA_DIST += \
$< $(srcdir)/$(subst $(srcdir)/,,$@)
-if WITH_XENAPI
-noinst_LTLIBRARIES += libvirt_driver_xenapi.la
-libvirt_la_BUILT_LIBADD += libvirt_driver_xenapi.la
-libvirt_driver_xenapi_la_CFLAGS = $(XENAPI_CFLAGS) $(CURL_CFLAGS) \
- -I$(srcdir)/conf -I$(srcdir)/xenconfig $(AM_CFLAGS)
-libvirt_driver_xenapi_la_LDFLAGS = $(AM_LDFLAGS)
-libvirt_driver_xenapi_la_LIBADD = $(XENAPI_LIBS) $(CURL_LIBS)
-libvirt_driver_xenapi_la_SOURCES = $(XENAPI_DRIVER_SOURCES)
-endif WITH_XENAPI
-
@@ -1722,7 +1707,6 @@ access/viraccessapichecklxc.c: $(srcdir)/rpc/gendispatch.pl \
EXTRA_DIST += \
$(REMOTE_DRIVER_SOURCES) \
$(LXC_DRIVER_SOURCES) \
- $(XENAPI_DRIVER_SOURCES) \
$(VZ_DRIVER_SOURCES) \
$(NETWORK_DRIVER_SOURCES) \
$(INTERFACE_DRIVER_SOURCES) \
diff --git a/src/xenapi/Makefile.inc.am b/src/xenapi/Makefile.inc.am
new file mode 100644
index 0000000000..4640e9943f
--- /dev/null
+++ b/src/xenapi/Makefile.inc.am
@@ -0,0 +1,28 @@
+XENAPI_DRIVER_SOURCES = \
+ xenapi/xenapi_driver.c \
+ xenapi/xenapi_driver.h \
+ xenapi/xenapi_driver_private.h \
+ xenapi/xenapi_utils.c \
+ xenapi/xenapi_utils.h \
+ $(NULL)
+
+DRIVER_SOURCE_FILES += $(XENAPI_DRIVER_SOURCES)
+EXTRA_DIST += $(XENAPI_DRIVER_SOURCES)
+
+if WITH_XENAPI
+noinst_LTLIBRARIES += libvirt_driver_xenapi.la
+libvirt_la_BUILT_LIBADD += libvirt_driver_xenapi.la
+libvirt_driver_xenapi_la_CFLAGS = \
+ $(XENAPI_CFLAGS) \
+ $(CURL_CFLAGS) \
+ -I$(srcdir)/conf \
+ -I$(srcdir)/xenconfig \
+ $(AM_CFLAGS) \
+ $(NULL)
+libvirt_driver_xenapi_la_LDFLAGS = $(AM_LDFLAGS)
+libvirt_driver_xenapi_la_LIBADD = \
+ $(XENAPI_LIBS) \
+ $(CURL_LIBS) \
+ $(NULL)
+libvirt_driver_xenapi_la_SOURCES = $(XENAPI_DRIVER_SOURCES)
+endif WITH_XENAPI
--
2.14.3
6:56 a.m.
New subject: [libvirt] [PATCH v1 15/16] make: split vz driver build rules into vz/Makefile.inc.am
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
src/Makefile.am | 31 +------------------------------
src/vz/Makefile.inc.am | 38 ++++++++++++++++++++++++++++++++++++++
2 files changed, 39 insertions(+), 30 deletions(-)
create mode 100644 src/vz/Makefile.inc.am
diff --git a/src/Makefile.am b/src/Makefile.am
index 1fcb864c21..7e8be8c05b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -94,6 +94,7 @@ include xenconfig/Makefile.inc.am
include libxl/Makefile.inc.am
include xen/Makefile.inc.am
include xenapi/Makefile.inc.am
+include vz/Makefile.inc.am
install-data-extra: $(INSTALL_DATA_DIRS:%=install-data-%)
uninstall-data-extra: $(INSTALL_DATA_DIRS:%=install-data-%)
@@ -787,7 +788,6 @@ DRIVER_SOURCE_FILES += \
$(NODE_DEVICE_DRIVER_HAL_SOURCES) \
$(NODE_DEVICE_DRIVER_UDEV_SOURCES) \
$(NWFILTER_DRIVER_SOURCES) \
- $(VZ_DRIVER_SOURCES) \
$(REMOTE_DRIVER_SOURCES) \
$(SECRET_DRIVER_SOURCES) \
$(STORAGE_DRIVER_SOURCES) \
@@ -801,7 +801,6 @@ STATEFUL_DRIVER_SOURCE_FILES += \
$(NWFILTER_DRIVER_SOURCES) \
$(SECRET_DRIVER_SOURCES) \
$(STORAGE_DRIVER_SOURCES) \
- $(VZ_DRIVER_SOURCES) \
$(NULL)
@@ -900,14 +899,6 @@ SECURITY_DRIVER_APPARMOR_HELPER_SOURCES = \
$(DATATYPES_SOURCES) \
security/virt-aa-helper.c
-VZ_DRIVER_SOURCES = \
- vz/vz_driver.h \
- vz/vz_driver.c \
- vz/vz_utils.c \
- vz/vz_utils.h \
- vz/vz_sdk.h \
- vz/vz_sdk.c
-
NETWORK_DRIVER_SOURCES = \
network/bridge_driver.h network/bridge_driver.c \
network/bridge_driver_platform.h \
@@ -1303,25 +1294,6 @@ EXTRA_DIST += lxc/lxc.conf lxc/libvirtd_lxc.aug
lxc/test_libvirtd_lxc.aug.in
-
-
-if WITH_VZ
-noinst_LTLIBRARIES += libvirt_driver_vz_impl.la
-libvirt_driver_vz_la_SOURCES =
-libvirt_driver_vz_la_LIBADD = libvirt_driver_vz_impl.la
-mod_LTLIBRARIES += libvirt_driver_vz.la
-libvirt_driver_vz_la_LIBADD += libvirt.la ../gnulib/lib/libgnu.la
-libvirt_driver_vz_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF)
-libvirt_driver_vz_impl_la_CFLAGS = \
- -I$(srcdir)/conf \
- -I$(srcdir)/access \
- $(AM_CFLAGS) \
- $(PARALLELS_SDK_CFLAGS) $(LIBNL_CFLAGS)
-libvirt_driver_vz_impl_la_SOURCES = $(VZ_DRIVER_SOURCES)
-libvirt_driver_vz_impl_la_LIBADD = $(PARALLELS_SDK_LIBS) $(LIBNL_LIBS)
-endif WITH_VZ
-
-
if WITH_NETWORK
noinst_LTLIBRARIES += libvirt_driver_network_impl.la
libvirt_driver_network_la_SOURCES =
@@ -1707,7 +1679,6 @@ access/viraccessapichecklxc.c: $(srcdir)/rpc/gendispatch.pl \
EXTRA_DIST += \
$(REMOTE_DRIVER_SOURCES) \
$(LXC_DRIVER_SOURCES) \
- $(VZ_DRIVER_SOURCES) \
$(NETWORK_DRIVER_SOURCES) \
$(INTERFACE_DRIVER_SOURCES) \
$(STORAGE_DRIVER_SOURCES) \
diff --git a/src/vz/Makefile.inc.am b/src/vz/Makefile.inc.am
new file mode 100644
index 0000000000..cacdb38795
--- /dev/null
+++ b/src/vz/Makefile.inc.am
@@ -0,0 +1,38 @@
+VZ_DRIVER_SOURCES = \
+ vz/vz_driver.h \
+ vz/vz_driver.c \
+ vz/vz_utils.c \
+ vz/vz_utils.h \
+ vz/vz_sdk.h \
+ vz/vz_sdk.c \
+ $(NULL)
+
+
+DRIVER_SOURCE_FILES += $(VZ_DRIVER_SOURCES)
+STATEFUL_DRIVER_SOURCE_FILES += $(VZ_DRIVER_SOURCES)
+EXTRA_DIST += $(VZ_DRIVER_SOURCES)
+
+
+if WITH_VZ
+noinst_LTLIBRARIES += libvirt_driver_vz_impl.la
+libvirt_driver_vz_la_SOURCES =
+libvirt_driver_vz_la_LIBADD = \
+ libvirt_driver_vz_impl.la \
+ libvirt.la \
+ ../gnulib/lib/libgnu.la \
+ $(NULL)
+mod_LTLIBRARIES += libvirt_driver_vz.la
+libvirt_driver_vz_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF)
+libvirt_driver_vz_impl_la_CFLAGS = \
+ -I$(srcdir)/conf \
+ -I$(srcdir)/access \
+ $(AM_CFLAGS) \
+ $(PARALLELS_SDK_CFLAGS) \
+ $(LIBNL_CFLAGS) \
+ $(NULL)
+libvirt_driver_vz_impl_la_SOURCES = $(VZ_DRIVER_SOURCES)
+libvirt_driver_vz_impl_la_LIBADD = \
+ $(PARALLELS_SDK_LIBS) \
+ $(LIBNL_LIBS) \
+ $(NULL)
+endif WITH_VZ
--
2.14.3
6:56 a.m.
New subject: [libvirt] [PATCH v1 16/16] make: split lxc driver build rules into lxc/Makefile.inc.am
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
src/Makefile.am | 184 ++----------------------------------------
src/lxc/Makefile.inc.am | 207 ++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 212 insertions(+), 179 deletions(-)
create mode 100644 src/lxc/Makefile.inc.am
diff --git a/src/Makefile.am b/src/Makefile.am
index 7e8be8c05b..6406b01cfd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -79,6 +79,8 @@ AUGEAS_DIRS =
if WITH_DTRACE_PROBES
tapset_DATA =
endif WITH_DTRACE_PROBES
+libexec_PROGRAMS =
+RPC_PROBE_FILES =
include uml/Makefile.inc.am
include phyp/Makefile.inc.am
@@ -95,6 +97,7 @@ include libxl/Makefile.inc.am
include xen/Makefile.inc.am
include xenapi/Makefile.inc.am
include vz/Makefile.inc.am
+include lxc/Makefile.inc.am
install-data-extra: $(INSTALL_DATA_DIRS:%=install-data-%)
uninstall-data-extra: $(INSTALL_DATA_DIRS:%=install-data-%)
@@ -782,7 +785,6 @@ EXTRA_DIST += check-drivername.pl
DRIVER_SOURCE_FILES += \
$(INTERFACE_DRIVER_SOURCES) \
- $(LXC_DRIVER_SOURCES) \
$(NETWORK_DRIVER_SOURCES) \
$(NODE_DEVICE_DRIVER_SOURCES) \
$(NODE_DEVICE_DRIVER_HAL_SOURCES) \
@@ -795,7 +797,6 @@ DRIVER_SOURCE_FILES += \
STATEFUL_DRIVER_SOURCE_FILES += \
$(INTERFACE_DRIVER_SOURCES) \
- $(LXC_DRIVER_SOURCES) \
$(NETWORK_DRIVER_SOURCES) \
$(NODE_DEVICE_DRIVER_SOURCES) \
$(NWFILTER_DRIVER_SOURCES) \
@@ -829,72 +830,6 @@ check-local: check-protocol check-symfile check-symsorting \
.PHONY: check-protocol $(PROTOCOL_STRUCTS:structs=struct)
-LXC_MONITOR_PROTOCOL_GENERATED = \
- lxc/lxc_monitor_protocol.h \
- lxc/lxc_monitor_protocol.c \
- $(NULL)
-
-LXC_MONITOR_GENERATED = \
- lxc/lxc_monitor_dispatch.h \
- $(NULL)
-
-LXC_CONTROLLER_GENERATED = \
- lxc/lxc_controller_dispatch.h \
- $(NULL)
-
-LXC_GENERATED = \
- $(LXC_MONITOR_PROTOCOL_GENERATED) \
- $(LXC_MONITOR_GENERATED) \
- $(LXC_CONTROLLER_GENERATED) \
- $(NULL)
-
-LXC_MONITOR_PROTOCOL = $(srcdir)/lxc/lxc_monitor_protocol.x
-
-lxc/lxc_monitor_dispatch.h: $(srcdir)/rpc/gendispatch.pl \
- $(LXC_MONITOR_PROTOCOL) Makefile.am
- $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=client \
- virLXCMonitor VIR_LXC_MONITOR $(LXC_MONITOR_PROTOCOL) > \
- $(srcdir)/lxc/lxc_monitor_dispatch.h
-
-lxc/lxc_controller_dispatch.h: $(srcdir)/rpc/gendispatch.pl \
- $(REMOTE_PROTOCOL) Makefile.am
- $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=server \
- virLXCMonitor VIR_LXC_MONITOR $(LXC_MONITOR_PROTOCOL) > \
- $(srcdir)/lxc/lxc_controller_dispatch.h
-
-EXTRA_DIST += \
- $(LXC_MONITOR_PROTOCOL) \
- $(LXC_GENERATED) \
- $(NULL)
-
-BUILT_SOURCES += $(LXC_GENERATED)
-
-CLEANFILES += $(LXC_GENERATED)
-
-LXC_DRIVER_SOURCES = \
- $(LXC_MONITOR_PROTOCOL_GENERATED) \
- $(LXC_MONITOR_GENERATED) \
- lxc/lxc_conf.c lxc/lxc_conf.h \
- lxc/lxc_container.c lxc/lxc_container.h \
- lxc/lxc_cgroup.c lxc/lxc_cgroup.h \
- lxc/lxc_domain.c lxc/lxc_domain.h \
- lxc/lxc_hostdev.c lxc/lxc_hostdev.h \
- lxc/lxc_monitor.c lxc/lxc_monitor.h \
- lxc/lxc_process.c lxc/lxc_process.h \
- lxc/lxc_fuse.c lxc/lxc_fuse.h \
- lxc/lxc_native.c lxc/lxc_native.h \
- lxc/lxc_driver.c lxc/lxc_driver.h
-
-LXC_CONTROLLER_SOURCES = \
- $(LXC_MONITOR_PROTOCOL_GENERATED) \
- $(LXC_CONTROLLER_GENERATED) \
- lxc/lxc_conf.c lxc/lxc_conf.h \
- lxc/lxc_container.c lxc/lxc_container.h \
- lxc/lxc_cgroup.c lxc/lxc_cgroup.h \
- lxc/lxc_domain.c lxc/lxc_domain.h \
- lxc/lxc_fuse.c lxc/lxc_fuse.h \
- lxc/lxc_controller.c
-
SECURITY_DRIVER_APPARMOR_HELPER_SOURCES = \
$(DATATYPES_SOURCES) \
security/virt-aa-helper.c
@@ -1252,48 +1187,6 @@ EXTRA_DIST += \
$< $(srcdir)/$(subst $(srcdir)/,,$@)
-
-
-
-if WITH_LXC
-noinst_LTLIBRARIES += libvirt_driver_lxc_impl.la
-libvirt_driver_lxc_la_SOURCES =
-libvirt_driver_lxc_la_LIBADD = libvirt_driver_lxc_impl.la
-mod_LTLIBRARIES += libvirt_driver_lxc.la
-libvirt_driver_lxc_la_LIBADD += libvirt.la ../gnulib/lib/libgnu.la
-libvirt_driver_lxc_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF)
-
-libvirt_driver_lxc_impl_la_CFLAGS = \
- $(LIBNL_CFLAGS) \
- $(FUSE_CFLAGS) \
- $(XDR_CFLAGS) \
- -I$(srcdir)/access \
- -I$(srcdir)/conf \
- $(AM_CFLAGS)
-libvirt_driver_lxc_impl_la_LIBADD = \
- $(CAPNG_LIBS) \
- $(LIBNL_LIBS) \
- $(LIBXML_LIBS) \
- $(FUSE_LIBS)
-
-if WITH_BLKID
-libvirt_driver_lxc_impl_la_CFLAGS += $(BLKID_CFLAGS)
-libvirt_driver_lxc_impl_la_LIBADD += $(BLKID_LIBS)
-endif WITH_BLKID
-libvirt_driver_lxc_impl_la_LIBADD += $(SECDRIVER_LIBS)
-libvirt_driver_lxc_impl_la_SOURCES = $(LXC_DRIVER_SOURCES)
-
-conf_DATA += lxc/lxc.conf
-
-augeas_DATA += lxc/libvirtd_lxc.aug
-augeastest_DATA += test_libvirtd_lxc.aug
-CLEANFILES += test_libvirtd_lxc.aug
-
-endif WITH_LXC
-EXTRA_DIST += lxc/lxc.conf lxc/libvirtd_lxc.aug lxc/test_libvirtd_lxc.aug.in
-
-
-
if WITH_NETWORK
noinst_LTLIBRARIES += libvirt_driver_network_impl.la
libvirt_driver_network_la_SOURCES =
@@ -1678,7 +1571,6 @@ access/viraccessapichecklxc.c: $(srcdir)/rpc/gendispatch.pl \
# Add all conditional sources just in case...
EXTRA_DIST += \
$(REMOTE_DRIVER_SOURCES) \
- $(LXC_DRIVER_SOURCES) \
$(NETWORK_DRIVER_SOURCES) \
$(INTERFACE_DRIVER_SOURCES) \
$(STORAGE_DRIVER_SOURCES) \
@@ -1706,32 +1598,19 @@ EXTRA_DIST += \
check-local: check-augeas
.PHONY: check-augeas \
- check-augeas-lxc \
check-augeas-sanlock \
check-augeas-lockd \
check-augeas-libvirtd \
$(NULL)
check-augeas: $(AUGEAS_DIRS:%=check-augeas-%) \
- check-augeas-lxc check-augeas-sanlock \
+ check-augeas-sanlock \
check-augeas-lockd check-augeas-virtlockd \
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_LXC
-test_libvirtd_lxc.aug: lxc/test_libvirtd_lxc.aug.in \
- $(srcdir)/lxc/lxc.conf $(AUG_GENTEST)
- $(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/lxc/lxc.conf $< $@
-
-check-augeas-lxc: test_libvirtd_lxc.aug
- $(AM_V_GEN)if test -x '$(AUGPARSE)'; then \
- '$(AUGPARSE)' -I $(srcdir)/lxc test_libvirtd_lxc.aug; \
- fi
-else ! WITH_LXC
-check-augeas-lxc:
-endif ! WITH_LXC
if WITH_SANLOCK
test_libvirt_sanlock.aug: locking/test_libvirt_sanlock.aug.in \
@@ -2034,12 +1913,11 @@ tapset_DATA += libvirt_probes.stp libvirt_functions.stp
$@
# Keep this list synced with PROTOCOL_STRUCTS
-RPC_PROBE_FILES = $(srcdir)/rpc/virnetprotocol.x \
+RPC_PROBE_FILES += $(srcdir)/rpc/virnetprotocol.x \
$(srcdir)/rpc/virkeepaliveprotocol.x \
$(srcdir)/remote/remote_protocol.x \
$(srcdir)/remote/lxc_protocol.x \
$(srcdir)/remote/qemu_protocol.x \
- $(srcdir)/lxc/lxc_monitor_protocol.x \
$(srcdir)/locking/lock_protocol.x \
$(srcdir)/admin/admin_protocol.x
@@ -2794,8 +2672,6 @@ libvirt_net_rpc_client_la_LDFLAGS = $(AM_LDFLAGS)
libvirt_net_rpc_client_la_LIBADD = \
$(CYGWIN_EXTRA_LIBADD)
-libexec_PROGRAMS =
-
if WITH_LIBVIRTD
libexec_PROGRAMS += libvirt_iohelper
libvirt_iohelper_SOURCES = $(UTIL_IO_HELPER_SOURCES)
@@ -2882,46 +2758,6 @@ libvirt_sanlock_helper_LDFLAGS = \
libvirt_sanlock_helper_LDADD = libvirt.la
endif WITH_SANLOCK
-if WITH_LXC
-if WITH_LIBVIRTD
-libexec_PROGRAMS += libvirt_lxc
-
-libvirt_lxc_SOURCES = \
- $(LXC_CONTROLLER_SOURCES) \
- $(DATATYPES_SOURCES)
-libvirt_lxc_LDFLAGS = \
- $(AM_LDFLAGS) \
- $(PIE_LDFLAGS) \
- $(CAPNG_LIBS) \
- $(LIBXML_LIBS) \
- $(NULL)
-libvirt_lxc_LDADD = \
- $(FUSE_LIBS) \
- libvirt.la \
- ../gnulib/lib/libgnu.la
-if WITH_DTRACE_PROBES
-libvirt_lxc_LDADD += libvirt_probes.lo
-endif WITH_DTRACE_PROBES
-libvirt_lxc_LDADD += $(SECDRIVER_LIBS)
-libvirt_lxc_CFLAGS = \
- -I$(srcdir)/conf \
- $(AM_CFLAGS) \
- $(PIE_CFLAGS) \
- $(CAPNG_CFLAGS) \
- $(LIBXML_CFLAGS) \
- $(LIBNL_CFLAGS) \
- $(FUSE_CFLAGS) \
- $(DBUS_CFLAGS) \
- $(XDR_CFLAGS) \
- $(NULL)
-if WITH_BLKID
-libvirt_lxc_CFLAGS += $(BLKID_CFLAGS)
-libvirt_lxc_LDADD += $(BLKID_LIBS)
-endif WITH_BLKID
-libvirt_lxc_CFLAGS += $(SECDRIVER_CFLAGS)
-endif WITH_LIBVIRTD
-endif WITH_LXC
-EXTRA_DIST += $(LXC_CONTROLLER_SOURCES)
if WITH_SECDRIVER_APPARMOR
if WITH_LIBVIRTD
@@ -3037,11 +2873,6 @@ endif WITH_LIBVIRTD
if WITH_SANLOCK
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/sanlock"
endif WITH_SANLOCK
-if WITH_LXC
- $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/lxc"
- $(MKDIR_P) "$(DESTDIR)$(localstatedir)/run/libvirt/lxc"
- $(MKDIR_P) "$(DESTDIR)$(localstatedir)/log/libvirt/lxc"
-endif WITH_LXC
if WITH_NETWORK
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/network"
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/dnsmasq"
@@ -3078,11 +2909,6 @@ endif WITH_LIBVIRTD
if WITH_SANLOCK
rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/sanlock" ||:
endif WITH_SANLOCK
-if WITH_LXC
- rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/lxc" ||:
- rmdir "$(DESTDIR)$(localstatedir)/run/libvirt/lxc" ||:
- rmdir "$(DESTDIR)$(localstatedir)/log/libvirt/lxc" ||:
-endif WITH_LXC
if WITH_NETWORK
rm -f $(DESTDIR)$(confdir)/qemu/networks/autostart/default.xml
rm -f $(DESTDIR)$(confdir)/qemu/networks/default.xml
diff --git a/src/lxc/Makefile.inc.am b/src/lxc/Makefile.inc.am
new file mode 100644
index 0000000000..8a3d4c4789
--- /dev/null
+++ b/src/lxc/Makefile.inc.am
@@ -0,0 +1,207 @@
+LXC_MONITOR_PROTOCOL_GENERATED = \
+ lxc/lxc_monitor_protocol.h \
+ lxc/lxc_monitor_protocol.c \
+ $(NULL)
+
+LXC_MONITOR_GENERATED = \
+ lxc/lxc_monitor_dispatch.h \
+ $(NULL)
+
+LXC_CONTROLLER_GENERATED = \
+ lxc/lxc_controller_dispatch.h \
+ $(NULL)
+
+LXC_GENERATED = \
+ $(LXC_MONITOR_PROTOCOL_GENERATED) \
+ $(LXC_MONITOR_GENERATED) \
+ $(LXC_CONTROLLER_GENERATED) \
+ $(NULL)
+
+LXC_MONITOR_PROTOCOL = $(srcdir)/lxc/lxc_monitor_protocol.x
+
+LXC_DRIVER_SOURCES = \
+ $(LXC_MONITOR_PROTOCOL_GENERATED) \
+ $(LXC_MONITOR_GENERATED) \
+ lxc/lxc_conf.c \
+ lxc/lxc_conf.h \
+ lxc/lxc_container.c \
+ lxc/lxc_container.h \
+ lxc/lxc_cgroup.c \
+ lxc/lxc_cgroup.h \
+ lxc/lxc_domain.c \
+ lxc/lxc_domain.h \
+ lxc/lxc_hostdev.c \
+ lxc/lxc_hostdev.h \
+ lxc/lxc_monitor.c \
+ lxc/lxc_monitor.h \
+ lxc/lxc_process.c \
+ lxc/lxc_process.h \
+ lxc/lxc_fuse.c \
+ lxc/lxc_fuse.h \
+ lxc/lxc_native.c \
+ lxc/lxc_native.h \
+ lxc/lxc_driver.c \
+ lxc/lxc_driver.h \
+ $(NULL)
+
+LXC_CONTROLLER_SOURCES = \
+ $(LXC_MONITOR_PROTOCOL_GENERATED) \
+ $(LXC_CONTROLLER_GENERATED) \
+ lxc/lxc_conf.c \
+ lxc/lxc_conf.h \
+ lxc/lxc_container.c \
+ lxc/lxc_container.h \
+ lxc/lxc_cgroup.c \
+ lxc/lxc_cgroup.h \
+ lxc/lxc_domain.c \
+ lxc/lxc_domain.h \
+ lxc/lxc_fuse.c \
+ lxc/lxc_fuse.h \
+ lxc/lxc_controller.c \
+ $(NULL)
+
+
+DRIVER_SOURCE_FILES += $(LXC_DRIVER_SOURCES)
+STATEFUL_DRIVER_SOURCE_FILES += $(LXC_DRIVER_SOURCES)
+EXTRA_DIST += \
+ $(LXC_DRIVER_SOURCES) \
+ $(LXC_MONITOR_PROTOCOL) \
+ $(LXC_GENERATED) \
+ $(LXC_CONTROLLER_SOURCES) \
+ $(NULL)
+
+BUILT_SOURCES += $(LXC_GENERATED)
+CLEANFILES += $(LXC_GENERATED)
+
+
+if WITH_LXC
+
+noinst_LTLIBRARIES += libvirt_driver_lxc_impl.la
+libvirt_driver_lxc_la_SOURCES =
+libvirt_driver_lxc_la_LIBADD = \
+ libvirt_driver_lxc_impl.la \
+ libvirt.la \
+ ../gnulib/lib/libgnu.la \
+ $(NULL)
+mod_LTLIBRARIES += libvirt_driver_lxc.la
+libvirt_driver_lxc_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF)
+
+libvirt_driver_lxc_impl_la_CFLAGS = \
+ $(LIBNL_CFLAGS) \
+ $(FUSE_CFLAGS) \
+ $(XDR_CFLAGS) \
+ -I$(srcdir)/access \
+ -I$(srcdir)/conf \
+ $(AM_CFLAGS) \
+ $(NULL)
+libvirt_driver_lxc_impl_la_LIBADD = \
+ $(CAPNG_LIBS) \
+ $(LIBNL_LIBS) \
+ $(LIBXML_LIBS) \
+ $(FUSE_LIBS) \
+ $(NULL)
+
+if WITH_BLKID
+libvirt_driver_lxc_impl_la_CFLAGS += $(BLKID_CFLAGS)
+libvirt_driver_lxc_impl_la_LIBADD += $(BLKID_LIBS)
+endif WITH_BLKID
+libvirt_driver_lxc_impl_la_LIBADD += $(SECDRIVER_LIBS)
+libvirt_driver_lxc_impl_la_SOURCES = $(LXC_DRIVER_SOURCES)
+
+libexec_PROGRAMS += libvirt_lxc
+
+libvirt_lxc_SOURCES = \
+ $(LXC_CONTROLLER_SOURCES) \
+ $(DATATYPES_SOURCES) \
+ $(NULL)
+libvirt_lxc_LDFLAGS = \
+ $(AM_LDFLAGS) \
+ $(PIE_LDFLAGS) \
+ $(CAPNG_LIBS) \
+ $(LIBXML_LIBS) \
+ $(NULL)
+libvirt_lxc_LDADD = \
+ $(FUSE_LIBS) \
+ libvirt.la \
+ ../gnulib/lib/libgnu.la \
+ $(NULL)
+if WITH_DTRACE_PROBES
+libvirt_lxc_LDADD += libvirt_probes.lo
+endif WITH_DTRACE_PROBES
+libvirt_lxc_LDADD += $(SECDRIVER_LIBS)
+libvirt_lxc_CFLAGS = \
+ -I$(srcdir)/conf \
+ $(AM_CFLAGS) \
+ $(PIE_CFLAGS) \
+ $(CAPNG_CFLAGS) \
+ $(LIBXML_CFLAGS) \
+ $(LIBNL_CFLAGS) \
+ $(FUSE_CFLAGS) \
+ $(DBUS_CFLAGS) \
+ $(XDR_CFLAGS) \
+ $(NULL)
+if WITH_BLKID
+libvirt_lxc_CFLAGS += $(BLKID_CFLAGS)
+libvirt_lxc_LDADD += $(BLKID_LIBS)
+endif WITH_BLKID
+libvirt_lxc_CFLAGS += $(SECDRIVER_CFLAGS)
+
+
+if WITH_DTRACE_PROBES
+RPC_PROBE_FILES += $(srcdir)/lxc/lxc_monitor_protocol.x
+endif
+
+conf_DATA += lxc/lxc.conf
+
+augeas_DATA += lxc/libvirtd_lxc.aug
+augeastest_DATA += test_libvirtd_lxc.aug
+CLEANFILES += test_libvirtd_lxc.aug
+
+AUGEAS_DIRS += lxc
+
+test_libvirtd_lxc.aug: lxc/test_libvirtd_lxc.aug.in \
+ $(srcdir)/lxc/lxc.conf $(AUG_GENTEST)
+ $(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/lxc/lxc.conf $< $@
+
+check-augeas-lxc: test_libvirtd_lxc.aug
+ $(AM_V_GEN)if test -x '$(AUGPARSE)'; then \
+ '$(AUGPARSE)' -I $(srcdir)/lxc test_libvirtd_lxc.aug; \
+ fi
+
+INSTALL_DATA_DIRS += lxc
+
+install-data-lxc:
+ $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/lxc"
+ $(MKDIR_P) "$(DESTDIR)$(localstatedir)/run/libvirt/lxc"
+ $(MKDIR_P) "$(DESTDIR)$(localstatedir)/log/libvirt/lxc"
+
+uninstall-data-lxc:
+ rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/lxc" ||:
+ rmdir "$(DESTDIR)$(localstatedir)/run/libvirt/lxc" ||:
+ rmdir "$(DESTDIR)$(localstatedir)/log/libvirt/lxc" ||:
+
+endif WITH_LXC
+
+lxc/lxc_monitor_dispatch.h: $(srcdir)/rpc/gendispatch.pl \
+ $(LXC_MONITOR_PROTOCOL) Makefile.am
+ $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=client \
+ virLXCMonitor VIR_LXC_MONITOR $(LXC_MONITOR_PROTOCOL) > \
+ $(srcdir)/lxc/lxc_monitor_dispatch.h
+
+lxc/lxc_controller_dispatch.h: $(srcdir)/rpc/gendispatch.pl \
+ $(REMOTE_PROTOCOL) Makefile.am
+ $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=server \
+ virLXCMonitor VIR_LXC_MONITOR $(LXC_MONITOR_PROTOCOL) > \
+ $(srcdir)/lxc/lxc_controller_dispatch.h
+
+.PHONY: \
+ check-agueas-lxc \
+ install-data-lxc \
+ uninstall-data-lxc \
+ $(NULL)
+
+EXTRA_DIST += \
+ lxc/lxc.conf \
+ lxc/libvirtd_lxc.aug \
+ lxc/test_libvirtd_lxc.aug.in \
+ $(NULL)
--
2.14.3
4:12 a.m.
On 02/22/2018 01:56 PM, Daniel P. Berrangé wrote:
The src/Makefile.am is quite large and has quite poor grouping of
rules
/ variables / etc. This makes it increasingly hard to identify all the
rules relating to a particular area of code.
Traditionally one might create Makefile.am's in each sub-directory and
let make recurse into each. Recursive make is quite a bad idea in
general though because it harms parallelization and means that make does
not have a full view of dependencies.
This series thus takes a different approach to modularization which is
to make use of the "include" statement to pull in makefile fragments
from subdirectories. automake fully expands all "include" statements
when generating the Makefile.in, so we still end up with a single
monolithic file for the eventual build. Aside from ensuring make still
has a full view of dependencies, this also means that all variables are
still in a global namespace.
In doing this split, I've taken the opportunity to santize the variable
declarations into a consistent style. Any variable that is assigned more
than one value now uses line continuations with exactly one value per
line and a trailing $(NULL). It would be nice to enforce this style with
a syntax-check rule but I've not figured this out yet.
This series only moves the virt drivers. So there's obviously a further
series to follow behind this to finish the job for other drivers.
Daniel P. Berrangé (16):
make: split UML driver build rules into uml/Makefile.inc.am
make: split PHyp driver build rules into phyp/Makefile.inc.am
make: split test driver build rules into test/Makefile.inc.am
make: split ESX driver build rules into esx/Makefile.inc.am
make: split hyperv driver build rules into hyperv/Makefile.inc.am
make: split vmware driver build rules into vmware/Makefile.inc.am
make: split vbox driver build rules into vbox/Makefile.inc.am
make: split openvz driver build rules into openvz/Makefile.inc.am
make: split qemu driver build rules into qemu/Makefile.inc.am
make: split bhyve driver build rules into bhyve/Makefile.inc.am
make: split xenconfig driver build rules into
xenconfig/Makefile.inc.am
make: split libxl driver build rules into libxl/Makefile.inc.am
make: split xen driver build rules into xen/Makefile.inc.am
make: split xenapi driver build rules into xenapi/Makefile.inc.am
make: split vz driver build rules into vz/Makefile.inc.am
make: split lxc driver build rules into lxc/Makefile.inc.am
src/Makefile.am | 872 +++---------------------------------------
src/bhyve/Makefile.inc.am | 73 ++++
src/esx/Makefile.inc.am | 90 +++++
src/hyperv/Makefile.inc.am | 59 +++
src/libxl/Makefile.inc.am | 104 +++++
src/lxc/Makefile.inc.am | 207 ++++++++++
src/openvz/Makefile.inc.am | 28 ++
src/phyp/Makefile.inc.am | 19 +
src/qemu/Makefile.inc.am | 148 +++++++
src/test/Makefile.inc.am | 26 ++
src/uml/Makefile.inc.am | 46 +++
src/vbox/Makefile.inc.am | 76 ++++
src/vmware/Makefile.inc.am | 27 ++
src/vz/Makefile.inc.am | 38 ++
src/xen/Makefile.inc.am | 67 ++++
src/xenapi/Makefile.inc.am | 28 ++
src/xenconfig/Makefile.inc.am | 28 ++
17 files changed, 1122 insertions(+), 814 deletions(-)
create mode 100644 src/bhyve/Makefile.inc.am
create mode 100644 src/esx/Makefile.inc.am
create mode 100644 src/hyperv/Makefile.inc.am
create mode 100644 src/libxl/Makefile.inc.am
create mode 100644 src/lxc/Makefile.inc.am
create mode 100644 src/openvz/Makefile.inc.am
create mode 100644 src/phyp/Makefile.inc.am
create mode 100644 src/qemu/Makefile.inc.am
create mode 100644 src/test/Makefile.inc.am
create mode 100644 src/uml/Makefile.inc.am
create mode 100644 src/vbox/Makefile.inc.am
create mode 100644 src/vmware/Makefile.inc.am
create mode 100644 src/vz/Makefile.inc.am
create mode 100644 src/xen/Makefile.inc.am
create mode 100644 src/xenapi/Makefile.inc.am
create mode 100644 src/xenconfig/Makefile.inc.am
ACK
Michal
2464
days inactive
2465
days old
17 comments
2 participants
participants (2)
-
Daniel P. Berrangé -
Michal Privoznik