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

Daniel P. Berrangé berrange at redhat.com
Wed Feb 28 10:14:35 UTC 2018


Signed-off-by: Daniel P. Berrangé <berrange at redhat.com>
---
 src/Makefile.am         | 19 +------------------
 src/vmx/Makefile.inc.am | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+), 18 deletions(-)
 create mode 100644 src/vmx/Makefile.inc.am

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




More information about the libvir-list mailing list