From 1158bf0db1da1ff558d840f4c10b9c061c970d8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
Date: Wed, 21 Feb 2018 18:05:56 +0000
Subject: [PATCH] make: split openvz driver build rules into
 openvz/Makefile.inc.am
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Daniel P. Berrangé <berrange@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 5e49c5e187..c0ddf38ac6 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 \
@@ -1383,14 +1378,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
@@ -1936,7 +1923,6 @@ EXTRA_DIST += \
 		$(XEN_DRIVER_SOURCES) \
 		$(QEMU_DRIVER_SOURCES) \
 		$(LXC_DRIVER_SOURCES) \
-		$(OPENVZ_DRIVER_SOURCES) \
 		$(XENAPI_DRIVER_SOURCES) \
 		$(LIBXL_DRIVER_SOURCES) \
 		$(VZ_DRIVER_SOURCES) \
@@ -2131,12 +2117,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
-- 
GitLab