2005-11-02 12:50:21 +00:00
|
|
|
## Process this file with automake to produce Makefile.in
|
|
|
|
|
Move all XML configuration handling to src/conf/
* src/capabilities.c, src/capabilities.h, src/domain_conf.c,
src/domain_conf.h, src/domain_event.c, src/domain_event.h,
src/interface_conf.c, src/interface_conf.h,
src/network_conf.c, src/network_conf.h, src/node_device_conf.c,
src/node_device_conf.h, src/secret_conf.c, src/secret_conf.h,
src/storage_conf.c, src/storage_conf.h, src/storage_encryption_conf.c,
src/storage_encryption_conf.h: Move to src/conf/
* src/Makefile.am: Add -Isrc/conf to the individual build targets
which need to use XML config APIs. Remove LIBXML_CFLAGS, LIBSSH2_CFLAGS
and SELINUX_CFLAGS from global INCLUDES and only have them in build
targets which actually need them. Create a libvirt_conf.la
convenience library for all config parsers
* src/hostusb.h: Remove bogus include of domain_conf.h
* tests/Makefile.am: Add -Isrc/conf. Remove bogus -I$builddir/src
since it never has any generated header files
* daemon/Makefile.am: Add -Isrc/conf
* proxy/Makefile.am: Add -Isrc/conf and cope with renamed files
* src/hash.c: Remove bogus include of libxml/threads.h
2009-09-16 14:39:12 +00:00
|
|
|
# No libraries with the exception of LIBXML should be listed
|
|
|
|
# here. List them against the individual XXX_la_CFLAGS targets
|
|
|
|
# that actually use them
|
|
|
|
INCLUDES = \
|
|
|
|
-I$(top_srcdir)/gnulib/lib \
|
|
|
|
-I../gnulib/lib \
|
|
|
|
-I../include \
|
Move all shared utility files to src/util/
* src/bridge.c, src/bridge.h, src/buf.c, src/buf.h, src/cgroup.c,
src/cgroup.h, src/conf.c, src/conf.h, src/event.c, src/event.h,
src/hash.c, src/hash.h, src/hostusb.c, src/hostusb.h,
src/iptables.c, src/iptables.h, src/logging.c, src/logging.h,
src/memory.c, src/memory.h, src/pci.c, src/pci.h, src/qparams.c,
src/qparams.h, src/stats_linux.c, src/stats_linux.h,
src/threads-pthread.c, src/threads-pthread.h, src/threads-win32.c,
src/threads-win32.h, src/threads.c, src/threads.h, src/util.c,
src/util.h, src/uuid.c, src/uuid.h, src/virterror.c,
src/virterror_internal.h, src/xml.c, src/xml.h: Move all files
into src/util/
* daemon/Makefile.am: Add -Isrc/util/ to build flags
* src/Makefile.am: Add -Isrc/util/ to build flags and update for
moved files
* src/libvirt_private.syms: Export cgroup APIs since they're now
in util rather than linking directly to drivers
* src/xen/xs_internal.c: Disable bogus virEventRemoveHandle call
when built under PROXY
* proxy/Makefile.am: Update for changed file locations. Remove
bogus build of event.c
* tools/Makefile.am, tests/Makefile.am: Add -Isrc/util/ to build flags
2009-09-16 15:28:46 +00:00
|
|
|
-I@top_srcdir@/src/util \
|
Move all XML configuration handling to src/conf/
* src/capabilities.c, src/capabilities.h, src/domain_conf.c,
src/domain_conf.h, src/domain_event.c, src/domain_event.h,
src/interface_conf.c, src/interface_conf.h,
src/network_conf.c, src/network_conf.h, src/node_device_conf.c,
src/node_device_conf.h, src/secret_conf.c, src/secret_conf.h,
src/storage_conf.c, src/storage_conf.h, src/storage_encryption_conf.c,
src/storage_encryption_conf.h: Move to src/conf/
* src/Makefile.am: Add -Isrc/conf to the individual build targets
which need to use XML config APIs. Remove LIBXML_CFLAGS, LIBSSH2_CFLAGS
and SELINUX_CFLAGS from global INCLUDES and only have them in build
targets which actually need them. Create a libvirt_conf.la
convenience library for all config parsers
* src/hostusb.h: Remove bogus include of domain_conf.h
* tests/Makefile.am: Add -Isrc/conf. Remove bogus -I$builddir/src
since it never has any generated header files
* daemon/Makefile.am: Add -Isrc/conf
* proxy/Makefile.am: Add -Isrc/conf and cope with renamed files
* src/hash.c: Remove bogus include of libxml/threads.h
2009-09-16 14:39:12 +00:00
|
|
|
-I@top_srcdir@/include \
|
|
|
|
$(DRIVER_MODULE_CFLAGS) \
|
|
|
|
$(LIBXML_CFLAGS) \
|
|
|
|
-DLIBDIR=\""$(libdir)"\" \
|
|
|
|
-DBINDIR=\""$(libexecdir)"\" \
|
|
|
|
-DSBINDIR=\""$(sbindir)"\" \
|
|
|
|
-DSYSCONF_DIR="\"$(sysconfdir)\"" \
|
|
|
|
-DLOCALEBASEDIR=\""$(datadir)/locale"\" \
|
|
|
|
-DLOCAL_STATE_DIR=\""$(localstatedir)"\" \
|
|
|
|
-DGETTEXT_PACKAGE=\"$(PACKAGE)\" \
|
|
|
|
$(WARN_CFLAGS) \
|
|
|
|
$(LOCK_CHECKING_CFLAGS)
|
2008-11-04 23:37:23 +00:00
|
|
|
|
2009-09-16 11:01:53 +00:00
|
|
|
EXTRA_DIST = $(conf_DATA)
|
2007-10-12 19:54:15 +00:00
|
|
|
|
2009-09-16 11:31:13 +00:00
|
|
|
if WITH_NETWORK
|
|
|
|
UUID=$(shell uuidgen 2>/dev/null)
|
|
|
|
endif
|
2005-11-02 15:37:34 +00:00
|
|
|
|
2006-02-09 17:45:11 +00:00
|
|
|
lib_LTLIBRARIES = libvirt.la
|
2007-06-15 01:21:18 +00:00
|
|
|
|
2008-11-21 12:16:08 +00:00
|
|
|
moddir = $(libdir)/libvirt/drivers
|
|
|
|
mod_LTLIBRARIES =
|
|
|
|
|
2009-10-08 15:40:14 +00:00
|
|
|
confdir = $(sysconfdir)/libvirt
|
|
|
|
conf_DATA =
|
2008-11-21 12:16:08 +00:00
|
|
|
|
2009-10-08 16:06:40 +00:00
|
|
|
augeasdir = $(datadir)/augeas/lenses
|
|
|
|
augeas_DATA =
|
|
|
|
|
|
|
|
augeastestdir = $(datadir)/augeas/lenses/tests
|
|
|
|
augeastest_DATA =
|
|
|
|
|
2008-08-20 20:48:35 +00:00
|
|
|
# These files are not related to driver APIs. Simply generic
|
|
|
|
# helper APIs for various purposes
|
2008-11-17 10:43:30 +00:00
|
|
|
UTIL_SOURCES = \
|
Move all shared utility files to src/util/
* src/bridge.c, src/bridge.h, src/buf.c, src/buf.h, src/cgroup.c,
src/cgroup.h, src/conf.c, src/conf.h, src/event.c, src/event.h,
src/hash.c, src/hash.h, src/hostusb.c, src/hostusb.h,
src/iptables.c, src/iptables.h, src/logging.c, src/logging.h,
src/memory.c, src/memory.h, src/pci.c, src/pci.h, src/qparams.c,
src/qparams.h, src/stats_linux.c, src/stats_linux.h,
src/threads-pthread.c, src/threads-pthread.h, src/threads-win32.c,
src/threads-win32.h, src/threads.c, src/threads.h, src/util.c,
src/util.h, src/uuid.c, src/uuid.h, src/virterror.c,
src/virterror_internal.h, src/xml.c, src/xml.h: Move all files
into src/util/
* daemon/Makefile.am: Add -Isrc/util/ to build flags
* src/Makefile.am: Add -Isrc/util/ to build flags and update for
moved files
* src/libvirt_private.syms: Export cgroup APIs since they're now
in util rather than linking directly to drivers
* src/xen/xs_internal.c: Disable bogus virEventRemoveHandle call
when built under PROXY
* proxy/Makefile.am: Update for changed file locations. Remove
bogus build of event.c
* tools/Makefile.am, tests/Makefile.am: Add -Isrc/util/ to build flags
2009-09-16 15:28:46 +00:00
|
|
|
util/bridge.c util/bridge.h \
|
|
|
|
util/buf.c util/buf.h \
|
|
|
|
util/conf.c util/conf.h \
|
|
|
|
util/cgroup.c util/cgroup.h \
|
|
|
|
util/event.c util/event.h \
|
|
|
|
util/hash.c util/hash.h \
|
|
|
|
util/iptables.c util/iptables.h \
|
|
|
|
util/logging.c util/logging.h \
|
|
|
|
util/memory.c util/memory.h \
|
|
|
|
util/pci.c util/pci.h \
|
|
|
|
util/hostusb.c util/hostusb.h \
|
|
|
|
util/qparams.c util/qparams.h \
|
|
|
|
util/stats_linux.c util/stats_linux.h \
|
2009-09-25 13:20:13 +00:00
|
|
|
util/storage_file.c util/storage_file.h \
|
Move all shared utility files to src/util/
* src/bridge.c, src/bridge.h, src/buf.c, src/buf.h, src/cgroup.c,
src/cgroup.h, src/conf.c, src/conf.h, src/event.c, src/event.h,
src/hash.c, src/hash.h, src/hostusb.c, src/hostusb.h,
src/iptables.c, src/iptables.h, src/logging.c, src/logging.h,
src/memory.c, src/memory.h, src/pci.c, src/pci.h, src/qparams.c,
src/qparams.h, src/stats_linux.c, src/stats_linux.h,
src/threads-pthread.c, src/threads-pthread.h, src/threads-win32.c,
src/threads-win32.h, src/threads.c, src/threads.h, src/util.c,
src/util.h, src/uuid.c, src/uuid.h, src/virterror.c,
src/virterror_internal.h, src/xml.c, src/xml.h: Move all files
into src/util/
* daemon/Makefile.am: Add -Isrc/util/ to build flags
* src/Makefile.am: Add -Isrc/util/ to build flags and update for
moved files
* src/libvirt_private.syms: Export cgroup APIs since they're now
in util rather than linking directly to drivers
* src/xen/xs_internal.c: Disable bogus virEventRemoveHandle call
when built under PROXY
* proxy/Makefile.am: Update for changed file locations. Remove
bogus build of event.c
* tools/Makefile.am, tests/Makefile.am: Add -Isrc/util/ to build flags
2009-09-16 15:28:46 +00:00
|
|
|
util/threads.c util/threads.h \
|
|
|
|
util/threads-pthread.h \
|
|
|
|
util/threads-win32.h \
|
|
|
|
util/uuid.c util/uuid.h \
|
|
|
|
util/util.c util/util.h \
|
|
|
|
util/xml.c util/xml.h \
|
|
|
|
util/virterror.c util/virterror_internal.h
|
|
|
|
|
|
|
|
EXTRA_DIST += util/threads-pthread.c util/threads-win32.c
|
2009-01-15 19:56:05 +00:00
|
|
|
|
2008-11-17 10:43:30 +00:00
|
|
|
# Internal generic driver infrastructure
|
Move all XML configuration handling to src/conf/
* src/capabilities.c, src/capabilities.h, src/domain_conf.c,
src/domain_conf.h, src/domain_event.c, src/domain_event.h,
src/interface_conf.c, src/interface_conf.h,
src/network_conf.c, src/network_conf.h, src/node_device_conf.c,
src/node_device_conf.h, src/secret_conf.c, src/secret_conf.h,
src/storage_conf.c, src/storage_conf.h, src/storage_encryption_conf.c,
src/storage_encryption_conf.h: Move to src/conf/
* src/Makefile.am: Add -Isrc/conf to the individual build targets
which need to use XML config APIs. Remove LIBXML_CFLAGS, LIBSSH2_CFLAGS
and SELINUX_CFLAGS from global INCLUDES and only have them in build
targets which actually need them. Create a libvirt_conf.la
convenience library for all config parsers
* src/hostusb.h: Remove bogus include of domain_conf.h
* tests/Makefile.am: Add -Isrc/conf. Remove bogus -I$builddir/src
since it never has any generated header files
* daemon/Makefile.am: Add -Isrc/conf
* proxy/Makefile.am: Add -Isrc/conf and cope with renamed files
* src/hash.c: Remove bogus include of libxml/threads.h
2009-09-16 14:39:12 +00:00
|
|
|
NODE_INFO_SOURCES = nodeinfo.h nodeinfo.c
|
make NUMA-initialization code more portable and more robust
qemudCapsInitNUMA and umlCapsInitNUMA were identical, so this change
factors them into a new function, virCapsInitNUMA, and puts it in
nodeinfo.c.
In addition to factoring out the duplicates, this change also
adjusts that function definition (along with its macros) so
that it works with Fedora 9's numactl version 1, and makes it
so the code will work even if someone builds the kernel with
CONFIG_NR_CPUS > 4096.
Finally, also perform this NUMA initialization for the lxc
and openvz drivers.
* src/nodeinfo.c: Include <stdint.h>, <numa.h> and "memory.h".
(virCapsInitNUMA): Rename from qemudCapsInitNUMA and umlCapsInitNUMA.
(NUMA_MAX_N_CPUS): Define depending on NUMA API version.
(n_bits, MASK_CPU_ISSET): Define, adjust, use uint64 rather than long.
* src/nodeinfo.h: Include "capabilities.h".
(virCapsInitNUMA): Declare it.
* examples/domain-events/events-c/Makefile.am:
* src/Makefile.am: Add $(NUMACTL_CFLAGS) and $(NUMACTL_LIBS) to various
compile/link-related variables.
* src/qemu_conf.c: Include "nodeinfo.h".
(qemudCapsInitNUMA): Remove duplicate code. Adjust caller.
* src/uml_conf.c (umlCapsInitNUMA): Likewise.
Include "nodeinfo.h".
* src/lxc_conf.c: Include "nodeinfo.h".
(lxcCapsInit): Perform NUMA initialization here, too.
* src/openvz_conf.c (openvzCapsInit): And here.
Include "nodeinfo.h".
* src/libvirt_sym.version.in: Add virCapsInitNUMA so that libvirtd
can link to this function.
2008-12-21 18:55:09 +00:00
|
|
|
DRIVER_SOURCES = \
|
2008-11-21 12:16:08 +00:00
|
|
|
driver.c driver.h \
|
2008-11-17 10:43:30 +00:00
|
|
|
internal.h \
|
|
|
|
datatypes.c datatypes.h \
|
Move all XML configuration handling to src/conf/
* src/capabilities.c, src/capabilities.h, src/domain_conf.c,
src/domain_conf.h, src/domain_event.c, src/domain_event.h,
src/interface_conf.c, src/interface_conf.h,
src/network_conf.c, src/network_conf.h, src/node_device_conf.c,
src/node_device_conf.h, src/secret_conf.c, src/secret_conf.h,
src/storage_conf.c, src/storage_conf.h, src/storage_encryption_conf.c,
src/storage_encryption_conf.h: Move to src/conf/
* src/Makefile.am: Add -Isrc/conf to the individual build targets
which need to use XML config APIs. Remove LIBXML_CFLAGS, LIBSSH2_CFLAGS
and SELINUX_CFLAGS from global INCLUDES and only have them in build
targets which actually need them. Create a libvirt_conf.la
convenience library for all config parsers
* src/hostusb.h: Remove bogus include of domain_conf.h
* tests/Makefile.am: Add -Isrc/conf. Remove bogus -I$builddir/src
since it never has any generated header files
* daemon/Makefile.am: Add -Isrc/conf
* proxy/Makefile.am: Add -Isrc/conf and cope with renamed files
* src/hash.c: Remove bogus include of libxml/threads.h
2009-09-16 14:39:12 +00:00
|
|
|
$(NODE_INFO_SOURCES) \
|
2008-11-17 10:43:30 +00:00
|
|
|
libvirt.c libvirt_internal.h
|
|
|
|
|
|
|
|
|
Move all XML configuration handling to src/conf/
* src/capabilities.c, src/capabilities.h, src/domain_conf.c,
src/domain_conf.h, src/domain_event.c, src/domain_event.h,
src/interface_conf.c, src/interface_conf.h,
src/network_conf.c, src/network_conf.h, src/node_device_conf.c,
src/node_device_conf.h, src/secret_conf.c, src/secret_conf.h,
src/storage_conf.c, src/storage_conf.h, src/storage_encryption_conf.c,
src/storage_encryption_conf.h: Move to src/conf/
* src/Makefile.am: Add -Isrc/conf to the individual build targets
which need to use XML config APIs. Remove LIBXML_CFLAGS, LIBSSH2_CFLAGS
and SELINUX_CFLAGS from global INCLUDES and only have them in build
targets which actually need them. Create a libvirt_conf.la
convenience library for all config parsers
* src/hostusb.h: Remove bogus include of domain_conf.h
* tests/Makefile.am: Add -Isrc/conf. Remove bogus -I$builddir/src
since it never has any generated header files
* daemon/Makefile.am: Add -Isrc/conf
* proxy/Makefile.am: Add -Isrc/conf and cope with renamed files
* src/hash.c: Remove bogus include of libxml/threads.h
2009-09-16 14:39:12 +00:00
|
|
|
# XML configuration format handling sources
|
2008-08-20 20:48:35 +00:00
|
|
|
# Domain driver generic impl APIs
|
|
|
|
DOMAIN_CONF_SOURCES = \
|
Move all XML configuration handling to src/conf/
* src/capabilities.c, src/capabilities.h, src/domain_conf.c,
src/domain_conf.h, src/domain_event.c, src/domain_event.h,
src/interface_conf.c, src/interface_conf.h,
src/network_conf.c, src/network_conf.h, src/node_device_conf.c,
src/node_device_conf.h, src/secret_conf.c, src/secret_conf.h,
src/storage_conf.c, src/storage_conf.h, src/storage_encryption_conf.c,
src/storage_encryption_conf.h: Move to src/conf/
* src/Makefile.am: Add -Isrc/conf to the individual build targets
which need to use XML config APIs. Remove LIBXML_CFLAGS, LIBSSH2_CFLAGS
and SELINUX_CFLAGS from global INCLUDES and only have them in build
targets which actually need them. Create a libvirt_conf.la
convenience library for all config parsers
* src/hostusb.h: Remove bogus include of domain_conf.h
* tests/Makefile.am: Add -Isrc/conf. Remove bogus -I$builddir/src
since it never has any generated header files
* daemon/Makefile.am: Add -Isrc/conf
* proxy/Makefile.am: Add -Isrc/conf and cope with renamed files
* src/hash.c: Remove bogus include of libxml/threads.h
2009-09-16 14:39:12 +00:00
|
|
|
conf/capabilities.c conf/capabilities.h \
|
|
|
|
conf/domain_conf.c conf/domain_conf.h
|
|
|
|
|
|
|
|
DOMAIN_EVENT_SOURCES = \
|
|
|
|
conf/domain_event.c conf/domain_event.h
|
2008-08-20 20:48:35 +00:00
|
|
|
|
|
|
|
# Network driver generic impl APIs
|
Move all XML configuration handling to src/conf/
* src/capabilities.c, src/capabilities.h, src/domain_conf.c,
src/domain_conf.h, src/domain_event.c, src/domain_event.h,
src/interface_conf.c, src/interface_conf.h,
src/network_conf.c, src/network_conf.h, src/node_device_conf.c,
src/node_device_conf.h, src/secret_conf.c, src/secret_conf.h,
src/storage_conf.c, src/storage_conf.h, src/storage_encryption_conf.c,
src/storage_encryption_conf.h: Move to src/conf/
* src/Makefile.am: Add -Isrc/conf to the individual build targets
which need to use XML config APIs. Remove LIBXML_CFLAGS, LIBSSH2_CFLAGS
and SELINUX_CFLAGS from global INCLUDES and only have them in build
targets which actually need them. Create a libvirt_conf.la
convenience library for all config parsers
* src/hostusb.h: Remove bogus include of domain_conf.h
* tests/Makefile.am: Add -Isrc/conf. Remove bogus -I$builddir/src
since it never has any generated header files
* daemon/Makefile.am: Add -Isrc/conf
* proxy/Makefile.am: Add -Isrc/conf and cope with renamed files
* src/hash.c: Remove bogus include of libxml/threads.h
2009-09-16 14:39:12 +00:00
|
|
|
NETWORK_CONF_SOURCES = \
|
|
|
|
conf/network_conf.c conf/network_conf.h
|
2008-08-20 20:48:35 +00:00
|
|
|
|
|
|
|
# Storage driver generic impl APIs
|
Move all XML configuration handling to src/conf/
* src/capabilities.c, src/capabilities.h, src/domain_conf.c,
src/domain_conf.h, src/domain_event.c, src/domain_event.h,
src/interface_conf.c, src/interface_conf.h,
src/network_conf.c, src/network_conf.h, src/node_device_conf.c,
src/node_device_conf.h, src/secret_conf.c, src/secret_conf.h,
src/storage_conf.c, src/storage_conf.h, src/storage_encryption_conf.c,
src/storage_encryption_conf.h: Move to src/conf/
* src/Makefile.am: Add -Isrc/conf to the individual build targets
which need to use XML config APIs. Remove LIBXML_CFLAGS, LIBSSH2_CFLAGS
and SELINUX_CFLAGS from global INCLUDES and only have them in build
targets which actually need them. Create a libvirt_conf.la
convenience library for all config parsers
* src/hostusb.h: Remove bogus include of domain_conf.h
* tests/Makefile.am: Add -Isrc/conf. Remove bogus -I$builddir/src
since it never has any generated header files
* daemon/Makefile.am: Add -Isrc/conf
* proxy/Makefile.am: Add -Isrc/conf and cope with renamed files
* src/hash.c: Remove bogus include of libxml/threads.h
2009-09-16 14:39:12 +00:00
|
|
|
STORAGE_CONF_SOURCES = \
|
|
|
|
conf/storage_conf.h conf/storage_conf.c
|
2008-08-20 20:48:35 +00:00
|
|
|
|
2009-07-15 17:34:04 +00:00
|
|
|
# Interface driver generic impl APIs
|
Move all XML configuration handling to src/conf/
* src/capabilities.c, src/capabilities.h, src/domain_conf.c,
src/domain_conf.h, src/domain_event.c, src/domain_event.h,
src/interface_conf.c, src/interface_conf.h,
src/network_conf.c, src/network_conf.h, src/node_device_conf.c,
src/node_device_conf.h, src/secret_conf.c, src/secret_conf.h,
src/storage_conf.c, src/storage_conf.h, src/storage_encryption_conf.c,
src/storage_encryption_conf.h: Move to src/conf/
* src/Makefile.am: Add -Isrc/conf to the individual build targets
which need to use XML config APIs. Remove LIBXML_CFLAGS, LIBSSH2_CFLAGS
and SELINUX_CFLAGS from global INCLUDES and only have them in build
targets which actually need them. Create a libvirt_conf.la
convenience library for all config parsers
* src/hostusb.h: Remove bogus include of domain_conf.h
* tests/Makefile.am: Add -Isrc/conf. Remove bogus -I$builddir/src
since it never has any generated header files
* daemon/Makefile.am: Add -Isrc/conf
* proxy/Makefile.am: Add -Isrc/conf and cope with renamed files
* src/hash.c: Remove bogus include of libxml/threads.h
2009-09-16 14:39:12 +00:00
|
|
|
INTERFACE_CONF_SOURCES = \
|
|
|
|
conf/interface_conf.c conf/interface_conf.h
|
2008-08-20 20:48:35 +00:00
|
|
|
|
2009-09-01 15:27:46 +00:00
|
|
|
# Secret driver generic impl APIs
|
Move all XML configuration handling to src/conf/
* src/capabilities.c, src/capabilities.h, src/domain_conf.c,
src/domain_conf.h, src/domain_event.c, src/domain_event.h,
src/interface_conf.c, src/interface_conf.h,
src/network_conf.c, src/network_conf.h, src/node_device_conf.c,
src/node_device_conf.h, src/secret_conf.c, src/secret_conf.h,
src/storage_conf.c, src/storage_conf.h, src/storage_encryption_conf.c,
src/storage_encryption_conf.h: Move to src/conf/
* src/Makefile.am: Add -Isrc/conf to the individual build targets
which need to use XML config APIs. Remove LIBXML_CFLAGS, LIBSSH2_CFLAGS
and SELINUX_CFLAGS from global INCLUDES and only have them in build
targets which actually need them. Create a libvirt_conf.la
convenience library for all config parsers
* src/hostusb.h: Remove bogus include of domain_conf.h
* tests/Makefile.am: Add -Isrc/conf. Remove bogus -I$builddir/src
since it never has any generated header files
* daemon/Makefile.am: Add -Isrc/conf
* proxy/Makefile.am: Add -Isrc/conf and cope with renamed files
* src/hash.c: Remove bogus include of libxml/threads.h
2009-09-16 14:39:12 +00:00
|
|
|
SECRET_CONF_SOURCES = \
|
|
|
|
conf/secret_conf.h conf/secret_conf.c
|
|
|
|
|
|
|
|
# Network driver generic impl APIs
|
|
|
|
NODE_DEVICE_CONF_SOURCES = \
|
|
|
|
conf/node_device_conf.c conf/node_device_conf.h
|
|
|
|
|
|
|
|
ENCRYPTION_CONF_SOURCES = \
|
|
|
|
conf/storage_encryption_conf.c conf/storage_encryption_conf.h
|
|
|
|
|
|
|
|
CONF_SOURCES = \
|
|
|
|
$(DOMAIN_CONF_SOURCES) \
|
|
|
|
$(DOMAIN_EVENT_SOURCES) \
|
|
|
|
$(NETWORK_CONF_SOURCES) \
|
|
|
|
$(NODE_DEVICE_CONF_SOURCES) \
|
|
|
|
$(STORAGE_CONF_SOURCES) \
|
|
|
|
$(ENCRYPTION_CONF_SOURCES) \
|
|
|
|
$(INTERFACE_CONF_SOURCES) \
|
|
|
|
$(SECRET_CONF_SOURCES)
|
2009-09-01 15:27:46 +00:00
|
|
|
|
2008-08-20 20:48:35 +00:00
|
|
|
# The remote RPC driver, covering domains, storage, networks, etc
|
|
|
|
REMOTE_DRIVER_SOURCES = \
|
2009-09-15 17:47:05 +00:00
|
|
|
gnutls_1_0_compat.h \
|
|
|
|
remote/remote_driver.c remote/remote_driver.h \
|
2009-09-16 15:55:16 +00:00
|
|
|
remote/remote_protocol.c \
|
|
|
|
remote/remote_protocol.h
|
|
|
|
|
|
|
|
EXTRA_DIST += remote/remote_protocol.x remote/rpcgen_fix.pl
|
2008-08-20 20:48:35 +00:00
|
|
|
|
|
|
|
# Mock driver, covering domains, storage, networks, etc
|
|
|
|
TEST_DRIVER_SOURCES = \
|
2009-09-15 17:38:50 +00:00
|
|
|
test/test_driver.c test/test_driver.h
|
2008-08-20 20:48:35 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Now the Hypervisor specific drivers
|
|
|
|
XEN_DRIVER_SOURCES = \
|
Move xen driver code into src/xen/ directory
* src/Makefile.am, src/proxy_internal.c, src/proxy_internal.h
src/sexpr.c, src/sexpr.h, src/xen_unified.c, src/xen_unified.h,
src/xen_internal.c, src/xen_internal.h, src/xen_inotify.c,
src/xen_inotify.h, src/xend_internal.c, src/xend_internal.h,
src/xm_internal.c, src/xm_internal.h, src/xs_internal.c,
src/xs_internal.h: Move to src/xen/ directory
* proxy/Makefile.am, proxy/libvirt_proxy.c, src/Makefile.am,
src/libvirt.c, tests/sexpr2xmltest.c, tests/statstest.c,
tests/xencapstest.c, tests/xmconfigtest.c, tests/xml2sexprtest.c:
Adapt to changed xen location
* src/stats_linux.h, src/stats_linux.c: Remove xen specific block
stats APIs
* src/qemu_driver.c, src/uml_driver.c: Add missing sys/un.h include
uncovered after change to stats_linux.h
* src/xen/block_stats.h, src/xen/block_stats.c: Add xen specific
block stats APIs
2009-09-15 15:38:33 +00:00
|
|
|
xen/proxy_internal.c xen/proxy_internal.h \
|
|
|
|
xen/sexpr.c xen/sexpr.h \
|
|
|
|
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
|
2008-11-25 10:44:52 +00:00
|
|
|
if WITH_XEN_INOTIFY
|
Move xen driver code into src/xen/ directory
* src/Makefile.am, src/proxy_internal.c, src/proxy_internal.h
src/sexpr.c, src/sexpr.h, src/xen_unified.c, src/xen_unified.h,
src/xen_internal.c, src/xen_internal.h, src/xen_inotify.c,
src/xen_inotify.h, src/xend_internal.c, src/xend_internal.h,
src/xm_internal.c, src/xm_internal.h, src/xs_internal.c,
src/xs_internal.h: Move to src/xen/ directory
* proxy/Makefile.am, proxy/libvirt_proxy.c, src/Makefile.am,
src/libvirt.c, tests/sexpr2xmltest.c, tests/statstest.c,
tests/xencapstest.c, tests/xmconfigtest.c, tests/xml2sexprtest.c:
Adapt to changed xen location
* src/stats_linux.h, src/stats_linux.c: Remove xen specific block
stats APIs
* src/qemu_driver.c, src/uml_driver.c: Add missing sys/un.h include
uncovered after change to stats_linux.h
* src/xen/block_stats.h, src/xen/block_stats.c: Add xen specific
block stats APIs
2009-09-15 15:38:33 +00:00
|
|
|
XEN_DRIVER_SOURCES += xen/xen_inotify.c xen/xen_inotify.h
|
2008-11-25 10:44:52 +00:00
|
|
|
endif
|
2008-08-20 20:48:35 +00:00
|
|
|
|
|
|
|
LXC_DRIVER_SOURCES = \
|
2009-09-15 16:03:01 +00:00
|
|
|
lxc/lxc_conf.c lxc/lxc_conf.h \
|
|
|
|
lxc/lxc_container.c lxc/lxc_container.h \
|
|
|
|
lxc/lxc_driver.c lxc/lxc_driver.h \
|
Move all shared utility files to src/util/
* src/bridge.c, src/bridge.h, src/buf.c, src/buf.h, src/cgroup.c,
src/cgroup.h, src/conf.c, src/conf.h, src/event.c, src/event.h,
src/hash.c, src/hash.h, src/hostusb.c, src/hostusb.h,
src/iptables.c, src/iptables.h, src/logging.c, src/logging.h,
src/memory.c, src/memory.h, src/pci.c, src/pci.h, src/qparams.c,
src/qparams.h, src/stats_linux.c, src/stats_linux.h,
src/threads-pthread.c, src/threads-pthread.h, src/threads-win32.c,
src/threads-win32.h, src/threads.c, src/threads.h, src/util.c,
src/util.h, src/uuid.c, src/uuid.h, src/virterror.c,
src/virterror_internal.h, src/xml.c, src/xml.h: Move all files
into src/util/
* daemon/Makefile.am: Add -Isrc/util/ to build flags
* src/Makefile.am: Add -Isrc/util/ to build flags and update for
moved files
* src/libvirt_private.syms: Export cgroup APIs since they're now
in util rather than linking directly to drivers
* src/xen/xs_internal.c: Disable bogus virEventRemoveHandle call
when built under PROXY
* proxy/Makefile.am: Update for changed file locations. Remove
bogus build of event.c
* tools/Makefile.am, tests/Makefile.am: Add -Isrc/util/ to build flags
2009-09-16 15:28:46 +00:00
|
|
|
lxc/veth.c lxc/veth.h
|
2005-11-10 16:12:31 +00:00
|
|
|
|
2008-08-20 20:55:32 +00:00
|
|
|
LXC_CONTROLLER_SOURCES = \
|
2009-09-15 16:03:01 +00:00
|
|
|
lxc/lxc_conf.c lxc/lxc_conf.h \
|
|
|
|
lxc/lxc_container.c lxc/lxc_container.h \
|
|
|
|
lxc/lxc_controller.c \
|
Move all shared utility files to src/util/
* src/bridge.c, src/bridge.h, src/buf.c, src/buf.h, src/cgroup.c,
src/cgroup.h, src/conf.c, src/conf.h, src/event.c, src/event.h,
src/hash.c, src/hash.h, src/hostusb.c, src/hostusb.h,
src/iptables.c, src/iptables.h, src/logging.c, src/logging.h,
src/memory.c, src/memory.h, src/pci.c, src/pci.h, src/qparams.c,
src/qparams.h, src/stats_linux.c, src/stats_linux.h,
src/threads-pthread.c, src/threads-pthread.h, src/threads-win32.c,
src/threads-win32.h, src/threads.c, src/threads.h, src/util.c,
src/util.h, src/uuid.c, src/uuid.h, src/virterror.c,
src/virterror_internal.h, src/xml.c, src/xml.h: Move all files
into src/util/
* daemon/Makefile.am: Add -Isrc/util/ to build flags
* src/Makefile.am: Add -Isrc/util/ to build flags and update for
moved files
* src/libvirt_private.syms: Export cgroup APIs since they're now
in util rather than linking directly to drivers
* src/xen/xs_internal.c: Disable bogus virEventRemoveHandle call
when built under PROXY
* proxy/Makefile.am: Update for changed file locations. Remove
bogus build of event.c
* tools/Makefile.am, tests/Makefile.am: Add -Isrc/util/ to build flags
2009-09-16 15:28:46 +00:00
|
|
|
lxc/veth.c lxc/veth.h
|
2008-08-20 20:55:32 +00:00
|
|
|
|
2009-10-08 14:34:22 +00:00
|
|
|
SECURITY_DRIVER_APPARMOR_HELPER_SOURCES = \
|
|
|
|
security/virt-aa-helper.c
|
|
|
|
|
2009-07-24 14:17:06 +00:00
|
|
|
PHYP_DRIVER_SOURCES = \
|
|
|
|
phyp/phyp_driver.c phyp/phyp_driver.h
|
|
|
|
|
2008-08-20 20:48:35 +00:00
|
|
|
OPENVZ_DRIVER_SOURCES = \
|
2009-09-15 16:32:56 +00:00
|
|
|
openvz/openvz_conf.c openvz/openvz_conf.h \
|
|
|
|
openvz/openvz_driver.c openvz/openvz_driver.h
|
2007-06-15 01:21:18 +00:00
|
|
|
|
2009-07-24 14:17:06 +00:00
|
|
|
VBOX_DRIVER_SOURCES = \
|
|
|
|
vbox/vbox_XPCOMCGlue.c vbox/vbox_XPCOMCGlue.h \
|
|
|
|
vbox/vbox_driver.c vbox/vbox_driver.h \
|
2009-07-24 16:12:16 +00:00
|
|
|
vbox/vbox_V2_2.c vbox/vbox_CAPI_v2_2.h \
|
|
|
|
vbox/vbox_V3_0.c vbox/vbox_CAPI_v3_0.h
|
2009-04-17 16:09:07 +00:00
|
|
|
|
2009-04-19 16:36:22 +00:00
|
|
|
VBOX_DRIVER_EXTRA_DIST = vbox/vbox_tmpl.c vbox/README
|
|
|
|
|
2008-08-20 20:48:35 +00:00
|
|
|
QEMU_DRIVER_SOURCES = \
|
Move all shared utility files to src/util/
* src/bridge.c, src/bridge.h, src/buf.c, src/buf.h, src/cgroup.c,
src/cgroup.h, src/conf.c, src/conf.h, src/event.c, src/event.h,
src/hash.c, src/hash.h, src/hostusb.c, src/hostusb.h,
src/iptables.c, src/iptables.h, src/logging.c, src/logging.h,
src/memory.c, src/memory.h, src/pci.c, src/pci.h, src/qparams.c,
src/qparams.h, src/stats_linux.c, src/stats_linux.h,
src/threads-pthread.c, src/threads-pthread.h, src/threads-win32.c,
src/threads-win32.h, src/threads.c, src/threads.h, src/util.c,
src/util.h, src/uuid.c, src/uuid.h, src/virterror.c,
src/virterror_internal.h, src/xml.c, src/xml.h: Move all files
into src/util/
* daemon/Makefile.am: Add -Isrc/util/ to build flags
* src/Makefile.am: Add -Isrc/util/ to build flags and update for
moved files
* src/libvirt_private.syms: Export cgroup APIs since they're now
in util rather than linking directly to drivers
* src/xen/xs_internal.c: Disable bogus virEventRemoveHandle call
when built under PROXY
* proxy/Makefile.am: Update for changed file locations. Remove
bogus build of event.c
* tools/Makefile.am, tests/Makefile.am: Add -Isrc/util/ to build flags
2009-09-16 15:28:46 +00:00
|
|
|
qemu/qemu_conf.c qemu/qemu_conf.h \
|
2009-09-22 17:48:40 +00:00
|
|
|
qemu/qemu_monitor_text.c \
|
|
|
|
qemu/qemu_monitor_text.h \
|
Move all shared utility files to src/util/
* src/bridge.c, src/bridge.h, src/buf.c, src/buf.h, src/cgroup.c,
src/cgroup.h, src/conf.c, src/conf.h, src/event.c, src/event.h,
src/hash.c, src/hash.h, src/hostusb.c, src/hostusb.h,
src/iptables.c, src/iptables.h, src/logging.c, src/logging.h,
src/memory.c, src/memory.h, src/pci.c, src/pci.h, src/qparams.c,
src/qparams.h, src/stats_linux.c, src/stats_linux.h,
src/threads-pthread.c, src/threads-pthread.h, src/threads-win32.c,
src/threads-win32.h, src/threads.c, src/threads.h, src/util.c,
src/util.h, src/uuid.c, src/uuid.h, src/virterror.c,
src/virterror_internal.h, src/xml.c, src/xml.h: Move all files
into src/util/
* daemon/Makefile.am: Add -Isrc/util/ to build flags
* src/Makefile.am: Add -Isrc/util/ to build flags and update for
moved files
* src/libvirt_private.syms: Export cgroup APIs since they're now
in util rather than linking directly to drivers
* src/xen/xs_internal.c: Disable bogus virEventRemoveHandle call
when built under PROXY
* proxy/Makefile.am: Update for changed file locations. Remove
bogus build of event.c
* tools/Makefile.am, tests/Makefile.am: Add -Isrc/util/ to build flags
2009-09-16 15:28:46 +00:00
|
|
|
qemu/qemu_driver.c qemu/qemu_driver.h
|
2008-04-18 08:33:23 +00:00
|
|
|
|
2008-11-19 16:58:23 +00:00
|
|
|
UML_DRIVER_SOURCES = \
|
2009-09-15 16:25:30 +00:00
|
|
|
uml/uml_conf.c uml/uml_conf.h \
|
|
|
|
uml/uml_driver.c uml/uml_driver.h
|
2008-11-19 16:58:23 +00:00
|
|
|
|
2009-07-24 14:17:06 +00:00
|
|
|
ONE_DRIVER_SOURCES = \
|
|
|
|
./opennebula/one_conf.c \
|
|
|
|
./opennebula/one_conf.h \
|
|
|
|
./opennebula/one_driver.c \
|
|
|
|
./opennebula/one_driver.h \
|
|
|
|
./opennebula/one_client.c \
|
2009-06-24 17:32:56 +00:00
|
|
|
./opennebula/one_client.h
|
2009-05-25 11:56:00 +00:00
|
|
|
|
2009-07-24 14:17:06 +00:00
|
|
|
ESX_DRIVER_SOURCES = \
|
|
|
|
esx/esx_driver.c esx/esx_driver.h \
|
|
|
|
esx/esx_util.c esx/esx_util.h \
|
|
|
|
esx/esx_vi.c esx/esx_vi.h \
|
2009-07-23 20:21:08 +00:00
|
|
|
esx/esx_vi_methods.c esx/esx_vi_methods.h \
|
|
|
|
esx/esx_vi_types.c esx/esx_vi_types.h \
|
|
|
|
esx/esx_vmx.c esx/esx_vmx.h
|
|
|
|
|
2008-10-10 13:57:13 +00:00
|
|
|
NETWORK_DRIVER_SOURCES = \
|
2009-09-15 17:52:58 +00:00
|
|
|
network/bridge_driver.h network/bridge_driver.c
|
2008-08-20 20:48:35 +00:00
|
|
|
|
2009-07-21 14:02:16 +00:00
|
|
|
INTERFACE_DRIVER_SOURCES = \
|
2009-09-15 17:55:16 +00:00
|
|
|
interface/netcf_driver.h interface/netcf_driver.c
|
2009-07-21 14:02:16 +00:00
|
|
|
|
2009-08-14 19:48:55 +00:00
|
|
|
SECRET_DRIVER_SOURCES = \
|
2009-09-15 17:59:58 +00:00
|
|
|
secret/secret_driver.h secret/secret_driver.c
|
2009-08-14 19:48:55 +00:00
|
|
|
|
2009-03-03 09:44:41 +00:00
|
|
|
# Storage backend specific impls
|
2008-08-20 20:48:35 +00:00
|
|
|
STORAGE_DRIVER_SOURCES = \
|
2009-09-15 16:55:05 +00:00
|
|
|
storage/storage_driver.h storage/storage_driver.c \
|
|
|
|
storage/storage_backend.h storage/storage_backend.c
|
2008-08-20 20:48:35 +00:00
|
|
|
|
|
|
|
STORAGE_DRIVER_FS_SOURCES = \
|
2009-09-15 16:55:05 +00:00
|
|
|
storage/storage_backend_fs.h storage/storage_backend_fs.c
|
2008-04-18 08:33:23 +00:00
|
|
|
|
2008-08-20 20:48:35 +00:00
|
|
|
STORAGE_DRIVER_LVM_SOURCES = \
|
2009-09-15 16:55:05 +00:00
|
|
|
storage/storage_backend_logical.h \
|
|
|
|
storage/storage_backend_logical.c
|
2008-08-20 20:48:35 +00:00
|
|
|
|
|
|
|
STORAGE_DRIVER_ISCSI_SOURCES = \
|
2009-09-15 16:55:05 +00:00
|
|
|
storage/storage_backend_iscsi.h storage/storage_backend_iscsi.c
|
2008-08-20 20:48:35 +00:00
|
|
|
|
2009-04-01 16:03:22 +00:00
|
|
|
STORAGE_DRIVER_SCSI_SOURCES = \
|
2009-09-15 16:55:05 +00:00
|
|
|
storage/storage_backend_scsi.h storage/storage_backend_scsi.c
|
2009-04-01 16:03:22 +00:00
|
|
|
|
2009-09-08 13:47:45 +00:00
|
|
|
STORAGE_DRIVER_MPATH_SOURCES = \
|
2009-09-15 16:55:05 +00:00
|
|
|
storage/storage_backend_mpath.h storage/storage_backend_mpath.c
|
2009-09-08 13:47:45 +00:00
|
|
|
|
2008-08-20 20:48:35 +00:00
|
|
|
STORAGE_DRIVER_DISK_SOURCES = \
|
2009-09-15 16:55:05 +00:00
|
|
|
storage/storage_backend_disk.h storage/storage_backend_disk.c
|
2008-08-20 20:48:35 +00:00
|
|
|
|
|
|
|
STORAGE_HELPER_DISK_SOURCES = \
|
2009-09-15 16:55:05 +00:00
|
|
|
storage/parthelper.c
|
2008-08-20 20:48:35 +00:00
|
|
|
|
|
|
|
|
2009-03-03 09:44:41 +00:00
|
|
|
# Security framework and drivers for various models
|
2009-07-24 14:17:06 +00:00
|
|
|
SECURITY_DRIVER_SOURCES = \
|
2009-09-15 18:06:37 +00:00
|
|
|
security/security_driver.h security/security_driver.c
|
2009-03-03 09:44:41 +00:00
|
|
|
|
2009-03-03 10:06:49 +00:00
|
|
|
SECURITY_DRIVER_SELINUX_SOURCES = \
|
2009-09-15 18:06:37 +00:00
|
|
|
security/security_selinux.h security/security_selinux.c
|
2009-03-03 10:06:49 +00:00
|
|
|
|
2009-10-08 14:34:22 +00:00
|
|
|
SECURITY_DRIVER_APPARMOR_SOURCES = \
|
|
|
|
security/security_apparmor.h security/security_apparmor.c
|
|
|
|
|
2009-03-03 09:44:41 +00:00
|
|
|
|
2008-11-21 12:27:11 +00:00
|
|
|
NODE_DEVICE_DRIVER_SOURCES = \
|
2009-09-15 17:30:17 +00:00
|
|
|
node_device/node_device_driver.c node_device/node_device_driver.h
|
2008-11-21 12:27:11 +00:00
|
|
|
|
|
|
|
NODE_DEVICE_DRIVER_HAL_SOURCES = \
|
2009-09-15 17:30:17 +00:00
|
|
|
node_device/node_device_hal.c \
|
|
|
|
node_device/node_device_hal.h \
|
|
|
|
node_device/node_device_hal_linux.c
|
2009-06-02 15:12:53 +00:00
|
|
|
|
2008-11-21 12:27:11 +00:00
|
|
|
NODE_DEVICE_DRIVER_DEVKIT_SOURCES = \
|
2009-09-15 17:30:17 +00:00
|
|
|
node_device/node_device_devkit.c
|
2008-11-21 12:27:11 +00:00
|
|
|
|
2008-08-20 20:48:35 +00:00
|
|
|
|
|
|
|
#########################
|
|
|
|
#
|
|
|
|
# Build up list of libvirt.la source files based on configure conditions
|
|
|
|
#
|
|
|
|
# First deal with sources usable in non-daemon context
|
|
|
|
|
2008-11-17 10:43:30 +00:00
|
|
|
noinst_LTLIBRARIES = libvirt_util.la
|
|
|
|
libvirt_la_LIBADD = libvirt_util.la
|
|
|
|
libvirt_util_la_SOURCES = \
|
|
|
|
$(UTIL_SOURCES)
|
2009-06-29 17:00:52 +00:00
|
|
|
libvirt_util_la_CFLAGS = $(CAPNG_CFLAGS)
|
|
|
|
libvirt_util_la_LDFLAGS = $(CAPNG_LIBS)
|
2008-11-17 10:43:30 +00:00
|
|
|
|
Move all XML configuration handling to src/conf/
* src/capabilities.c, src/capabilities.h, src/domain_conf.c,
src/domain_conf.h, src/domain_event.c, src/domain_event.h,
src/interface_conf.c, src/interface_conf.h,
src/network_conf.c, src/network_conf.h, src/node_device_conf.c,
src/node_device_conf.h, src/secret_conf.c, src/secret_conf.h,
src/storage_conf.c, src/storage_conf.h, src/storage_encryption_conf.c,
src/storage_encryption_conf.h: Move to src/conf/
* src/Makefile.am: Add -Isrc/conf to the individual build targets
which need to use XML config APIs. Remove LIBXML_CFLAGS, LIBSSH2_CFLAGS
and SELINUX_CFLAGS from global INCLUDES and only have them in build
targets which actually need them. Create a libvirt_conf.la
convenience library for all config parsers
* src/hostusb.h: Remove bogus include of domain_conf.h
* tests/Makefile.am: Add -Isrc/conf. Remove bogus -I$builddir/src
since it never has any generated header files
* daemon/Makefile.am: Add -Isrc/conf
* proxy/Makefile.am: Add -Isrc/conf and cope with renamed files
* src/hash.c: Remove bogus include of libxml/threads.h
2009-09-16 14:39:12 +00:00
|
|
|
|
|
|
|
noinst_LTLIBRARIES += libvirt_conf.la
|
|
|
|
libvirt_la_LIBADD += libvirt_conf.la
|
|
|
|
libvirt_conf_la_SOURCES = $(CONF_SOURCES)
|
|
|
|
libvirt_conf_la_CFLAGS =
|
|
|
|
libvirt_conf_la_LDFLAGS =
|
|
|
|
|
|
|
|
|
2008-11-17 10:43:30 +00:00
|
|
|
noinst_LTLIBRARIES += libvirt_driver.la
|
|
|
|
libvirt_la_LIBADD += libvirt_driver.la
|
Move all XML configuration handling to src/conf/
* src/capabilities.c, src/capabilities.h, src/domain_conf.c,
src/domain_conf.h, src/domain_event.c, src/domain_event.h,
src/interface_conf.c, src/interface_conf.h,
src/network_conf.c, src/network_conf.h, src/node_device_conf.c,
src/node_device_conf.h, src/secret_conf.c, src/secret_conf.h,
src/storage_conf.c, src/storage_conf.h, src/storage_encryption_conf.c,
src/storage_encryption_conf.h: Move to src/conf/
* src/Makefile.am: Add -Isrc/conf to the individual build targets
which need to use XML config APIs. Remove LIBXML_CFLAGS, LIBSSH2_CFLAGS
and SELINUX_CFLAGS from global INCLUDES and only have them in build
targets which actually need them. Create a libvirt_conf.la
convenience library for all config parsers
* src/hostusb.h: Remove bogus include of domain_conf.h
* tests/Makefile.am: Add -Isrc/conf. Remove bogus -I$builddir/src
since it never has any generated header files
* daemon/Makefile.am: Add -Isrc/conf
* proxy/Makefile.am: Add -Isrc/conf and cope with renamed files
* src/hash.c: Remove bogus include of libxml/threads.h
2009-09-16 14:39:12 +00:00
|
|
|
libvirt_driver_la_SOURCES = $(DRIVER_SOURCES)
|
2008-11-21 12:20:45 +00:00
|
|
|
|
Move all XML configuration handling to src/conf/
* src/capabilities.c, src/capabilities.h, src/domain_conf.c,
src/domain_conf.h, src/domain_event.c, src/domain_event.h,
src/interface_conf.c, src/interface_conf.h,
src/network_conf.c, src/network_conf.h, src/node_device_conf.c,
src/node_device_conf.h, src/secret_conf.c, src/secret_conf.h,
src/storage_conf.c, src/storage_conf.h, src/storage_encryption_conf.c,
src/storage_encryption_conf.h: Move to src/conf/
* src/Makefile.am: Add -Isrc/conf to the individual build targets
which need to use XML config APIs. Remove LIBXML_CFLAGS, LIBSSH2_CFLAGS
and SELINUX_CFLAGS from global INCLUDES and only have them in build
targets which actually need them. Create a libvirt_conf.la
convenience library for all config parsers
* src/hostusb.h: Remove bogus include of domain_conf.h
* tests/Makefile.am: Add -Isrc/conf. Remove bogus -I$builddir/src
since it never has any generated header files
* daemon/Makefile.am: Add -Isrc/conf
* proxy/Makefile.am: Add -Isrc/conf and cope with renamed files
* src/hash.c: Remove bogus include of libxml/threads.h
2009-09-16 14:39:12 +00:00
|
|
|
libvirt_driver_la_CFLAGS = $(NUMACTL_CFLAGS) \
|
|
|
|
-I@top_srcdir@/src/conf
|
Move xen driver code into src/xen/ directory
* src/Makefile.am, src/proxy_internal.c, src/proxy_internal.h
src/sexpr.c, src/sexpr.h, src/xen_unified.c, src/xen_unified.h,
src/xen_internal.c, src/xen_internal.h, src/xen_inotify.c,
src/xen_inotify.h, src/xend_internal.c, src/xend_internal.h,
src/xm_internal.c, src/xm_internal.h, src/xs_internal.c,
src/xs_internal.h: Move to src/xen/ directory
* proxy/Makefile.am, proxy/libvirt_proxy.c, src/Makefile.am,
src/libvirt.c, tests/sexpr2xmltest.c, tests/statstest.c,
tests/xencapstest.c, tests/xmconfigtest.c, tests/xml2sexprtest.c:
Adapt to changed xen location
* src/stats_linux.h, src/stats_linux.c: Remove xen specific block
stats APIs
* src/qemu_driver.c, src/uml_driver.c: Add missing sys/un.h include
uncovered after change to stats_linux.h
* src/xen/block_stats.h, src/xen/block_stats.c: Add xen specific
block stats APIs
2009-09-15 15:38:33 +00:00
|
|
|
libvirt_driver_la_LDFLAGS = $(NUMACTL_LIBS)
|
2008-08-20 20:48:35 +00:00
|
|
|
|
2009-01-06 15:16:43 +00:00
|
|
|
USED_SYM_FILES = libvirt_private.syms
|
2009-01-05 14:05:29 +00:00
|
|
|
|
2008-08-20 20:48:35 +00:00
|
|
|
if WITH_TEST
|
2008-11-21 12:16:08 +00:00
|
|
|
if WITH_DRIVER_MODULES
|
|
|
|
mod_LTLIBRARIES += libvirt_driver_test.la
|
|
|
|
else
|
2008-11-17 10:43:30 +00:00
|
|
|
noinst_LTLIBRARIES += libvirt_driver_test.la
|
|
|
|
libvirt_la_LIBADD += libvirt_driver_test.la
|
2008-11-21 12:16:08 +00:00
|
|
|
endif
|
Move all XML configuration handling to src/conf/
* src/capabilities.c, src/capabilities.h, src/domain_conf.c,
src/domain_conf.h, src/domain_event.c, src/domain_event.h,
src/interface_conf.c, src/interface_conf.h,
src/network_conf.c, src/network_conf.h, src/node_device_conf.c,
src/node_device_conf.h, src/secret_conf.c, src/secret_conf.h,
src/storage_conf.c, src/storage_conf.h, src/storage_encryption_conf.c,
src/storage_encryption_conf.h: Move to src/conf/
* src/Makefile.am: Add -Isrc/conf to the individual build targets
which need to use XML config APIs. Remove LIBXML_CFLAGS, LIBSSH2_CFLAGS
and SELINUX_CFLAGS from global INCLUDES and only have them in build
targets which actually need them. Create a libvirt_conf.la
convenience library for all config parsers
* src/hostusb.h: Remove bogus include of domain_conf.h
* tests/Makefile.am: Add -Isrc/conf. Remove bogus -I$builddir/src
since it never has any generated header files
* daemon/Makefile.am: Add -Isrc/conf
* proxy/Makefile.am: Add -Isrc/conf and cope with renamed files
* src/hash.c: Remove bogus include of libxml/threads.h
2009-09-16 14:39:12 +00:00
|
|
|
libvirt_driver_test_la_CFLAGS = \
|
|
|
|
-I@top_srcdir@/src/conf
|
2008-11-21 12:16:08 +00:00
|
|
|
if WITH_DRIVER_MODULES
|
|
|
|
libvirt_driver_test_la_LDFLAGS = -module -avoid-version
|
|
|
|
endif
|
2008-11-17 10:43:30 +00:00
|
|
|
libvirt_driver_test_la_SOURCES = $(TEST_DRIVER_SOURCES)
|
2008-08-20 20:48:35 +00:00
|
|
|
endif
|
|
|
|
|
|
|
|
if WITH_REMOTE
|
2008-11-21 12:16:08 +00:00
|
|
|
if WITH_DRIVER_MODULES
|
|
|
|
mod_LTLIBRARIES += libvirt_driver_remote.la
|
|
|
|
else
|
2008-11-17 10:43:30 +00:00
|
|
|
noinst_LTLIBRARIES += libvirt_driver_remote.la
|
|
|
|
libvirt_la_LIBADD += libvirt_driver_remote.la
|
2008-11-21 12:16:08 +00:00
|
|
|
endif
|
2008-11-17 10:43:30 +00:00
|
|
|
libvirt_driver_remote_la_CFLAGS = \
|
|
|
|
$(GNUTLS_CFLAGS) \
|
Move all XML configuration handling to src/conf/
* src/capabilities.c, src/capabilities.h, src/domain_conf.c,
src/domain_conf.h, src/domain_event.c, src/domain_event.h,
src/interface_conf.c, src/interface_conf.h,
src/network_conf.c, src/network_conf.h, src/node_device_conf.c,
src/node_device_conf.h, src/secret_conf.c, src/secret_conf.h,
src/storage_conf.c, src/storage_conf.h, src/storage_encryption_conf.c,
src/storage_encryption_conf.h: Move to src/conf/
* src/Makefile.am: Add -Isrc/conf to the individual build targets
which need to use XML config APIs. Remove LIBXML_CFLAGS, LIBSSH2_CFLAGS
and SELINUX_CFLAGS from global INCLUDES and only have them in build
targets which actually need them. Create a libvirt_conf.la
convenience library for all config parsers
* src/hostusb.h: Remove bogus include of domain_conf.h
* tests/Makefile.am: Add -Isrc/conf. Remove bogus -I$builddir/src
since it never has any generated header files
* daemon/Makefile.am: Add -Isrc/conf
* proxy/Makefile.am: Add -Isrc/conf and cope with renamed files
* src/hash.c: Remove bogus include of libxml/threads.h
2009-09-16 14:39:12 +00:00
|
|
|
$(SASL_CFLAGS) \
|
2009-09-16 15:55:16 +00:00
|
|
|
-I@top_srcdir@/src/conf
|
2008-11-17 10:43:30 +00:00
|
|
|
libvirt_driver_remote_la_LDFLAGS = \
|
|
|
|
$(GNUTLS_LIBS) \
|
|
|
|
$(SASL_LIBS)
|
2008-11-21 12:16:08 +00:00
|
|
|
if WITH_DRIVER_MODULES
|
|
|
|
libvirt_driver_remote_la_LDFLAGS += -module -avoid-version
|
|
|
|
endif
|
2008-11-17 10:43:30 +00:00
|
|
|
libvirt_driver_remote_la_SOURCES = $(REMOTE_DRIVER_SOURCES)
|
2009-09-16 15:55:16 +00:00
|
|
|
|
|
|
|
if HAVE_RPCGEN
|
|
|
|
#
|
|
|
|
# Maintainer-only target for re-generating the derived .c/.h source
|
|
|
|
# files, which are actually derived from the .x file.
|
|
|
|
#
|
|
|
|
# For committing protocol changes to CVS, the GLIBC rpcgen *must*
|
|
|
|
# be used.
|
|
|
|
#
|
|
|
|
# Support for non-GLIB rpcgen is here as a convenience for
|
|
|
|
# non-Linux people needing to test changes during dev.
|
|
|
|
#
|
|
|
|
rpcgen:
|
|
|
|
rm -f rp.c-t rp.h-t rp.c-t1 rp.c-t2 rp.h-t1
|
|
|
|
$(RPCGEN) -h -o rp.h-t $(srcdir)/remote/remote_protocol.x
|
|
|
|
$(RPCGEN) -c -o rp.c-t $(srcdir)/remote/remote_protocol.x
|
|
|
|
if HAVE_GLIBC_RPCGEN
|
2009-10-01 18:18:29 +00:00
|
|
|
perl -w $(srcdir)/remote/rpcgen_fix.pl rp.h-t > rp.h-t1
|
|
|
|
perl -w $(srcdir)/remote/rpcgen_fix.pl rp.c-t > rp.c-t1
|
2009-09-16 15:55:16 +00:00
|
|
|
(echo '#include <config.h>'; cat rp.c-t1) > rp.c-t2
|
|
|
|
chmod 0444 rp.c-t2 rp.h-t1
|
|
|
|
mv -f rp.h-t1 $(srcdir)/remote/remote_protocol.h
|
|
|
|
mv -f rp.c-t2 $(srcdir)/remote/remote_protocol.c
|
|
|
|
rm -f rp.c-t rp.h-t rp.c-t1
|
|
|
|
else
|
|
|
|
chmod 0444 rp.c-t rp.h-t
|
|
|
|
mv -f rp.h-t $(srcdir)/remote/remote_protocol.h
|
|
|
|
mv -f rp.c-t $(srcdir)/remote/remote_protocol.c
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
|
|
|
|
remote/remote_protocol.c: remote/remote_protocol.h
|
2008-08-20 20:48:35 +00:00
|
|
|
endif
|
|
|
|
|
|
|
|
if WITH_XEN
|
2008-11-21 12:16:08 +00:00
|
|
|
if WITH_DRIVER_MODULES
|
|
|
|
mod_LTLIBRARIES += libvirt_driver_xen.la
|
|
|
|
else
|
2008-11-17 10:43:30 +00:00
|
|
|
noinst_LTLIBRARIES += libvirt_driver_xen.la
|
|
|
|
libvirt_la_LIBADD += libvirt_driver_xen.la
|
2008-11-21 12:16:08 +00:00
|
|
|
endif
|
Move all XML configuration handling to src/conf/
* src/capabilities.c, src/capabilities.h, src/domain_conf.c,
src/domain_conf.h, src/domain_event.c, src/domain_event.h,
src/interface_conf.c, src/interface_conf.h,
src/network_conf.c, src/network_conf.h, src/node_device_conf.c,
src/node_device_conf.h, src/secret_conf.c, src/secret_conf.h,
src/storage_conf.c, src/storage_conf.h, src/storage_encryption_conf.c,
src/storage_encryption_conf.h: Move to src/conf/
* src/Makefile.am: Add -Isrc/conf to the individual build targets
which need to use XML config APIs. Remove LIBXML_CFLAGS, LIBSSH2_CFLAGS
and SELINUX_CFLAGS from global INCLUDES and only have them in build
targets which actually need them. Create a libvirt_conf.la
convenience library for all config parsers
* src/hostusb.h: Remove bogus include of domain_conf.h
* tests/Makefile.am: Add -Isrc/conf. Remove bogus -I$builddir/src
since it never has any generated header files
* daemon/Makefile.am: Add -Isrc/conf
* proxy/Makefile.am: Add -Isrc/conf and cope with renamed files
* src/hash.c: Remove bogus include of libxml/threads.h
2009-09-16 14:39:12 +00:00
|
|
|
libvirt_driver_xen_la_CFLAGS = \
|
|
|
|
$(XEN_CFLAGS) \
|
|
|
|
-I@top_srcdir@/src/conf
|
2008-11-17 10:43:30 +00:00
|
|
|
libvirt_driver_xen_la_LDFLAGS = $(XEN_LIBS)
|
2008-11-21 12:16:08 +00:00
|
|
|
if WITH_DRIVER_MODULES
|
|
|
|
libvirt_driver_xen_la_LDFLAGS += -module -avoid-version
|
|
|
|
endif
|
2008-11-17 10:43:30 +00:00
|
|
|
libvirt_driver_xen_la_SOURCES = $(XEN_DRIVER_SOURCES)
|
2008-08-20 20:48:35 +00:00
|
|
|
endif
|
|
|
|
|
2009-07-24 14:17:06 +00:00
|
|
|
if WITH_PHYP
|
|
|
|
if WITH_DRIVER_MODULES
|
|
|
|
mod_LTLIBRARIES += libvirt_driver_phyp.la
|
|
|
|
else
|
|
|
|
noinst_LTLIBRARIES += libvirt_driver_phyp.la
|
|
|
|
libvirt_la_LIBADD += libvirt_driver_phyp.la
|
|
|
|
endif
|
2009-09-04 10:08:47 +00:00
|
|
|
libvirt_driver_phyp_la_LDFLAGS = $(LIBSSH2_LIBS)
|
Move all XML configuration handling to src/conf/
* src/capabilities.c, src/capabilities.h, src/domain_conf.c,
src/domain_conf.h, src/domain_event.c, src/domain_event.h,
src/interface_conf.c, src/interface_conf.h,
src/network_conf.c, src/network_conf.h, src/node_device_conf.c,
src/node_device_conf.h, src/secret_conf.c, src/secret_conf.h,
src/storage_conf.c, src/storage_conf.h, src/storage_encryption_conf.c,
src/storage_encryption_conf.h: Move to src/conf/
* src/Makefile.am: Add -Isrc/conf to the individual build targets
which need to use XML config APIs. Remove LIBXML_CFLAGS, LIBSSH2_CFLAGS
and SELINUX_CFLAGS from global INCLUDES and only have them in build
targets which actually need them. Create a libvirt_conf.la
convenience library for all config parsers
* src/hostusb.h: Remove bogus include of domain_conf.h
* tests/Makefile.am: Add -Isrc/conf. Remove bogus -I$builddir/src
since it never has any generated header files
* daemon/Makefile.am: Add -Isrc/conf
* proxy/Makefile.am: Add -Isrc/conf and cope with renamed files
* src/hash.c: Remove bogus include of libxml/threads.h
2009-09-16 14:39:12 +00:00
|
|
|
libvirt_driver_phyp_la_CFLAGS = $(LIBSSH2_CFLAGS) \
|
|
|
|
-I@top_srcdir@/src/conf
|
2009-07-24 14:17:06 +00:00
|
|
|
libvirt_driver_phyp_la_SOURCES = $(PHYP_DRIVER_SOURCES)
|
|
|
|
endif
|
|
|
|
|
2008-08-27 11:19:45 +00:00
|
|
|
if WITH_OPENVZ
|
2008-11-21 12:16:08 +00:00
|
|
|
if WITH_DRIVER_MODULES
|
|
|
|
mod_LTLIBRARIES += libvirt_driver_openvz.la
|
|
|
|
else
|
2008-11-17 10:43:30 +00:00
|
|
|
noinst_LTLIBRARIES += libvirt_driver_openvz.la
|
|
|
|
libvirt_la_LIBADD += libvirt_driver_openvz.la
|
2008-11-21 12:16:08 +00:00
|
|
|
endif
|
Move all XML configuration handling to src/conf/
* src/capabilities.c, src/capabilities.h, src/domain_conf.c,
src/domain_conf.h, src/domain_event.c, src/domain_event.h,
src/interface_conf.c, src/interface_conf.h,
src/network_conf.c, src/network_conf.h, src/node_device_conf.c,
src/node_device_conf.h, src/secret_conf.c, src/secret_conf.h,
src/storage_conf.c, src/storage_conf.h, src/storage_encryption_conf.c,
src/storage_encryption_conf.h: Move to src/conf/
* src/Makefile.am: Add -Isrc/conf to the individual build targets
which need to use XML config APIs. Remove LIBXML_CFLAGS, LIBSSH2_CFLAGS
and SELINUX_CFLAGS from global INCLUDES and only have them in build
targets which actually need them. Create a libvirt_conf.la
convenience library for all config parsers
* src/hostusb.h: Remove bogus include of domain_conf.h
* tests/Makefile.am: Add -Isrc/conf. Remove bogus -I$builddir/src
since it never has any generated header files
* daemon/Makefile.am: Add -Isrc/conf
* proxy/Makefile.am: Add -Isrc/conf and cope with renamed files
* src/hash.c: Remove bogus include of libxml/threads.h
2009-09-16 14:39:12 +00:00
|
|
|
libvirt_driver_openvz_la_CFLAGS = \
|
|
|
|
-I@top_srcdir@/src/conf
|
2008-11-21 12:16:08 +00:00
|
|
|
if WITH_DRIVER_MODULES
|
|
|
|
libvirt_driver_openvz_la_LDFLAGS = -module -avoid-version
|
|
|
|
endif
|
2008-11-17 10:43:30 +00:00
|
|
|
libvirt_driver_openvz_la_SOURCES = $(OPENVZ_DRIVER_SOURCES)
|
2008-08-27 11:19:45 +00:00
|
|
|
endif
|
|
|
|
|
2009-04-17 16:09:07 +00:00
|
|
|
if WITH_VBOX
|
|
|
|
if WITH_DRIVER_MODULES
|
|
|
|
mod_LTLIBRARIES += libvirt_driver_vbox.la
|
|
|
|
else
|
|
|
|
noinst_LTLIBRARIES += libvirt_driver_vbox.la
|
|
|
|
libvirt_la_LIBADD += libvirt_driver_vbox.la
|
|
|
|
endif
|
Move all XML configuration handling to src/conf/
* src/capabilities.c, src/capabilities.h, src/domain_conf.c,
src/domain_conf.h, src/domain_event.c, src/domain_event.h,
src/interface_conf.c, src/interface_conf.h,
src/network_conf.c, src/network_conf.h, src/node_device_conf.c,
src/node_device_conf.h, src/secret_conf.c, src/secret_conf.h,
src/storage_conf.c, src/storage_conf.h, src/storage_encryption_conf.c,
src/storage_encryption_conf.h: Move to src/conf/
* src/Makefile.am: Add -Isrc/conf to the individual build targets
which need to use XML config APIs. Remove LIBXML_CFLAGS, LIBSSH2_CFLAGS
and SELINUX_CFLAGS from global INCLUDES and only have them in build
targets which actually need them. Create a libvirt_conf.la
convenience library for all config parsers
* src/hostusb.h: Remove bogus include of domain_conf.h
* tests/Makefile.am: Add -Isrc/conf. Remove bogus -I$builddir/src
since it never has any generated header files
* daemon/Makefile.am: Add -Isrc/conf
* proxy/Makefile.am: Add -Isrc/conf and cope with renamed files
* src/hash.c: Remove bogus include of libxml/threads.h
2009-09-16 14:39:12 +00:00
|
|
|
libvirt_driver_vbox_la_CFLAGS = \
|
|
|
|
-I@top_srcdir@/src/conf
|
2009-04-17 16:09:07 +00:00
|
|
|
if WITH_DRIVER_MODULES
|
|
|
|
libvirt_driver_vbox_la_LDFLAGS = -module -avoid-version
|
|
|
|
endif
|
|
|
|
libvirt_driver_vbox_la_SOURCES = $(VBOX_DRIVER_SOURCES)
|
|
|
|
endif
|
|
|
|
|
2008-08-20 20:48:35 +00:00
|
|
|
if WITH_QEMU
|
2008-11-21 12:16:08 +00:00
|
|
|
if WITH_DRIVER_MODULES
|
|
|
|
mod_LTLIBRARIES += libvirt_driver_qemu.la
|
|
|
|
else
|
2008-11-17 10:43:30 +00:00
|
|
|
noinst_LTLIBRARIES += libvirt_driver_qemu.la
|
2008-11-17 12:18:18 +00:00
|
|
|
# Stateful, so linked to daemon instead
|
|
|
|
#libvirt_la_LIBADD += libvirt_driver_qemu.la
|
2008-11-21 12:16:08 +00:00
|
|
|
endif
|
Move all XML configuration handling to src/conf/
* src/capabilities.c, src/capabilities.h, src/domain_conf.c,
src/domain_conf.h, src/domain_event.c, src/domain_event.h,
src/interface_conf.c, src/interface_conf.h,
src/network_conf.c, src/network_conf.h, src/node_device_conf.c,
src/node_device_conf.h, src/secret_conf.c, src/secret_conf.h,
src/storage_conf.c, src/storage_conf.h, src/storage_encryption_conf.c,
src/storage_encryption_conf.h: Move to src/conf/
* src/Makefile.am: Add -Isrc/conf to the individual build targets
which need to use XML config APIs. Remove LIBXML_CFLAGS, LIBSSH2_CFLAGS
and SELINUX_CFLAGS from global INCLUDES and only have them in build
targets which actually need them. Create a libvirt_conf.la
convenience library for all config parsers
* src/hostusb.h: Remove bogus include of domain_conf.h
* tests/Makefile.am: Add -Isrc/conf. Remove bogus -I$builddir/src
since it never has any generated header files
* daemon/Makefile.am: Add -Isrc/conf
* proxy/Makefile.am: Add -Isrc/conf and cope with renamed files
* src/hash.c: Remove bogus include of libxml/threads.h
2009-09-16 14:39:12 +00:00
|
|
|
libvirt_driver_qemu_la_CFLAGS = $(NUMACTL_CFLAGS) \
|
|
|
|
-I@top_srcdir@/src/conf
|
2008-11-17 10:43:30 +00:00
|
|
|
libvirt_driver_qemu_la_LDFLAGS = $(NUMACTL_LIBS)
|
2008-11-21 12:16:08 +00:00
|
|
|
if WITH_DRIVER_MODULES
|
|
|
|
libvirt_driver_qemu_la_LDFLAGS += -module -avoid-version
|
|
|
|
endif
|
2008-11-17 10:43:30 +00:00
|
|
|
libvirt_driver_qemu_la_SOURCES = $(QEMU_DRIVER_SOURCES)
|
2009-09-16 11:31:13 +00:00
|
|
|
|
2009-10-08 15:40:14 +00:00
|
|
|
conf_DATA += qemu/qemu.conf
|
2009-09-16 11:31:13 +00:00
|
|
|
|
2009-10-08 16:06:40 +00:00
|
|
|
augeas_DATA += qemu/libvirtd_qemu.aug
|
|
|
|
augeastest_DATA += qemu/test_libvirtd_qemu.aug
|
2009-09-16 11:31:13 +00:00
|
|
|
|
2008-08-20 20:48:35 +00:00
|
|
|
endif
|
2009-09-16 11:31:13 +00:00
|
|
|
EXTRA_DIST += qemu/qemu.conf qemu/libvirtd_qemu.aug qemu/test_libvirtd_qemu.aug
|
|
|
|
|
2008-08-20 20:48:35 +00:00
|
|
|
|
|
|
|
if WITH_LXC
|
2008-11-21 12:16:08 +00:00
|
|
|
if WITH_DRIVER_MODULES
|
|
|
|
mod_LTLIBRARIES += libvirt_driver_lxc.la
|
|
|
|
else
|
2008-11-17 10:43:30 +00:00
|
|
|
noinst_LTLIBRARIES += libvirt_driver_lxc.la
|
2008-11-17 12:18:18 +00:00
|
|
|
# Stateful, so linked to daemon instead
|
|
|
|
#libvirt_la_LIBADD += libvirt_driver_lxc.la
|
2008-11-21 12:16:08 +00:00
|
|
|
endif
|
Move all XML configuration handling to src/conf/
* src/capabilities.c, src/capabilities.h, src/domain_conf.c,
src/domain_conf.h, src/domain_event.c, src/domain_event.h,
src/interface_conf.c, src/interface_conf.h,
src/network_conf.c, src/network_conf.h, src/node_device_conf.c,
src/node_device_conf.h, src/secret_conf.c, src/secret_conf.h,
src/storage_conf.c, src/storage_conf.h, src/storage_encryption_conf.c,
src/storage_encryption_conf.h: Move to src/conf/
* src/Makefile.am: Add -Isrc/conf to the individual build targets
which need to use XML config APIs. Remove LIBXML_CFLAGS, LIBSSH2_CFLAGS
and SELINUX_CFLAGS from global INCLUDES and only have them in build
targets which actually need them. Create a libvirt_conf.la
convenience library for all config parsers
* src/hostusb.h: Remove bogus include of domain_conf.h
* tests/Makefile.am: Add -Isrc/conf. Remove bogus -I$builddir/src
since it never has any generated header files
* daemon/Makefile.am: Add -Isrc/conf
* proxy/Makefile.am: Add -Isrc/conf and cope with renamed files
* src/hash.c: Remove bogus include of libxml/threads.h
2009-09-16 14:39:12 +00:00
|
|
|
libvirt_driver_lxc_la_CFLAGS = \
|
|
|
|
-I@top_srcdir@/src/conf
|
2008-11-21 12:16:08 +00:00
|
|
|
if WITH_DRIVER_MODULES
|
|
|
|
libvirt_driver_lxc_la_LDFLAGS = -module -avoid-version
|
|
|
|
endif
|
2008-11-17 10:43:30 +00:00
|
|
|
libvirt_driver_lxc_la_SOURCES = $(LXC_DRIVER_SOURCES)
|
2009-10-08 15:40:14 +00:00
|
|
|
|
|
|
|
conf_DATA += lxc/lxc.conf
|
|
|
|
|
2009-10-08 16:06:40 +00:00
|
|
|
augeas_DATA += lxc/libvirtd_lxc.aug
|
|
|
|
augeastest_DATA += lxc/test_libvirtd_lxc.aug
|
|
|
|
|
2008-08-20 20:48:35 +00:00
|
|
|
endif
|
2009-10-08 16:06:40 +00:00
|
|
|
EXTRA_DIST += lxc/lxc.conf lxc/libvirtd_lxc.aug lxc/test_libvirtd_lxc.aug
|
2008-08-20 20:48:35 +00:00
|
|
|
|
2008-11-19 16:58:23 +00:00
|
|
|
if WITH_UML
|
2008-11-21 12:16:08 +00:00
|
|
|
if WITH_DRIVER_MODULES
|
|
|
|
mod_LTLIBRARIES += libvirt_driver_uml.la
|
|
|
|
else
|
2008-11-19 16:58:23 +00:00
|
|
|
noinst_LTLIBRARIES += libvirt_driver_uml.la
|
|
|
|
# Stateful, so linked to daemon instead
|
|
|
|
#libvirt_la_LIBADD += libvirt_driver_uml.la
|
2008-11-21 12:16:08 +00:00
|
|
|
endif
|
Move all XML configuration handling to src/conf/
* src/capabilities.c, src/capabilities.h, src/domain_conf.c,
src/domain_conf.h, src/domain_event.c, src/domain_event.h,
src/interface_conf.c, src/interface_conf.h,
src/network_conf.c, src/network_conf.h, src/node_device_conf.c,
src/node_device_conf.h, src/secret_conf.c, src/secret_conf.h,
src/storage_conf.c, src/storage_conf.h, src/storage_encryption_conf.c,
src/storage_encryption_conf.h: Move to src/conf/
* src/Makefile.am: Add -Isrc/conf to the individual build targets
which need to use XML config APIs. Remove LIBXML_CFLAGS, LIBSSH2_CFLAGS
and SELINUX_CFLAGS from global INCLUDES and only have them in build
targets which actually need them. Create a libvirt_conf.la
convenience library for all config parsers
* src/hostusb.h: Remove bogus include of domain_conf.h
* tests/Makefile.am: Add -Isrc/conf. Remove bogus -I$builddir/src
since it never has any generated header files
* daemon/Makefile.am: Add -Isrc/conf
* proxy/Makefile.am: Add -Isrc/conf and cope with renamed files
* src/hash.c: Remove bogus include of libxml/threads.h
2009-09-16 14:39:12 +00:00
|
|
|
libvirt_driver_uml_la_CFLAGS = $(NUMACTL_CFLAGS) \
|
|
|
|
-I@top_srcdir@/src/conf
|
2008-11-21 12:16:08 +00:00
|
|
|
libvirt_driver_uml_la_LDFLAGS = $(NUMACTL_LIBS)
|
|
|
|
if WITH_DRIVER_MODULES
|
|
|
|
libvirt_driver_uml_la_LDFLAGS += -module -avoid-version
|
|
|
|
endif
|
2008-11-19 16:58:23 +00:00
|
|
|
libvirt_driver_uml_la_SOURCES = $(UML_DRIVER_SOURCES)
|
|
|
|
endif
|
2008-11-04 23:37:23 +00:00
|
|
|
|
2009-05-25 11:56:00 +00:00
|
|
|
if WITH_ONE
|
|
|
|
if WITH_DRIVER_MODULES
|
|
|
|
mod_LTLIBRARIES += libvirt_driver_one.la
|
|
|
|
else
|
|
|
|
noinst_LTLIBRARIES += libvirt_driver_one.la
|
|
|
|
# Stateful, so linked to daemon instead
|
|
|
|
#libvirt_la_LIBADD += libvirt_driver_one.la
|
|
|
|
endif
|
Move all XML configuration handling to src/conf/
* src/capabilities.c, src/capabilities.h, src/domain_conf.c,
src/domain_conf.h, src/domain_event.c, src/domain_event.h,
src/interface_conf.c, src/interface_conf.h,
src/network_conf.c, src/network_conf.h, src/node_device_conf.c,
src/node_device_conf.h, src/secret_conf.c, src/secret_conf.h,
src/storage_conf.c, src/storage_conf.h, src/storage_encryption_conf.c,
src/storage_encryption_conf.h: Move to src/conf/
* src/Makefile.am: Add -Isrc/conf to the individual build targets
which need to use XML config APIs. Remove LIBXML_CFLAGS, LIBSSH2_CFLAGS
and SELINUX_CFLAGS from global INCLUDES and only have them in build
targets which actually need them. Create a libvirt_conf.la
convenience library for all config parsers
* src/hostusb.h: Remove bogus include of domain_conf.h
* tests/Makefile.am: Add -Isrc/conf. Remove bogus -I$builddir/src
since it never has any generated header files
* daemon/Makefile.am: Add -Isrc/conf
* proxy/Makefile.am: Add -Isrc/conf and cope with renamed files
* src/hash.c: Remove bogus include of libxml/threads.h
2009-09-16 14:39:12 +00:00
|
|
|
libvirt_driver_one_la_CFLAGS = $(XMLRPC_CFLAGS) \
|
|
|
|
-I@top_srcdir@/src/conf
|
2009-09-10 13:21:10 +00:00
|
|
|
libvirt_driver_one_la_LDFLAGS = $(XMLRPC_LIBS)
|
2009-05-25 11:56:00 +00:00
|
|
|
#libvirt_driver_one_la_CFLAGS = "-DWITH_ONE"
|
|
|
|
if WITH_DRIVER_MODULES
|
|
|
|
libvirt_driver_one_la_LDFLAGS += -module -avoid-version
|
|
|
|
endif
|
|
|
|
libvirt_driver_one_la_SOURCES = $(ONE_DRIVER_SOURCES)
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2009-07-23 20:21:08 +00:00
|
|
|
if WITH_ESX
|
|
|
|
if WITH_DRIVER_MODULES
|
|
|
|
mod_LTLIBRARIES += libvirt_driver_esx.la
|
|
|
|
else
|
|
|
|
noinst_LTLIBRARIES += libvirt_driver_esx.la
|
|
|
|
libvirt_la_LIBADD += libvirt_driver_esx.la
|
|
|
|
endif
|
Move all XML configuration handling to src/conf/
* src/capabilities.c, src/capabilities.h, src/domain_conf.c,
src/domain_conf.h, src/domain_event.c, src/domain_event.h,
src/interface_conf.c, src/interface_conf.h,
src/network_conf.c, src/network_conf.h, src/node_device_conf.c,
src/node_device_conf.h, src/secret_conf.c, src/secret_conf.h,
src/storage_conf.c, src/storage_conf.h, src/storage_encryption_conf.c,
src/storage_encryption_conf.h: Move to src/conf/
* src/Makefile.am: Add -Isrc/conf to the individual build targets
which need to use XML config APIs. Remove LIBXML_CFLAGS, LIBSSH2_CFLAGS
and SELINUX_CFLAGS from global INCLUDES and only have them in build
targets which actually need them. Create a libvirt_conf.la
convenience library for all config parsers
* src/hostusb.h: Remove bogus include of domain_conf.h
* tests/Makefile.am: Add -Isrc/conf. Remove bogus -I$builddir/src
since it never has any generated header files
* daemon/Makefile.am: Add -Isrc/conf
* proxy/Makefile.am: Add -Isrc/conf and cope with renamed files
* src/hash.c: Remove bogus include of libxml/threads.h
2009-09-16 14:39:12 +00:00
|
|
|
libvirt_driver_esx_la_CFLAGS = $(LIBCURL_CFLAGS) \
|
|
|
|
-I@top_srcdir@/src/conf
|
2009-07-23 20:21:08 +00:00
|
|
|
libvirt_driver_esx_la_LDFLAGS = $(LIBCURL_LIBS)
|
|
|
|
if WITH_DRIVER_MODULES
|
|
|
|
libvirt_driver_esx_la_LDFLAGS += -module -avoid-version
|
|
|
|
endif
|
|
|
|
libvirt_driver_esx_la_SOURCES = $(ESX_DRIVER_SOURCES)
|
|
|
|
endif
|
|
|
|
|
2008-11-04 23:37:23 +00:00
|
|
|
if WITH_NETWORK
|
2008-11-21 12:16:08 +00:00
|
|
|
if WITH_DRIVER_MODULES
|
|
|
|
mod_LTLIBRARIES += libvirt_driver_network.la
|
|
|
|
else
|
2008-11-17 10:43:30 +00:00
|
|
|
noinst_LTLIBRARIES += libvirt_driver_network.la
|
2008-11-17 12:18:18 +00:00
|
|
|
# Stateful, so linked to daemon instead
|
|
|
|
#libvirt_la_LIBADD += libvirt_driver_network.la
|
2008-11-21 12:16:08 +00:00
|
|
|
endif
|
Move all XML configuration handling to src/conf/
* src/capabilities.c, src/capabilities.h, src/domain_conf.c,
src/domain_conf.h, src/domain_event.c, src/domain_event.h,
src/interface_conf.c, src/interface_conf.h,
src/network_conf.c, src/network_conf.h, src/node_device_conf.c,
src/node_device_conf.h, src/secret_conf.c, src/secret_conf.h,
src/storage_conf.c, src/storage_conf.h, src/storage_encryption_conf.c,
src/storage_encryption_conf.h: Move to src/conf/
* src/Makefile.am: Add -Isrc/conf to the individual build targets
which need to use XML config APIs. Remove LIBXML_CFLAGS, LIBSSH2_CFLAGS
and SELINUX_CFLAGS from global INCLUDES and only have them in build
targets which actually need them. Create a libvirt_conf.la
convenience library for all config parsers
* src/hostusb.h: Remove bogus include of domain_conf.h
* tests/Makefile.am: Add -Isrc/conf. Remove bogus -I$builddir/src
since it never has any generated header files
* daemon/Makefile.am: Add -Isrc/conf
* proxy/Makefile.am: Add -Isrc/conf and cope with renamed files
* src/hash.c: Remove bogus include of libxml/threads.h
2009-09-16 14:39:12 +00:00
|
|
|
libvirt_driver_network_la_CFLAGS = \
|
|
|
|
-I@top_srcdir@/src/conf
|
2008-11-21 12:16:08 +00:00
|
|
|
if WITH_DRIVER_MODULES
|
|
|
|
libvirt_driver_network_la_LDFLAGS = -module -avoid-version
|
|
|
|
endif
|
2008-11-17 10:43:30 +00:00
|
|
|
libvirt_driver_network_la_SOURCES = $(NETWORK_DRIVER_SOURCES)
|
2008-11-04 23:37:23 +00:00
|
|
|
endif
|
2009-09-16 11:31:13 +00:00
|
|
|
EXTRA_DIST += network/default.xml
|
|
|
|
|
|
|
|
|
|
|
|
|
2008-11-04 23:37:23 +00:00
|
|
|
|
2009-05-20 14:26:49 +00:00
|
|
|
if WITH_NETCF
|
2009-07-21 14:02:16 +00:00
|
|
|
if WITH_DRIVER_MODULES
|
|
|
|
mod_LTLIBRARIES += libvirt_driver_interface.la
|
|
|
|
else
|
|
|
|
noinst_LTLIBRARIES += libvirt_driver_interface.la
|
|
|
|
libvirt_la_LIBADD += libvirt_driver_interface.la
|
|
|
|
endif
|
Move all XML configuration handling to src/conf/
* src/capabilities.c, src/capabilities.h, src/domain_conf.c,
src/domain_conf.h, src/domain_event.c, src/domain_event.h,
src/interface_conf.c, src/interface_conf.h,
src/network_conf.c, src/network_conf.h, src/node_device_conf.c,
src/node_device_conf.h, src/secret_conf.c, src/secret_conf.h,
src/storage_conf.c, src/storage_conf.h, src/storage_encryption_conf.c,
src/storage_encryption_conf.h: Move to src/conf/
* src/Makefile.am: Add -Isrc/conf to the individual build targets
which need to use XML config APIs. Remove LIBXML_CFLAGS, LIBSSH2_CFLAGS
and SELINUX_CFLAGS from global INCLUDES and only have them in build
targets which actually need them. Create a libvirt_conf.la
convenience library for all config parsers
* src/hostusb.h: Remove bogus include of domain_conf.h
* tests/Makefile.am: Add -Isrc/conf. Remove bogus -I$builddir/src
since it never has any generated header files
* daemon/Makefile.am: Add -Isrc/conf
* proxy/Makefile.am: Add -Isrc/conf and cope with renamed files
* src/hash.c: Remove bogus include of libxml/threads.h
2009-09-16 14:39:12 +00:00
|
|
|
libvirt_driver_interface_la_CFLAGS = $(NETCF_CFLAGS) \
|
|
|
|
-I@top_srcdir@/src/conf
|
|
|
|
libvirt_driver_interface_la_LDFLAGS = $(NETCF_LIBS)
|
2009-07-21 14:02:16 +00:00
|
|
|
if WITH_DRIVER_MODULES
|
|
|
|
libvirt_driver_interface_la_LDFLAGS += -module -avoid-version
|
|
|
|
endif
|
|
|
|
libvirt_driver_interface_la_SOURCES = $(INTERFACE_DRIVER_SOURCES)
|
2009-05-20 14:26:49 +00:00
|
|
|
endif
|
|
|
|
|
2009-09-14 12:31:23 +00:00
|
|
|
if WITH_SECRETS
|
2009-08-14 19:48:55 +00:00
|
|
|
if WITH_DRIVER_MODULES
|
|
|
|
mod_LTLIBRARIES += libvirt_driver_secret.la
|
|
|
|
else
|
|
|
|
noinst_LTLIBRARIES += libvirt_driver_secret.la
|
|
|
|
libvirt_la_LIBADD += libvirt_driver_secret.la
|
|
|
|
endif
|
Move all XML configuration handling to src/conf/
* src/capabilities.c, src/capabilities.h, src/domain_conf.c,
src/domain_conf.h, src/domain_event.c, src/domain_event.h,
src/interface_conf.c, src/interface_conf.h,
src/network_conf.c, src/network_conf.h, src/node_device_conf.c,
src/node_device_conf.h, src/secret_conf.c, src/secret_conf.h,
src/storage_conf.c, src/storage_conf.h, src/storage_encryption_conf.c,
src/storage_encryption_conf.h: Move to src/conf/
* src/Makefile.am: Add -Isrc/conf to the individual build targets
which need to use XML config APIs. Remove LIBXML_CFLAGS, LIBSSH2_CFLAGS
and SELINUX_CFLAGS from global INCLUDES and only have them in build
targets which actually need them. Create a libvirt_conf.la
convenience library for all config parsers
* src/hostusb.h: Remove bogus include of domain_conf.h
* tests/Makefile.am: Add -Isrc/conf. Remove bogus -I$builddir/src
since it never has any generated header files
* daemon/Makefile.am: Add -Isrc/conf
* proxy/Makefile.am: Add -Isrc/conf and cope with renamed files
* src/hash.c: Remove bogus include of libxml/threads.h
2009-09-16 14:39:12 +00:00
|
|
|
libvirt_driver_secret_la_CFLAGS = \
|
|
|
|
-I@top_srcdir@/src/conf
|
2009-08-14 19:48:55 +00:00
|
|
|
if WITH_DRIVER_MODULES
|
2009-09-15 10:11:10 +00:00
|
|
|
libvirt_driver_secret_la_LDFLAGS = -module -avoid-version ../gnulib/lib/libgnu.la
|
2009-08-14 19:48:55 +00:00
|
|
|
endif
|
|
|
|
libvirt_driver_secret_la_SOURCES = $(SECRET_DRIVER_SOURCES)
|
2009-09-14 12:31:23 +00:00
|
|
|
endif
|
2009-08-14 19:48:55 +00:00
|
|
|
|
2008-11-17 10:43:30 +00:00
|
|
|
# Needed to keep automake quiet about conditionals
|
|
|
|
libvirt_driver_storage_la_SOURCES =
|
Move all XML configuration handling to src/conf/
* src/capabilities.c, src/capabilities.h, src/domain_conf.c,
src/domain_conf.h, src/domain_event.c, src/domain_event.h,
src/interface_conf.c, src/interface_conf.h,
src/network_conf.c, src/network_conf.h, src/node_device_conf.c,
src/node_device_conf.h, src/secret_conf.c, src/secret_conf.h,
src/storage_conf.c, src/storage_conf.h, src/storage_encryption_conf.c,
src/storage_encryption_conf.h: Move to src/conf/
* src/Makefile.am: Add -Isrc/conf to the individual build targets
which need to use XML config APIs. Remove LIBXML_CFLAGS, LIBSSH2_CFLAGS
and SELINUX_CFLAGS from global INCLUDES and only have them in build
targets which actually need them. Create a libvirt_conf.la
convenience library for all config parsers
* src/hostusb.h: Remove bogus include of domain_conf.h
* tests/Makefile.am: Add -Isrc/conf. Remove bogus -I$builddir/src
since it never has any generated header files
* daemon/Makefile.am: Add -Isrc/conf
* proxy/Makefile.am: Add -Isrc/conf and cope with renamed files
* src/hash.c: Remove bogus include of libxml/threads.h
2009-09-16 14:39:12 +00:00
|
|
|
libvirt_driver_storage_la_CFLAGS = \
|
|
|
|
-I@top_srcdir@/src/conf
|
Move all shared utility files to src/util/
* src/bridge.c, src/bridge.h, src/buf.c, src/buf.h, src/cgroup.c,
src/cgroup.h, src/conf.c, src/conf.h, src/event.c, src/event.h,
src/hash.c, src/hash.h, src/hostusb.c, src/hostusb.h,
src/iptables.c, src/iptables.h, src/logging.c, src/logging.h,
src/memory.c, src/memory.h, src/pci.c, src/pci.h, src/qparams.c,
src/qparams.h, src/stats_linux.c, src/stats_linux.h,
src/threads-pthread.c, src/threads-pthread.h, src/threads-win32.c,
src/threads-win32.h, src/threads.c, src/threads.h, src/util.c,
src/util.h, src/uuid.c, src/uuid.h, src/virterror.c,
src/virterror_internal.h, src/xml.c, src/xml.h: Move all files
into src/util/
* daemon/Makefile.am: Add -Isrc/util/ to build flags
* src/Makefile.am: Add -Isrc/util/ to build flags and update for
moved files
* src/libvirt_private.syms: Export cgroup APIs since they're now
in util rather than linking directly to drivers
* src/xen/xs_internal.c: Disable bogus virEventRemoveHandle call
when built under PROXY
* proxy/Makefile.am: Update for changed file locations. Remove
bogus build of event.c
* tools/Makefile.am, tests/Makefile.am: Add -Isrc/util/ to build flags
2009-09-16 15:28:46 +00:00
|
|
|
libvirt_driver_storage_la_LDFLAGS =
|
2008-11-04 23:37:23 +00:00
|
|
|
if WITH_STORAGE_DIR
|
2008-11-21 12:16:08 +00:00
|
|
|
if WITH_DRIVER_MODULES
|
|
|
|
mod_LTLIBRARIES += libvirt_driver_storage.la
|
|
|
|
else
|
2008-11-17 10:43:30 +00:00
|
|
|
noinst_LTLIBRARIES += libvirt_driver_storage.la
|
2008-11-17 12:18:18 +00:00
|
|
|
# Stateful, so linked to daemon instead
|
|
|
|
#libvirt_la_LIBADD += libvirt_driver_storage.la
|
2008-11-21 12:16:08 +00:00
|
|
|
endif
|
|
|
|
if WITH_DRIVER_MODULES
|
Move all shared utility files to src/util/
* src/bridge.c, src/bridge.h, src/buf.c, src/buf.h, src/cgroup.c,
src/cgroup.h, src/conf.c, src/conf.h, src/event.c, src/event.h,
src/hash.c, src/hash.h, src/hostusb.c, src/hostusb.h,
src/iptables.c, src/iptables.h, src/logging.c, src/logging.h,
src/memory.c, src/memory.h, src/pci.c, src/pci.h, src/qparams.c,
src/qparams.h, src/stats_linux.c, src/stats_linux.h,
src/threads-pthread.c, src/threads-pthread.h, src/threads-win32.c,
src/threads-win32.h, src/threads.c, src/threads.h, src/util.c,
src/util.h, src/uuid.c, src/uuid.h, src/virterror.c,
src/virterror_internal.h, src/xml.c, src/xml.h: Move all files
into src/util/
* daemon/Makefile.am: Add -Isrc/util/ to build flags
* src/Makefile.am: Add -Isrc/util/ to build flags and update for
moved files
* src/libvirt_private.syms: Export cgroup APIs since they're now
in util rather than linking directly to drivers
* src/xen/xs_internal.c: Disable bogus virEventRemoveHandle call
when built under PROXY
* proxy/Makefile.am: Update for changed file locations. Remove
bogus build of event.c
* tools/Makefile.am, tests/Makefile.am: Add -Isrc/util/ to build flags
2009-09-16 15:28:46 +00:00
|
|
|
libvirt_driver_storage_la_LDFLAGS += -module -avoid-version
|
2008-11-21 12:16:08 +00:00
|
|
|
endif
|
2008-11-17 10:43:30 +00:00
|
|
|
libvirt_driver_storage_la_SOURCES += $(STORAGE_DRIVER_SOURCES)
|
|
|
|
libvirt_driver_storage_la_SOURCES += $(STORAGE_DRIVER_FS_SOURCES)
|
2008-11-04 23:37:23 +00:00
|
|
|
endif
|
|
|
|
|
2008-02-20 15:45:33 +00:00
|
|
|
if WITH_STORAGE_LVM
|
2008-11-17 10:43:30 +00:00
|
|
|
libvirt_driver_storage_la_SOURCES += $(STORAGE_DRIVER_LVM_SOURCES)
|
2008-02-20 15:45:33 +00:00
|
|
|
endif
|
|
|
|
|
2008-02-20 15:49:25 +00:00
|
|
|
if WITH_STORAGE_ISCSI
|
2008-11-17 10:43:30 +00:00
|
|
|
libvirt_driver_storage_la_SOURCES += $(STORAGE_DRIVER_ISCSI_SOURCES)
|
2008-02-20 15:49:25 +00:00
|
|
|
endif
|
|
|
|
|
2009-04-01 16:03:22 +00:00
|
|
|
if WITH_STORAGE_SCSI
|
|
|
|
libvirt_driver_storage_la_SOURCES += $(STORAGE_DRIVER_SCSI_SOURCES)
|
|
|
|
endif
|
|
|
|
|
2009-09-08 13:47:45 +00:00
|
|
|
if WITH_STORAGE_MPATH
|
|
|
|
libvirt_driver_storage_la_SOURCES += $(STORAGE_DRIVER_MPATH_SOURCES)
|
|
|
|
libvirt_driver_storage_la_CFLAGS += $(DEVMAPPER_CFLAGS)
|
Move all shared utility files to src/util/
* src/bridge.c, src/bridge.h, src/buf.c, src/buf.h, src/cgroup.c,
src/cgroup.h, src/conf.c, src/conf.h, src/event.c, src/event.h,
src/hash.c, src/hash.h, src/hostusb.c, src/hostusb.h,
src/iptables.c, src/iptables.h, src/logging.c, src/logging.h,
src/memory.c, src/memory.h, src/pci.c, src/pci.h, src/qparams.c,
src/qparams.h, src/stats_linux.c, src/stats_linux.h,
src/threads-pthread.c, src/threads-pthread.h, src/threads-win32.c,
src/threads-win32.h, src/threads.c, src/threads.h, src/util.c,
src/util.h, src/uuid.c, src/uuid.h, src/virterror.c,
src/virterror_internal.h, src/xml.c, src/xml.h: Move all files
into src/util/
* daemon/Makefile.am: Add -Isrc/util/ to build flags
* src/Makefile.am: Add -Isrc/util/ to build flags and update for
moved files
* src/libvirt_private.syms: Export cgroup APIs since they're now
in util rather than linking directly to drivers
* src/xen/xs_internal.c: Disable bogus virEventRemoveHandle call
when built under PROXY
* proxy/Makefile.am: Update for changed file locations. Remove
bogus build of event.c
* tools/Makefile.am, tests/Makefile.am: Add -Isrc/util/ to build flags
2009-09-16 15:28:46 +00:00
|
|
|
libvirt_driver_storage_la_LDFLAGS += $(DEVMAPPER_LIBS)
|
2009-09-08 13:47:45 +00:00
|
|
|
endif
|
|
|
|
|
2008-02-20 15:52:17 +00:00
|
|
|
if WITH_STORAGE_DISK
|
2008-11-17 10:43:30 +00:00
|
|
|
libvirt_driver_storage_la_SOURCES += $(STORAGE_DRIVER_DISK_SOURCES)
|
2008-02-20 15:52:17 +00:00
|
|
|
endif
|
2008-02-20 15:45:33 +00:00
|
|
|
|
2008-11-21 12:27:11 +00:00
|
|
|
if WITH_NODE_DEVICES
|
|
|
|
# Needed to keep automake quiet about conditionals
|
|
|
|
if WITH_DRIVER_MODULES
|
|
|
|
mod_LTLIBRARIES += libvirt_driver_nodedev.la
|
|
|
|
else
|
|
|
|
noinst_LTLIBRARIES += libvirt_driver_nodedev.la
|
|
|
|
# Stateful, so linked to daemon instead
|
|
|
|
#libvirt_la_LIBADD += libvirt_driver_nodedev.la
|
|
|
|
endif
|
|
|
|
libvirt_driver_nodedev_la_SOURCES = $(NODE_DEVICE_DRIVER_SOURCES)
|
|
|
|
|
Move all XML configuration handling to src/conf/
* src/capabilities.c, src/capabilities.h, src/domain_conf.c,
src/domain_conf.h, src/domain_event.c, src/domain_event.h,
src/interface_conf.c, src/interface_conf.h,
src/network_conf.c, src/network_conf.h, src/node_device_conf.c,
src/node_device_conf.h, src/secret_conf.c, src/secret_conf.h,
src/storage_conf.c, src/storage_conf.h, src/storage_encryption_conf.c,
src/storage_encryption_conf.h: Move to src/conf/
* src/Makefile.am: Add -Isrc/conf to the individual build targets
which need to use XML config APIs. Remove LIBXML_CFLAGS, LIBSSH2_CFLAGS
and SELINUX_CFLAGS from global INCLUDES and only have them in build
targets which actually need them. Create a libvirt_conf.la
convenience library for all config parsers
* src/hostusb.h: Remove bogus include of domain_conf.h
* tests/Makefile.am: Add -Isrc/conf. Remove bogus -I$builddir/src
since it never has any generated header files
* daemon/Makefile.am: Add -Isrc/conf
* proxy/Makefile.am: Add -Isrc/conf and cope with renamed files
* src/hash.c: Remove bogus include of libxml/threads.h
2009-09-16 14:39:12 +00:00
|
|
|
libvirt_driver_nodedev_la_CFLAGS = \
|
|
|
|
-I@top_srcdir@/src/conf
|
2008-11-21 12:27:11 +00:00
|
|
|
libvirt_driver_nodedev_la_LDFLAGS =
|
|
|
|
if HAVE_HAL
|
|
|
|
libvirt_driver_nodedev_la_SOURCES += $(NODE_DEVICE_DRIVER_HAL_SOURCES)
|
|
|
|
libvirt_driver_nodedev_la_CFLAGS += $(HAL_CFLAGS)
|
|
|
|
libvirt_driver_nodedev_la_LDFLAGS += $(HAL_LIBS)
|
|
|
|
endif
|
|
|
|
if HAVE_DEVKIT
|
|
|
|
libvirt_driver_nodedev_la_SOURCES += $(NODE_DEVICE_DRIVER_DEVKIT_SOURCES)
|
|
|
|
libvirt_driver_nodedev_la_CFLAGS += $(DEVKIT_CFLAGS)
|
|
|
|
libvirt_driver_nodedev_la_LDFLAGS += $(DEVKIT_LIBS)
|
|
|
|
endif
|
|
|
|
|
|
|
|
if WITH_DRIVER_MODULES
|
|
|
|
libvirt_driver_nodedev_la_LDFLAGS += -module -avoid-version
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
2009-03-03 09:44:41 +00:00
|
|
|
libvirt_driver_security_la_SOURCES = $(SECURITY_DRIVER_SOURCES)
|
|
|
|
noinst_LTLIBRARIES += libvirt_driver_security.la
|
|
|
|
libvirt_la_LIBADD += libvirt_driver_security.la
|
Move all XML configuration handling to src/conf/
* src/capabilities.c, src/capabilities.h, src/domain_conf.c,
src/domain_conf.h, src/domain_event.c, src/domain_event.h,
src/interface_conf.c, src/interface_conf.h,
src/network_conf.c, src/network_conf.h, src/node_device_conf.c,
src/node_device_conf.h, src/secret_conf.c, src/secret_conf.h,
src/storage_conf.c, src/storage_conf.h, src/storage_encryption_conf.c,
src/storage_encryption_conf.h: Move to src/conf/
* src/Makefile.am: Add -Isrc/conf to the individual build targets
which need to use XML config APIs. Remove LIBXML_CFLAGS, LIBSSH2_CFLAGS
and SELINUX_CFLAGS from global INCLUDES and only have them in build
targets which actually need them. Create a libvirt_conf.la
convenience library for all config parsers
* src/hostusb.h: Remove bogus include of domain_conf.h
* tests/Makefile.am: Add -Isrc/conf. Remove bogus -I$builddir/src
since it never has any generated header files
* daemon/Makefile.am: Add -Isrc/conf
* proxy/Makefile.am: Add -Isrc/conf and cope with renamed files
* src/hash.c: Remove bogus include of libxml/threads.h
2009-09-16 14:39:12 +00:00
|
|
|
libvirt_driver_security_la_CFLAGS = \
|
|
|
|
-I@top_srcdir@/src/conf
|
2009-10-08 14:34:22 +00:00
|
|
|
libvirt_driver_security_la_LDFLAGS =
|
2009-03-03 10:06:49 +00:00
|
|
|
if WITH_SECDRIVER_SELINUX
|
|
|
|
libvirt_driver_security_la_SOURCES += $(SECURITY_DRIVER_SELINUX_SOURCES)
|
|
|
|
endif
|
2009-10-08 14:34:22 +00:00
|
|
|
if WITH_SECDRIVER_APPARMOR
|
|
|
|
libvirt_driver_security_la_SOURCES += $(SECURITY_DRIVER_APPARMOR_SOURCES)
|
|
|
|
libvirt_driver_security_la_CFLAGS += $(APPARMOR_CFLAGS)
|
|
|
|
libvirt_driver_security_la_LDFLAGS += $(APPARMOR_LIBS)
|
|
|
|
endif
|
2009-03-03 09:44:41 +00:00
|
|
|
|
2008-08-20 20:48:35 +00:00
|
|
|
# Add all conditional sources just in case...
|
|
|
|
EXTRA_DIST += \
|
|
|
|
$(TEST_DRIVER_SOURCES) \
|
|
|
|
$(REMOTE_DRIVER_SOURCES) \
|
|
|
|
$(XEN_DRIVER_SOURCES) \
|
|
|
|
$(QEMU_DRIVER_SOURCES) \
|
|
|
|
$(LXC_DRIVER_SOURCES) \
|
2008-11-19 16:58:23 +00:00
|
|
|
$(UML_DRIVER_SOURCES) \
|
2009-05-25 11:56:00 +00:00
|
|
|
$(ONE_DRIVER_SOURCES) \
|
2008-08-20 20:48:35 +00:00
|
|
|
$(OPENVZ_DRIVER_SOURCES) \
|
2009-07-24 14:17:06 +00:00
|
|
|
$(PHYP_DRIVER_SOURCES) \
|
2009-04-17 16:09:07 +00:00
|
|
|
$(VBOX_DRIVER_SOURCES) \
|
2009-07-23 20:21:08 +00:00
|
|
|
$(ESX_DRIVER_SOURCES) \
|
2008-10-10 13:57:13 +00:00
|
|
|
$(NETWORK_DRIVER_SOURCES) \
|
2009-07-21 14:02:16 +00:00
|
|
|
$(INTERFACE_DRIVER_SOURCES) \
|
2008-08-20 20:48:35 +00:00
|
|
|
$(STORAGE_DRIVER_SOURCES) \
|
|
|
|
$(STORAGE_DRIVER_FS_SOURCES) \
|
|
|
|
$(STORAGE_DRIVER_LVM_SOURCES) \
|
|
|
|
$(STORAGE_DRIVER_ISCSI_SOURCES) \
|
2009-04-01 16:03:22 +00:00
|
|
|
$(STORAGE_DRIVER_SCSI_SOURCES) \
|
2009-09-08 13:47:45 +00:00
|
|
|
$(STORAGE_DRIVER_MPATH_SOURCES) \
|
2008-11-21 12:27:11 +00:00
|
|
|
$(STORAGE_DRIVER_DISK_SOURCES) \
|
|
|
|
$(NODE_DEVICE_DRIVER_SOURCES) \
|
|
|
|
$(NODE_DEVICE_DRIVER_HAL_SOURCES) \
|
2009-04-03 10:55:51 +00:00
|
|
|
$(NODE_DEVICE_DRIVER_DEVKIT_SOURCES) \
|
2009-04-19 15:12:01 +00:00
|
|
|
$(SECURITY_DRIVER_SELINUX_SOURCES) \
|
2009-10-08 14:34:22 +00:00
|
|
|
$(SECURITY_DRIVER_APPARMOR_SOURCES) \
|
2009-09-14 12:31:23 +00:00
|
|
|
$(SECRET_DRIVER_SOURCES) \
|
2009-04-19 16:36:22 +00:00
|
|
|
$(VBOX_DRIVER_EXTRA_DIST)
|
2008-08-20 20:48:35 +00:00
|
|
|
|
2009-10-08 16:06:40 +00:00
|
|
|
check-local:
|
|
|
|
if WITH_QEMU
|
|
|
|
if test -x '$(AUGPARSE)'; then \
|
|
|
|
'$(AUGPARSE)' -I $(srcdir)/qemu \
|
|
|
|
$(srcdir)/qemu/test_libvirtd_qemu.aug; \
|
|
|
|
fi
|
|
|
|
endif
|
|
|
|
if WITH_LXC
|
|
|
|
if test -x '$(AUGPARSE)'; then \
|
|
|
|
'$(AUGPARSE)' -I $(srcdir)/lxc \
|
|
|
|
$(srcdir)/lxc/test_libvirtd_lxc.aug; \
|
|
|
|
fi
|
|
|
|
endif
|
|
|
|
|
2009-01-05 14:05:29 +00:00
|
|
|
#
|
|
|
|
# Build our version script. This is composed of three parts:
|
|
|
|
#
|
|
|
|
# 1. libvirt_public.syms - public API. These functions are always
|
|
|
|
# present in the library and should never change incompatibly.
|
|
|
|
#
|
|
|
|
# 2. libvirt_private.syms - private API. These symbols are private and
|
|
|
|
# semantics may change on every release, hence the version number is
|
|
|
|
# spliced in at build time. This ensures that if libvirtd, virsh, or a
|
|
|
|
# driver module was built against one libvirt release, it will refuse to
|
|
|
|
# load with another where symbols may have same names but different
|
|
|
|
# semantics. Such symbols should never be visible in an (installed)
|
|
|
|
# public header file.
|
|
|
|
#
|
|
|
|
# 3. libvirt_*.syms - dynamic private API. Like libvirt_private.syms,
|
|
|
|
# except that build options (such as --enable-debug) can mean these
|
|
|
|
# symbols aren't present at all.
|
|
|
|
#
|
|
|
|
|
2009-01-05 14:06:41 +00:00
|
|
|
if WITH_DRIVER_MODULES
|
2009-01-06 15:16:43 +00:00
|
|
|
USED_SYM_FILES += libvirt_driver_modules.syms
|
2009-01-05 14:06:41 +00:00
|
|
|
endif
|
2009-01-05 14:07:31 +00:00
|
|
|
|
|
|
|
if WITH_BRIDGE
|
2009-01-06 15:16:43 +00:00
|
|
|
USED_SYM_FILES += libvirt_bridge.syms
|
2009-01-05 14:07:31 +00:00
|
|
|
endif
|
2009-01-05 14:08:26 +00:00
|
|
|
|
|
|
|
if WITH_LINUX
|
2009-01-06 15:16:43 +00:00
|
|
|
USED_SYM_FILES += libvirt_linux.syms
|
2009-01-05 14:08:26 +00:00
|
|
|
endif
|
2009-01-05 14:05:29 +00:00
|
|
|
|
2009-01-06 15:16:43 +00:00
|
|
|
EXTRA_DIST += \
|
|
|
|
libvirt_public.syms \
|
|
|
|
libvirt_private.syms \
|
|
|
|
libvirt_driver_modules.syms \
|
|
|
|
libvirt_bridge.syms \
|
|
|
|
libvirt_linux.syms
|
2009-01-05 14:05:29 +00:00
|
|
|
|
2009-09-16 11:01:53 +00:00
|
|
|
BUILT_SOURCES = libvirt.syms
|
|
|
|
|
2009-01-06 15:16:43 +00:00
|
|
|
libvirt.syms: libvirt_public.syms $(USED_SYM_FILES)
|
2009-01-05 14:05:29 +00:00
|
|
|
rm -f $@-tmp $@
|
|
|
|
printf '# WARNING: generated from the following:\n# $^\n\n' >$@-tmp
|
|
|
|
cat $(srcdir)/libvirt_public.syms >>$@-tmp
|
|
|
|
printf '\n\n# Private symbols\n\n' >>$@-tmp
|
|
|
|
printf 'LIBVIRT_PRIVATE_$(VERSION) {\n\n' >>$@-tmp
|
|
|
|
printf 'global:\n\n' >>$@-tmp
|
2009-01-06 15:16:43 +00:00
|
|
|
for file in $(USED_SYM_FILES); do \
|
2009-01-05 14:05:29 +00:00
|
|
|
cat $(srcdir)/$$file >>$@-tmp; \
|
|
|
|
done
|
|
|
|
printf '\n\nlocal:\n*;\n\n};' >>$@-tmp
|
|
|
|
chmod a-w $@-tmp
|
|
|
|
mv $@-tmp libvirt.syms
|
2008-02-20 15:45:33 +00:00
|
|
|
|
2008-11-17 10:43:30 +00:00
|
|
|
# Empty source list - it merely links a bunch of convenience libs together
|
|
|
|
libvirt_la_SOURCES =
|
2008-11-18 12:46:13 +00:00
|
|
|
libvirt_la_LIBADD += \
|
Use gnulib, starting with its physmem and getaddrinfo modules.
New files go into these directories:
gnulib/lib
gnulib/m4
gnulib/tests
* bootstrap: A wrapper around gnulib-tool.
* configure.in: Invoke gl_EARLY and gl_INIT, being careful to put gl_EARLY
before any macro that uses AC_COMPILE_IFELSE.
(AC_OUTPUT): Add lib/Makefile and gl-tests/Makefile. Remove m4/Makefile.
* Makefile.am (SUBDIRS): Add gnulib/lib and remove m4. Add gnulib/tests
early enough that those tests run before any libvirt unit tests.
* m4/Makefile.am: Remove file. Not needed.
* src/Makefile.am (INCLUDES): Add -I$(top_srcdir)/gnulib/lib -I../gnulib/lib.
(LDADDS, libvirt_la_LIBADD): Add ../gnulib/lib/libgnu.la.
* src/nodeinfo.c: Include "physmem.h".
* qemud/qemud.c, src/remote_internal.c: Include "getaddrinfo.h".
(MEMINFO_PATH, linuxNodeInfoMemPopulate): Remove definitions.
(virNodeInfoPopulate): Use physmem_total, not linuxNodeInfoMemPopulate.
* tests/Makefile.am (INCLUDES): Add -I$(top_srcdir)/gnulib/lib -I../gnulib/lib.
(LDADDS): Add ../gnulib/lib/libgnu.la.
* qemud/Makefile.am (libvirtd_LDADD): Add ../gnulib/lib/libgnu.la.
* tests/nodeinfotest.c (linuxTestCompareFiles): No longer read total
memory from a file.
Update expected output not to include "Memory: NNNN"
* tests/nodeinfodata/linux-nodeinfo-1.txt:
* tests/nodeinfodata/linux-nodeinfo-2.txt:
* tests/nodeinfodata/linux-nodeinfo-3.txt:
* tests/nodeinfodata/linux-nodeinfo-4.txt:
* tests/nodeinfodata/linux-nodeinfo-5.txt:
* tests/nodeinfodata/linux-nodeinfo-6.txt:
* src/test.c [WITH_TEST]: Remove definition of _GNU_SOURCE that
would conflict with the one now in "config.h".
* autogen.sh: Add -I gnulib/m4.
* src/conf.c, src/sexpr.c: Don't define _GNU_SOURCE.
Instead, include "config.h".
* qemud/qemud.c: Remove definition of _GNU_SOURCE.
* src/openvz_driver.c: Likewise.
* src/qemu_driver.c: Likewise.
* src/remote_internal.c: Likewise.
* configure.in: Use AC_CONFIG_AUX_DIR(build-aux), so that a bunch
of gettextize-generated files go into build-aux/, rather than in
the top-level directory.
* .cvsignore: Adjust.
* build-aux/.cvsignore: New file.
Author: Jim Meyering <meyering@redhat.com>
2007-12-05 21:31:07 +00:00
|
|
|
@CYGWIN_EXTRA_LIBADD@ ../gnulib/lib/libgnu.la
|
2009-01-05 14:05:29 +00:00
|
|
|
libvirt_la_LDFLAGS = $(VERSION_SCRIPT_FLAGS)libvirt.syms \
|
2007-11-29 17:44:01 +00:00
|
|
|
-version-info @LIBVIRT_VERSION_INFO@ \
|
|
|
|
$(COVERAGE_CFLAGS:-f%=-Wc,-f%) \
|
Move all XML configuration handling to src/conf/
* src/capabilities.c, src/capabilities.h, src/domain_conf.c,
src/domain_conf.h, src/domain_event.c, src/domain_event.h,
src/interface_conf.c, src/interface_conf.h,
src/network_conf.c, src/network_conf.h, src/node_device_conf.c,
src/node_device_conf.h, src/secret_conf.c, src/secret_conf.h,
src/storage_conf.c, src/storage_conf.h, src/storage_encryption_conf.c,
src/storage_encryption_conf.h: Move to src/conf/
* src/Makefile.am: Add -Isrc/conf to the individual build targets
which need to use XML config APIs. Remove LIBXML_CFLAGS, LIBSSH2_CFLAGS
and SELINUX_CFLAGS from global INCLUDES and only have them in build
targets which actually need them. Create a libvirt_conf.la
convenience library for all config parsers
* src/hostusb.h: Remove bogus include of domain_conf.h
* tests/Makefile.am: Add -Isrc/conf. Remove bogus -I$builddir/src
since it never has any generated header files
* daemon/Makefile.am: Add -Isrc/conf
* proxy/Makefile.am: Add -Isrc/conf and cope with renamed files
* src/hash.c: Remove bogus include of libxml/threads.h
2009-09-16 14:39:12 +00:00
|
|
|
$(LIBXML_LIBS) \
|
|
|
|
$(DRIVER_MODULE_LIBS) \
|
2008-01-05 16:06:36 +00:00
|
|
|
@CYGWIN_EXTRA_LDFLAGS@ @MINGW_EXTRA_LDFLAGS@
|
2008-02-25 13:55:56 +00:00
|
|
|
libvirt_la_CFLAGS = $(COVERAGE_CFLAGS) -DIN_LIBVIRT
|
2009-01-05 14:05:29 +00:00
|
|
|
libvirt_la_DEPENDENCIES = $(libvirt_la_LIBADD) libvirt.syms
|
2007-06-15 01:21:18 +00:00
|
|
|
|
2008-02-28 17:06:32 +00:00
|
|
|
# Create an automake "convenience library" version of libvirt_la,
|
|
|
|
# just for testing, since the test harness requires access to internal
|
|
|
|
# bits and pieces that we don't want to make publicly accessible.
|
2008-11-17 10:43:30 +00:00
|
|
|
noinst_LTLIBRARIES += libvirt_test.la
|
2008-02-28 17:06:32 +00:00
|
|
|
|
2009-01-05 14:05:29 +00:00
|
|
|
# Remove version script from convenience library
|
2008-02-28 17:06:32 +00:00
|
|
|
test_LDFLAGS = \
|
|
|
|
$$(echo '$(libvirt_la_LDFLAGS)' \
|
2009-01-05 14:05:29 +00:00
|
|
|
|sed 's!@VERSION_SCRIPT_FLAGS@libvirt.syms!!' \
|
2008-02-28 17:06:32 +00:00
|
|
|
|sed 's!-version-info @LIBVIRT_VERSION_INFO@!!')
|
|
|
|
|
|
|
|
# Just like the above, but with a slightly different set of public symbols.
|
|
|
|
libvirt_test_la_SOURCES = $(libvirt_la_SOURCES)
|
|
|
|
libvirt_test_la_LIBADD = $(libvirt_la_LIBADD)
|
|
|
|
libvirt_test_la_LDFLAGS = $(test_LDFLAGS)
|
|
|
|
libvirt_test_la_CFLAGS = $(COVERAGE_CFLAGS)
|
|
|
|
|
2008-10-15 18:39:34 +00:00
|
|
|
|
2008-08-20 20:55:32 +00:00
|
|
|
libexec_PROGRAMS =
|
|
|
|
|
2008-02-20 15:52:17 +00:00
|
|
|
if WITH_STORAGE_DISK
|
2008-04-18 08:33:23 +00:00
|
|
|
if WITH_LIBVIRTD
|
2008-08-20 20:55:32 +00:00
|
|
|
libexec_PROGRAMS += libvirt_parthelper
|
2008-02-20 15:52:17 +00:00
|
|
|
|
2008-08-20 20:48:35 +00:00
|
|
|
libvirt_parthelper_SOURCES = $(STORAGE_HELPER_DISK_SOURCES)
|
2008-02-20 15:52:17 +00:00
|
|
|
libvirt_parthelper_LDFLAGS = $(WARN_CFLAGS) $(COVERAGE_LDCFLAGS)
|
|
|
|
libvirt_parthelper_LDADD = $(LIBPARTED_LIBS)
|
|
|
|
libvirt_parthelper_CFLAGS = $(LIBPARTED_CFLAGS)
|
2008-04-18 08:33:23 +00:00
|
|
|
endif
|
2008-02-20 15:52:17 +00:00
|
|
|
endif
|
2008-08-20 20:48:35 +00:00
|
|
|
EXTRA_DIST += $(STORAGE_HELPER_DISK_SOURCES)
|
|
|
|
|
2008-02-20 15:52:17 +00:00
|
|
|
|
2008-08-20 20:55:32 +00:00
|
|
|
if WITH_LXC
|
|
|
|
if WITH_LIBVIRTD
|
|
|
|
libexec_PROGRAMS += libvirt_lxc
|
|
|
|
|
|
|
|
libvirt_lxc_SOURCES = \
|
|
|
|
$(LXC_CONTROLLER_SOURCES) \
|
make NUMA-initialization code more portable and more robust
qemudCapsInitNUMA and umlCapsInitNUMA were identical, so this change
factors them into a new function, virCapsInitNUMA, and puts it in
nodeinfo.c.
In addition to factoring out the duplicates, this change also
adjusts that function definition (along with its macros) so
that it works with Fedora 9's numactl version 1, and makes it
so the code will work even if someone builds the kernel with
CONFIG_NR_CPUS > 4096.
Finally, also perform this NUMA initialization for the lxc
and openvz drivers.
* src/nodeinfo.c: Include <stdint.h>, <numa.h> and "memory.h".
(virCapsInitNUMA): Rename from qemudCapsInitNUMA and umlCapsInitNUMA.
(NUMA_MAX_N_CPUS): Define depending on NUMA API version.
(n_bits, MASK_CPU_ISSET): Define, adjust, use uint64 rather than long.
* src/nodeinfo.h: Include "capabilities.h".
(virCapsInitNUMA): Declare it.
* examples/domain-events/events-c/Makefile.am:
* src/Makefile.am: Add $(NUMACTL_CFLAGS) and $(NUMACTL_LIBS) to various
compile/link-related variables.
* src/qemu_conf.c: Include "nodeinfo.h".
(qemudCapsInitNUMA): Remove duplicate code. Adjust caller.
* src/uml_conf.c (umlCapsInitNUMA): Likewise.
Include "nodeinfo.h".
* src/lxc_conf.c: Include "nodeinfo.h".
(lxcCapsInit): Perform NUMA initialization here, too.
* src/openvz_conf.c (openvzCapsInit): And here.
Include "nodeinfo.h".
* src/libvirt_sym.version.in: Add virCapsInitNUMA so that libvirtd
can link to this function.
2008-12-21 18:55:09 +00:00
|
|
|
$(UTIL_SOURCES) \
|
Move all XML configuration handling to src/conf/
* src/capabilities.c, src/capabilities.h, src/domain_conf.c,
src/domain_conf.h, src/domain_event.c, src/domain_event.h,
src/interface_conf.c, src/interface_conf.h,
src/network_conf.c, src/network_conf.h, src/node_device_conf.c,
src/node_device_conf.h, src/secret_conf.c, src/secret_conf.h,
src/storage_conf.c, src/storage_conf.h, src/storage_encryption_conf.c,
src/storage_encryption_conf.h: Move to src/conf/
* src/Makefile.am: Add -Isrc/conf to the individual build targets
which need to use XML config APIs. Remove LIBXML_CFLAGS, LIBSSH2_CFLAGS
and SELINUX_CFLAGS from global INCLUDES and only have them in build
targets which actually need them. Create a libvirt_conf.la
convenience library for all config parsers
* src/hostusb.h: Remove bogus include of domain_conf.h
* tests/Makefile.am: Add -Isrc/conf. Remove bogus -I$builddir/src
since it never has any generated header files
* daemon/Makefile.am: Add -Isrc/conf
* proxy/Makefile.am: Add -Isrc/conf and cope with renamed files
* src/hash.c: Remove bogus include of libxml/threads.h
2009-09-16 14:39:12 +00:00
|
|
|
$(NODE_INFO_SOURCES) \
|
|
|
|
$(ENCRYPTION_CONF_SOURCES) \
|
2008-08-20 20:55:32 +00:00
|
|
|
$(DOMAIN_CONF_SOURCES)
|
2009-06-29 17:00:52 +00:00
|
|
|
libvirt_lxc_LDFLAGS = $(WARN_CFLAGS) $(COVERAGE_LDCFLAGS) $(CAPNG_LIBS)
|
make NUMA-initialization code more portable and more robust
qemudCapsInitNUMA and umlCapsInitNUMA were identical, so this change
factors them into a new function, virCapsInitNUMA, and puts it in
nodeinfo.c.
In addition to factoring out the duplicates, this change also
adjusts that function definition (along with its macros) so
that it works with Fedora 9's numactl version 1, and makes it
so the code will work even if someone builds the kernel with
CONFIG_NR_CPUS > 4096.
Finally, also perform this NUMA initialization for the lxc
and openvz drivers.
* src/nodeinfo.c: Include <stdint.h>, <numa.h> and "memory.h".
(virCapsInitNUMA): Rename from qemudCapsInitNUMA and umlCapsInitNUMA.
(NUMA_MAX_N_CPUS): Define depending on NUMA API version.
(n_bits, MASK_CPU_ISSET): Define, adjust, use uint64 rather than long.
* src/nodeinfo.h: Include "capabilities.h".
(virCapsInitNUMA): Declare it.
* examples/domain-events/events-c/Makefile.am:
* src/Makefile.am: Add $(NUMACTL_CFLAGS) and $(NUMACTL_LIBS) to various
compile/link-related variables.
* src/qemu_conf.c: Include "nodeinfo.h".
(qemudCapsInitNUMA): Remove duplicate code. Adjust caller.
* src/uml_conf.c (umlCapsInitNUMA): Likewise.
Include "nodeinfo.h".
* src/lxc_conf.c: Include "nodeinfo.h".
(lxcCapsInit): Perform NUMA initialization here, too.
* src/openvz_conf.c (openvzCapsInit): And here.
Include "nodeinfo.h".
* src/libvirt_sym.version.in: Add virCapsInitNUMA so that libvirtd
can link to this function.
2008-12-21 18:55:09 +00:00
|
|
|
libvirt_lxc_LDADD = $(LIBXML_LIBS) $(NUMACTL_LIBS) ../gnulib/lib/libgnu.la
|
Move all XML configuration handling to src/conf/
* src/capabilities.c, src/capabilities.h, src/domain_conf.c,
src/domain_conf.h, src/domain_event.c, src/domain_event.h,
src/interface_conf.c, src/interface_conf.h,
src/network_conf.c, src/network_conf.h, src/node_device_conf.c,
src/node_device_conf.h, src/secret_conf.c, src/secret_conf.h,
src/storage_conf.c, src/storage_conf.h, src/storage_encryption_conf.c,
src/storage_encryption_conf.h: Move to src/conf/
* src/Makefile.am: Add -Isrc/conf to the individual build targets
which need to use XML config APIs. Remove LIBXML_CFLAGS, LIBSSH2_CFLAGS
and SELINUX_CFLAGS from global INCLUDES and only have them in build
targets which actually need them. Create a libvirt_conf.la
convenience library for all config parsers
* src/hostusb.h: Remove bogus include of domain_conf.h
* tests/Makefile.am: Add -Isrc/conf. Remove bogus -I$builddir/src
since it never has any generated header files
* daemon/Makefile.am: Add -Isrc/conf
* proxy/Makefile.am: Add -Isrc/conf and cope with renamed files
* src/hash.c: Remove bogus include of libxml/threads.h
2009-09-16 14:39:12 +00:00
|
|
|
libvirt_lxc_CFLAGS = \
|
|
|
|
$(LIBPARTED_CFLAGS) \
|
|
|
|
$(NUMACTL_CFLAGS) \
|
|
|
|
$(CAPNG_CFLAGS) \
|
|
|
|
-I@top_srcdir@/src/conf
|
2008-08-20 20:55:32 +00:00
|
|
|
endif
|
|
|
|
endif
|
|
|
|
EXTRA_DIST += $(LXC_CONTROLLER_SOURCES)
|
|
|
|
|
2009-10-08 14:34:22 +00:00
|
|
|
if WITH_SECDRIVER_APPARMOR
|
|
|
|
if WITH_LIBVIRTD
|
|
|
|
libexec_PROGRAMS += virt-aa-helper
|
|
|
|
|
|
|
|
virt_aa_helper_SOURCES = $(SECURITY_DRIVER_APPARMOR_HELPER_SOURCES)
|
|
|
|
|
|
|
|
virt_aa_helper_LDFLAGS = $(WARN_CFLAGS)
|
|
|
|
virt_aa_helper_LDADD = \
|
|
|
|
$(WARN_CFLAGS) \
|
|
|
|
$(LIBXML_LIBS) \
|
|
|
|
@top_srcdir@/gnulib/lib/libgnu.la \
|
|
|
|
@top_srcdir@/src/libvirt_conf.la \
|
|
|
|
@top_srcdir@/src/libvirt_util.la
|
|
|
|
virt_aa_helper_CFLAGS = \
|
|
|
|
-I@top_srcdir@/src/conf \
|
|
|
|
-I@top_srcdir@/src/security
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
EXTRA_DIST += $(SECURITY_DRIVER_APPARMOR_HELPER_SOURCES)
|
|
|
|
|
2009-09-16 11:31:13 +00:00
|
|
|
install-data-local:
|
2009-01-20 22:36:10 +00:00
|
|
|
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/cache/libvirt"
|
|
|
|
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/images"
|
|
|
|
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/boot"
|
|
|
|
if WITH_QEMU
|
|
|
|
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/qemu"
|
|
|
|
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/run/libvirt/qemu"
|
2009-07-15 21:25:01 +00:00
|
|
|
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/cache/libvirt/qemu"
|
2009-09-16 11:31:13 +00:00
|
|
|
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/log/libvirt/qemu"
|
2009-01-20 22:36:10 +00:00
|
|
|
endif
|
|
|
|
if WITH_LXC
|
|
|
|
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/lxc"
|
|
|
|
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/run/libvirt/lxc"
|
|
|
|
endif
|
|
|
|
if WITH_UML
|
|
|
|
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/uml"
|
|
|
|
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/run/libvirt/uml"
|
|
|
|
endif
|
|
|
|
if WITH_NETWORK
|
|
|
|
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/iptables/filter"
|
|
|
|
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/iptables/nat"
|
|
|
|
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/network"
|
|
|
|
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/run/libvirt/network"
|
2009-09-16 11:31:13 +00:00
|
|
|
$(MKDIR_P) "$(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart"
|
|
|
|
$(INSTALL_DATA) $(srcdir)/network/default.xml \
|
|
|
|
$(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml
|
|
|
|
test -z "$(UUID)" || \
|
|
|
|
sed -i -e "s,</name>,</name>\n <uuid>$(UUID)</uuid>," \
|
|
|
|
$(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml
|
|
|
|
test -e $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart/default.xml || \
|
|
|
|
ln -s ../default.xml \
|
|
|
|
$(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart/default.xml
|
|
|
|
endif
|
|
|
|
|
|
|
|
uninstall-local::
|
|
|
|
rmdir "$(DESTDIR)$(localstatedir)/cache/libvirt" ||:
|
|
|
|
rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/images" ||:
|
|
|
|
rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/boot" ||:
|
|
|
|
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" ||:
|
2009-01-20 22:36:10 +00:00
|
|
|
endif
|
2009-09-16 11:31:13 +00:00
|
|
|
if WITH_LXC
|
|
|
|
rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/lxc" ||:
|
|
|
|
rmdir "$(DESTDIR)$(localstatedir)/run/libvirt/lxc" ||:
|
|
|
|
endif
|
|
|
|
if WITH_UML
|
|
|
|
rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/uml" ||:
|
|
|
|
rmdir "$(DESTDIR)$(localstatedir)/run/libvirt/uml" ||:
|
|
|
|
endif
|
|
|
|
if WITH_NETWORK
|
|
|
|
rm -f $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart/default.xml
|
|
|
|
rm -f $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml
|
|
|
|
rmdir "$(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart" || :
|
|
|
|
rmdir "$(DESTDIR)$(sysconfdir)/libvirt/qemu/networks" || :
|
|
|
|
rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/iptables/filter" ||:
|
|
|
|
rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/iptables/nat" ||:
|
|
|
|
rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/network" ||:
|
|
|
|
rmdir "$(DESTDIR)$(localstatedir)/run/libvirt/network" ||:
|
|
|
|
endif
|
|
|
|
rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt" ||:
|
2008-06-10 10:43:28 +00:00
|
|
|
|
2009-05-19 10:17:17 +00:00
|
|
|
CLEANFILES = *.gcov .libs/*.gcda .libs/*.gcno *.gcno *.gcda *.i *.s
|
2008-08-05 08:43:03 +00:00
|
|
|
DISTCLEANFILES = $(BUILT_SOURCES)
|