Signed-off-by: Daniel P. Berrangé <berra...@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
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
