Signed-off-by: Daniel P. Berrangé <berrange@xxxxxxxxxx> --- src/Makefile.am | 46 +---------------------------- src/node_device/Makefile.inc.am | 65 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 45 deletions(-) create mode 100644 src/node_device/Makefile.inc.am diff --git a/src/Makefile.am b/src/Makefile.am index 8c21453ec7..bbaab675f5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -101,6 +101,7 @@ include lxc/Makefile.inc.am include interface/Makefile.inc.am include network/Makefile.inc.am include nwfilter/Makefile.inc.am +include node_device/Makefile.inc.am THREAD_LIBS = $(LIB_PTHREAD) $(LTLIBMULTITHREAD) @@ -781,16 +782,12 @@ check-drivername: EXTRA_DIST += check-drivername.pl DRIVER_SOURCE_FILES += \ - $(NODE_DEVICE_DRIVER_SOURCES) \ - $(NODE_DEVICE_DRIVER_HAL_SOURCES) \ - $(NODE_DEVICE_DRIVER_UDEV_SOURCES) \ $(REMOTE_DRIVER_SOURCES) \ $(SECRET_DRIVER_SOURCES) \ $(STORAGE_DRIVER_SOURCES) \ $(NULL) STATEFUL_DRIVER_SOURCE_FILES += \ - $(NODE_DEVICE_DRIVER_SOURCES) \ $(SECRET_DRIVER_SOURCES) \ $(STORAGE_DRIVER_SOURCES) \ $(NULL) @@ -931,18 +928,6 @@ ACCESS_DRIVER_POLKIT_POLICY = \ $(srcdir)/access/org.libvirt.api.policy -NODE_DEVICE_DRIVER_SOURCES = \ - node_device/node_device_driver.c \ - node_device/node_device_driver.h - -NODE_DEVICE_DRIVER_HAL_SOURCES = \ - node_device/node_device_hal.c \ - node_device/node_device_hal.h - -NODE_DEVICE_DRIVER_UDEV_SOURCES = \ - node_device/node_device_udev.c \ - node_device/node_device_udev.h - CPU_SOURCES = \ cpu/cpu.h cpu/cpu.c \ cpu/cpu_x86.h cpu/cpu_x86.c cpu/cpu_x86_data.h \ @@ -1321,32 +1306,6 @@ libvirt_storage_backend_vstorage_la_LDFLAGS = $(AM_LDFLAGS_MOD) libvirt_storage_backend_vstorage_la_LIBADD = libvirt.la ../gnulib/lib/libgnu.la endif WITH_STORAGE_VSTORAGE -if WITH_NODE_DEVICES -# Needed to keep automake quiet about conditionals -mod_LTLIBRARIES += libvirt_driver_nodedev.la -libvirt_driver_nodedev_la_SOURCES = $(NODE_DEVICE_DRIVER_SOURCES) - -libvirt_driver_nodedev_la_CFLAGS = \ - -I$(srcdir)/access \ - -I$(srcdir)/conf \ - $(AM_CFLAGS) $(LIBNL_CFLAGS) -libvirt_driver_nodedev_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF) -libvirt_driver_nodedev_la_LIBADD = - -if WITH_HAL -libvirt_driver_nodedev_la_SOURCES += $(NODE_DEVICE_DRIVER_HAL_SOURCES) -libvirt_driver_nodedev_la_CFLAGS += $(HAL_CFLAGS) -libvirt_driver_nodedev_la_LIBADD += $(HAL_LIBS) -endif WITH_HAL -if WITH_UDEV -libvirt_driver_nodedev_la_SOURCES += $(NODE_DEVICE_DRIVER_UDEV_SOURCES) -libvirt_driver_nodedev_la_CFLAGS += $(UDEV_CFLAGS) $(PCIACCESS_CFLAGS) -libvirt_driver_nodedev_la_LIBADD += $(UDEV_LIBS) $(PCIACCESS_LIBS) -endif WITH_UDEV - -libvirt_driver_nodedev_la_LIBADD += libvirt.la ../gnulib/lib/libgnu.la -endif WITH_NODE_DEVICES - libvirt_security_manager_la_SOURCES = $(SECURITY_DRIVER_SOURCES) @@ -1472,9 +1431,6 @@ EXTRA_DIST += \ $(STORAGE_DRIVER_GLUSTER_SOURCES) \ $(STORAGE_DRIVER_ZFS_SOURCES) \ $(STORAGE_DRIVER_VSTORAGE_SOURCES) \ - $(NODE_DEVICE_DRIVER_SOURCES) \ - $(NODE_DEVICE_DRIVER_HAL_SOURCES) \ - $(NODE_DEVICE_DRIVER_UDEV_SOURCES) \ $(SECURITY_DRIVER_SELINUX_SOURCES) \ $(SECURITY_DRIVER_APPARMOR_SOURCES) \ $(SECRET_DRIVER_SOURCES) \ diff --git a/src/node_device/Makefile.inc.am b/src/node_device/Makefile.inc.am new file mode 100644 index 0000000000..5f5ec68b29 --- /dev/null +++ b/src/node_device/Makefile.inc.am @@ -0,0 +1,65 @@ +NODE_DEVICE_DRIVER_SOURCES = \ + node_device/node_device_driver.c \ + node_device/node_device_driver.h \ + $(NULL) + +NODE_DEVICE_DRIVER_HAL_SOURCES = \ + node_device/node_device_hal.c \ + node_device/node_device_hal.h \ + $(NULL) + +NODE_DEVICE_DRIVER_UDEV_SOURCES = \ + node_device/node_device_udev.c \ + node_device/node_device_udev.h \ + $(NULL) + +DRIVER_SOURCE_FILES += \ + $(NODE_DEVICE_DRIVER_SOURCES) \ + $(NODE_DEVICE_DRIVER_HAL_SOURCES) \ + $(NODE_DEVICE_DRIVER_UDEV_SOURCES) \ + $(NULL) + +STATEFUL_DRIVER_SOURCE_FILES += \ + $(NODE_DEVICE_DRIVER_SOURCES) \ + $(NULL) + +EXTRA_DIST += \ + $(NODE_DEVICE_DRIVER_SOURCES) \ + $(NODE_DEVICE_DRIVER_HAL_SOURCES) \ + $(NODE_DEVICE_DRIVER_UDEV_SOURCES) \ + $(NULL) + + +if WITH_NODE_DEVICES +# Needed to keep automake quiet about conditionals +mod_LTLIBRARIES += libvirt_driver_nodedev.la +libvirt_driver_nodedev_la_SOURCES = $(NODE_DEVICE_DRIVER_SOURCES) + +libvirt_driver_nodedev_la_CFLAGS = \ + -I$(srcdir)/access \ + -I$(srcdir)/conf \ + $(AM_CFLAGS) \ + $(LIBNL_CFLAGS) \ + $(NULL) +libvirt_driver_nodedev_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF) +libvirt_driver_nodedev_la_LIBADD = + +if WITH_HAL +libvirt_driver_nodedev_la_SOURCES += $(NODE_DEVICE_DRIVER_HAL_SOURCES) +libvirt_driver_nodedev_la_CFLAGS += $(HAL_CFLAGS) +libvirt_driver_nodedev_la_LIBADD += $(HAL_LIBS) +endif WITH_HAL +if WITH_UDEV +libvirt_driver_nodedev_la_SOURCES += $(NODE_DEVICE_DRIVER_UDEV_SOURCES) +libvirt_driver_nodedev_la_CFLAGS += \ + $(UDEV_CFLAGS) \ + $(PCIACCESS_CFLAGS) \ + $(NULL) +libvirt_driver_nodedev_la_LIBADD += \ + $(UDEV_LIBS) \ + $(PCIACCESS_LIBS) \ + $(NULL) +endif WITH_UDEV + +libvirt_driver_nodedev_la_LIBADD += libvirt.la ../gnulib/lib/libgnu.la +endif WITH_NODE_DEVICES -- 2.14.3 -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list
