2005-11-02 12:50:21 +00:00
|
|
|
## Process this file with automake to produce Makefile.in
|
|
|
|
|
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
|
|
|
INCLUDES = \
|
|
|
|
-I$(top_srcdir)/gnulib/lib -I../gnulib/lib \
|
|
|
|
-I../include \
|
2007-06-11 11:43:41 +00:00
|
|
|
-I@top_srcdir@/include \
|
2009-09-15 14:49:29 +00:00
|
|
|
-I@top_srcdir@/daemon \
|
2007-09-19 17:42:40 +00:00
|
|
|
$(LIBXML_CFLAGS) \
|
2009-09-04 10:08:47 +00:00
|
|
|
$(LIBSSH2_CFLAGS) \
|
2008-02-20 15:38:29 +00:00
|
|
|
$(SELINUX_CFLAGS) \
|
2008-11-21 12:16:08 +00:00
|
|
|
$(DRIVER_MODULE_CFLAGS) \
|
|
|
|
-DLIBDIR=\""$(libdir)"\" \
|
2007-06-11 11:43:41 +00:00
|
|
|
-DBINDIR=\""$(libexecdir)"\" \
|
|
|
|
-DSBINDIR=\""$(sbindir)"\" \
|
|
|
|
-DSYSCONF_DIR="\"$(sysconfdir)\"" \
|
|
|
|
-DLOCALEBASEDIR=\""$(datadir)/locale"\" \
|
2007-02-14 01:40:09 +00:00
|
|
|
-DLOCAL_STATE_DIR=\""$(localstatedir)"\" \
|
2007-06-11 11:43:41 +00:00
|
|
|
-DGETTEXT_PACKAGE=\"$(PACKAGE)\" \
|
2009-05-19 10:17:17 +00:00
|
|
|
$(WARN_CFLAGS) \
|
|
|
|
$(LOCK_CHECKING_CFLAGS)
|
2008-11-04 23:37:23 +00:00
|
|
|
|
2007-10-12 19:54:15 +00:00
|
|
|
confdir = $(sysconfdir)/libvirt/
|
|
|
|
conf_DATA = qemu.conf
|
|
|
|
|
2008-10-24 11:31:15 +00:00
|
|
|
ICON_FILES = \
|
|
|
|
libvirt_win_icon_16x16.ico \
|
|
|
|
libvirt_win_icon_32x32.ico \
|
|
|
|
libvirt_win_icon_48x48.ico \
|
|
|
|
libvirt_win_icon_64x64.ico \
|
|
|
|
virsh_win_icon.rc
|
|
|
|
|
2009-01-06 15:22:57 +00:00
|
|
|
EXTRA_DIST = $(conf_DATA) $(ICON_FILES)
|
2007-10-12 19:54:15 +00:00
|
|
|
|
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 =
|
|
|
|
|
|
|
|
|
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 = \
|
2008-08-20 20:48:35 +00:00
|
|
|
bridge.c bridge.h \
|
|
|
|
buf.c buf.h \
|
|
|
|
conf.c conf.h \
|
2007-06-26 22:51:01 +00:00
|
|
|
event.c event.h \
|
2008-11-04 23:22:06 +00:00
|
|
|
hash.c hash.h \
|
2008-08-20 20:48:35 +00:00
|
|
|
iptables.c iptables.h \
|
2009-01-15 19:56:05 +00:00
|
|
|
logging.c logging.h \
|
2008-08-20 20:48:35 +00:00
|
|
|
memory.c memory.h \
|
2009-03-02 16:18:11 +00:00
|
|
|
pci.c pci.h \
|
2009-08-14 13:19:32 +00:00
|
|
|
hostusb.c hostusb.h \
|
2008-08-20 20:48:35 +00:00
|
|
|
qparams.c qparams.h \
|
2009-08-19 19:50:10 +00:00
|
|
|
storage_encryption_conf.h storage_encryption_conf.c \
|
2009-01-15 19:56:05 +00:00
|
|
|
threads.c threads.h \
|
|
|
|
threads-pthread.h \
|
|
|
|
threads-win32.h \
|
2008-08-20 20:48:35 +00:00
|
|
|
uuid.c uuid.h \
|
|
|
|
util.c util.h \
|
2008-11-04 22:30:33 +00:00
|
|
|
virterror.c virterror_internal.h \
|
2008-08-20 20:48:35 +00:00
|
|
|
xml.c xml.h
|
|
|
|
|
2009-01-15 19:56:05 +00:00
|
|
|
EXTRA_DIST += threads-pthread.c threads-win32.c
|
|
|
|
|
2008-11-17 10:43:30 +00:00
|
|
|
# Internal generic driver infrastructure
|
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 \
|
|
|
|
domain_event.c domain_event.h \
|
|
|
|
stats_linux.c stats_linux.h \
|
|
|
|
libvirt.c libvirt_internal.h
|
|
|
|
|
|
|
|
|
2008-08-20 20:48:35 +00:00
|
|
|
# Domain driver generic impl APIs
|
|
|
|
DOMAIN_CONF_SOURCES = \
|
|
|
|
capabilities.c capabilities.h \
|
|
|
|
domain_conf.c domain_conf.h \
|
|
|
|
nodeinfo.h nodeinfo.c
|
|
|
|
|
|
|
|
# Network driver generic impl APIs
|
|
|
|
NETWORK_CONF_SOURCES = \
|
|
|
|
network_conf.c network_conf.h
|
|
|
|
|
|
|
|
# Storage driver generic impl APIs
|
|
|
|
STORAGE_CONF_SOURCES = \
|
2008-11-17 11:19:33 +00:00
|
|
|
storage_conf.h storage_conf.c
|
2008-08-20 20:48:35 +00:00
|
|
|
|
2009-07-15 17:34:04 +00:00
|
|
|
# Interface driver generic impl APIs
|
|
|
|
INTERFACE_CONF_SOURCES = \
|
|
|
|
interface_conf.c interface_conf.h
|
2008-08-20 20:48:35 +00:00
|
|
|
|
2009-09-01 15:27:46 +00:00
|
|
|
# Secret driver generic impl APIs
|
|
|
|
SECRET_CONF_SOURCES = \
|
|
|
|
secret_conf.h secret_conf.c
|
|
|
|
|
2008-08-20 20:48:35 +00:00
|
|
|
# The remote RPC driver, covering domains, storage, networks, etc
|
|
|
|
REMOTE_DRIVER_SOURCES = \
|
|
|
|
gnutls_1_0_compat.h \
|
2007-06-27 00:12:29 +00:00
|
|
|
remote_internal.c remote_internal.h \
|
2009-09-15 14:49:29 +00:00
|
|
|
../daemon/remote_protocol.c \
|
|
|
|
../daemon/remote_protocol.h
|
2008-08-20 20:48:35 +00:00
|
|
|
|
|
|
|
# Mock driver, covering domains, storage, networks, etc
|
|
|
|
TEST_DRIVER_SOURCES = \
|
|
|
|
test.c test.h
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# 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 \
|
|
|
|
lxc/veth.c lxc/veth.h \
|
2008-10-03 16:46:01 +00:00
|
|
|
cgroup.c cgroup.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 \
|
|
|
|
lxc/veth.c lxc/veth.h \
|
2008-10-03 16:46:01 +00:00
|
|
|
cgroup.c cgroup.h
|
2008-08-20 20:55:32 +00:00
|
|
|
|
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 = \
|
|
|
|
openvz_conf.c openvz_conf.h \
|
|
|
|
openvz_driver.c 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 = \
|
|
|
|
qemu_conf.c qemu_conf.h \
|
2009-07-22 15:08:04 +00:00
|
|
|
qemu_driver.c qemu_driver.h \
|
|
|
|
cgroup.c cgroup.h
|
2008-04-18 08:33:23 +00:00
|
|
|
|
2008-11-19 16:58:23 +00:00
|
|
|
UML_DRIVER_SOURCES = \
|
|
|
|
uml_conf.c uml_conf.h \
|
|
|
|
uml_driver.c uml_driver.h
|
|
|
|
|
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 = \
|
|
|
|
network_driver.h network_driver.c
|
2008-08-20 20:48:35 +00:00
|
|
|
|
2009-07-21 14:02:16 +00:00
|
|
|
INTERFACE_DRIVER_SOURCES = \
|
|
|
|
interface_driver.h interface_driver.c
|
|
|
|
|
2009-08-14 19:48:55 +00:00
|
|
|
SECRET_DRIVER_SOURCES = \
|
|
|
|
secret_driver.h secret_driver.c
|
|
|
|
|
2009-03-03 09:44:41 +00:00
|
|
|
# Storage backend specific impls
|
2008-08-20 20:48:35 +00:00
|
|
|
STORAGE_DRIVER_SOURCES = \
|
2008-11-17 11:19:33 +00:00
|
|
|
storage_driver.h storage_driver.c \
|
|
|
|
storage_backend.h storage_backend.c
|
2008-08-20 20:48:35 +00:00
|
|
|
|
2008-11-21 12:20:45 +00:00
|
|
|
# Network driver generic impl APIs
|
|
|
|
NODE_DEVICE_CONF_SOURCES = \
|
|
|
|
node_device_conf.c node_device_conf.h
|
|
|
|
|
2008-08-20 20:48:35 +00:00
|
|
|
STORAGE_DRIVER_FS_SOURCES = \
|
2008-04-18 08:33:23 +00:00
|
|
|
storage_backend_fs.h storage_backend_fs.c
|
|
|
|
|
2008-08-20 20:48:35 +00:00
|
|
|
STORAGE_DRIVER_LVM_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
|
|
|
storage_backend_logical.h \
|
2008-08-20 20:48:35 +00:00
|
|
|
storage_backend_logical.c
|
|
|
|
|
|
|
|
STORAGE_DRIVER_ISCSI_SOURCES = \
|
|
|
|
storage_backend_iscsi.h storage_backend_iscsi.c
|
|
|
|
|
2009-04-01 16:03:22 +00:00
|
|
|
STORAGE_DRIVER_SCSI_SOURCES = \
|
|
|
|
storage_backend_scsi.h storage_backend_scsi.c
|
|
|
|
|
2009-09-08 13:47:45 +00:00
|
|
|
STORAGE_DRIVER_MPATH_SOURCES = \
|
|
|
|
storage_backend_mpath.h storage_backend_mpath.c
|
|
|
|
|
2008-08-20 20:48:35 +00:00
|
|
|
STORAGE_DRIVER_DISK_SOURCES = \
|
|
|
|
storage_backend_disk.h storage_backend_disk.c
|
|
|
|
|
|
|
|
STORAGE_HELPER_DISK_SOURCES = \
|
|
|
|
parthelper.c
|
|
|
|
|
|
|
|
|
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-03-03 09:44:41 +00:00
|
|
|
security.h security.c
|
|
|
|
|
2009-03-03 10:06:49 +00:00
|
|
|
SECURITY_DRIVER_SELINUX_SOURCES = \
|
|
|
|
security_selinux.h security_selinux.c
|
|
|
|
|
2009-03-03 09:44:41 +00:00
|
|
|
|
2008-11-21 12:27:11 +00:00
|
|
|
NODE_DEVICE_DRIVER_SOURCES = \
|
|
|
|
node_device.c node_device.h
|
|
|
|
|
|
|
|
NODE_DEVICE_DRIVER_HAL_SOURCES = \
|
2009-06-02 15:12:53 +00:00
|
|
|
node_device_hal.c \
|
2009-06-15 14:59:22 +00:00
|
|
|
node_device_hal.h \
|
2009-06-02 15:12:53 +00:00
|
|
|
node_device_hal_linux.c
|
|
|
|
|
2008-11-21 12:27:11 +00:00
|
|
|
NODE_DEVICE_DRIVER_DEVKIT_SOURCES = \
|
|
|
|
node_device_devkit.c
|
|
|
|
|
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
|
|
|
|
|
|
|
noinst_LTLIBRARIES += libvirt_driver.la
|
|
|
|
libvirt_la_LIBADD += libvirt_driver.la
|
|
|
|
libvirt_driver_la_SOURCES = \
|
|
|
|
$(DRIVER_SOURCES) \
|
2008-08-20 20:48:35 +00:00
|
|
|
$(DOMAIN_CONF_SOURCES) \
|
|
|
|
$(NETWORK_CONF_SOURCES) \
|
2008-11-21 12:20:45 +00:00
|
|
|
$(STORAGE_CONF_SOURCES) \
|
2009-07-15 17:34:04 +00:00
|
|
|
$(INTERFACE_CONF_SOURCES) \
|
2009-09-01 15:27:46 +00:00
|
|
|
$(NODE_DEVICE_CONF_SOURCES) \
|
|
|
|
$(SECRET_CONF_SOURCES)
|
2008-11-21 12:20:45 +00:00
|
|
|
|
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_CFLAGS = $(NUMACTL_CFLAGS)
|
|
|
|
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
|
|
|
|
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) \
|
|
|
|
$(SASL_CFLAGS)
|
|
|
|
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)
|
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
|
2008-11-17 10:43:30 +00:00
|
|
|
libvirt_driver_xen_la_CFLAGS = $(XEN_CFLAGS)
|
|
|
|
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)
|
|
|
|
libvirt_driver_phyp_la_CFLAGS = $(LIBSSH2_CFLAGS)
|
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
|
|
|
|
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
|
|
|
|
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
|
2008-11-17 10:43:30 +00:00
|
|
|
libvirt_driver_qemu_la_CFLAGS = $(NUMACTL_CFLAGS)
|
|
|
|
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)
|
2008-08-20 20:48:35 +00:00
|
|
|
endif
|
|
|
|
|
|
|
|
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
|
|
|
|
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)
|
2008-08-20 20:48:35 +00:00
|
|
|
endif
|
|
|
|
|
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
|
|
|
|
libvirt_driver_uml_la_CFLAGS = $(NUMACTL_CFLAGS)
|
|
|
|
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
|
2009-09-10 13:21:10 +00:00
|
|
|
libvirt_driver_one_la_CFLAGS = $(XMLRPC_CFLAGS)
|
|
|
|
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
|
|
|
|
libvirt_driver_esx_la_CFLAGS = $(LIBCURL_CFLAGS)
|
|
|
|
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
|
|
|
|
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-05-20 14:26:49 +00:00
|
|
|
if WITH_NETCF
|
|
|
|
libvirt_driver_interface_la_LDFLAGS = $(NETCF_LIBS)
|
2009-07-21 14:02:16 +00:00
|
|
|
libvirt_driver_interface_la_CFLAGS = $(NETCF_CFLAGS)
|
|
|
|
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
|
|
|
|
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
|
|
|
|
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 =
|
2009-09-08 13:47:45 +00:00
|
|
|
libvirt_driver_storage_la_CFLAGS =
|
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
|
|
|
|
libvirt_driver_storage_la_LDFLAGS = -module -avoid-version
|
|
|
|
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)
|
|
|
|
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)
|
|
|
|
|
|
|
|
libvirt_driver_nodedev_la_CFLAGS =
|
|
|
|
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
|
2009-03-03 10:06:49 +00:00
|
|
|
if WITH_SECDRIVER_SELINUX
|
|
|
|
libvirt_driver_security_la_SOURCES += $(SECURITY_DRIVER_SELINUX_SOURCES)
|
|
|
|
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-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-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-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%) \
|
2008-11-18 12:46:13 +00:00
|
|
|
$(LIBXML_LIBS) $(SELINUX_LIBS) \
|
2008-11-21 12:16:08 +00:00
|
|
|
$(XEN_LIBS) $(DRIVER_MODULE_LIBS) \
|
2009-09-08 13:47:45 +00:00
|
|
|
$(DEVMAPPER_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)
|
|
|
|
|
2006-05-09 15:35:46 +00:00
|
|
|
bin_PROGRAMS = virsh
|
2005-11-10 16:12:31 +00:00
|
|
|
|
2008-08-20 20:48:35 +00:00
|
|
|
virsh_SOURCES = \
|
|
|
|
console.c console.h \
|
|
|
|
virsh.c
|
|
|
|
|
2007-05-29 14:44:15 +00:00
|
|
|
virsh_LDFLAGS = $(WARN_CFLAGS) $(COVERAGE_LDFLAGS)
|
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
|
|
|
virsh_LDADD = \
|
|
|
|
$(STATIC_BINARIES) \
|
2008-11-17 10:43:30 +00:00
|
|
|
$(WARN_CFLAGS) \
|
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
|
|
|
$(NUMACTL_LIBS) \
|
2008-11-17 10:43:30 +00:00
|
|
|
libvirt.la \
|
|
|
|
../gnulib/lib/libgnu.la \
|
|
|
|
$(VIRSH_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
|
|
|
virsh_CFLAGS = $(COVERAGE_CFLAGS) $(READLINE_CFLAGS) $(NUMACTL_CFLAGS)
|
2009-01-05 14:05:29 +00:00
|
|
|
BUILT_SOURCES = virsh-net-edit.c virsh-pool-edit.c libvirt.syms
|
2008-08-01 14:30:41 +00:00
|
|
|
|
|
|
|
virsh-net-edit.c: virsh.c Makefile.am
|
|
|
|
rm -f $@-tmp
|
|
|
|
echo '/* Automatically generated from: $^ */' > $@-tmp
|
|
|
|
echo 'static int' >> $@-tmp
|
|
|
|
awk '/^cmdEdit/, /^}/' $< \
|
|
|
|
| sed -e 's/domain/network/g' \
|
|
|
|
-e 's/Domain/Network/g' \
|
|
|
|
-e 's/cmdEdit/cmdNetworkEdit/g' \
|
|
|
|
-e 's/dom/network/g' \
|
2009-02-16 22:51:31 +00:00
|
|
|
-e 's/int flags.*/int flags = 0;/g' \
|
2008-08-01 14:30:41 +00:00
|
|
|
>> $@-tmp
|
|
|
|
chmod a-w $@-tmp
|
|
|
|
rm -f $@
|
|
|
|
mv $@-tmp $@
|
|
|
|
|
|
|
|
virsh-pool-edit.c: virsh.c Makefile.am
|
|
|
|
rm -f $@-tmp
|
|
|
|
echo '/* Automatically generated from: $^ */' > $@-tmp
|
|
|
|
echo 'static int' >> $@-tmp
|
|
|
|
awk '/^cmdEdit/, /^}/' $< \
|
|
|
|
| sed -e 's/domain/pool/g' \
|
|
|
|
-e 's/vshCommandOptDomain/vshCommandOptPool/g' \
|
|
|
|
-e 's/Domain %s/Pool %s/g' \
|
remove redundant optname arguments
This is the second part of the change mentioned here:
http://thread.gmane.org/gmane.comp.emulators.libvirt/10331
It removes the essentially redundant "optname" parameter
from each of the vshCommandOptNetworkBy and vshCommandOptDomainBy
functions as well as the correspond macros (without "By" suffix).
Now, instead of always passing the optname, "domain", to
vshCommandOptDomainBy, that function requires that its command
argument refer to an opts array containing a "domain" option.
This normalization makes one more help-related change:
it renames the net-start "name" argument to the more
sensible and consistent "network".
* src/virsh.c (VSH_BYNAME, vshCommandOptDomain)
(cmd_has_option): New function, used in vshCommandOptDomainBy
and vshCommandOptNetworkBy.
(vshCommandOptDomainBy, vshCommandOptNetworkBy): Remove the optname
parameter, it's always "domain" ("network"). Update all callers.
Call cmd_has_option.
(vshCommandOptNetwork, cmdAutostart, cmdConsole, cmdDomstate)
(cmdDomblkstat, cmdDomIfstat, cmdSuspend, cmdUndefine, cmdStart)
(cmdSave, cmdSchedinfo, cmdDump, cmdResume, cmdShutdown)
(cmdReboot, cmdDestroy, cmdDominfo, cmdVcpuinfo, cmdVcpupin)
(cmdSetvcpus, cmdSetmem, cmdSetmaxmem, cmdDumpXML, cmdDomname)
(cmdDomid, cmdDomuuid, cmdMigrate, cmdNetworkAutostart)
(cmdNetworkDestroy, cmdNetworkDumpXML, cmdNetworkName)
(opts_network_start, cmdNetworkStart, cmdNetworkUndefine)
(cmdNetworkUuid, cmdVNCDisplay, cmdTTYConsole, cmdAttachDevice)
(cmdDetachDevice, cmdAttachInterface, cmdDetachInterface)
(cmdAttachDisk, cmdDetachDisk, cmdEdit)
* src/Makefile.am (virsh-pool-edit.c): This code is generated
from cmdEdit, and cmdEdit uses the vshCommandOptDomain macro which
now, with the changes above, has only 3 (was 4) arguments, yet the
macro use is mapped to vshCommandOptPool, which still requires 4
arguments. So this change adjusts the sed code to reinsert the
just-removed argument -- we're not changing pool-related code right
now, because it's not as straight-forward.
2008-12-15 10:26:54 +00:00
|
|
|
-e 's/(ctl, cmd, NULL);/(ctl, cmd, "pool", NULL);/' \
|
2008-08-01 14:30:41 +00:00
|
|
|
-e 's/Domain/StoragePool/g' \
|
|
|
|
-e 's/cmdEdit/cmdPoolEdit/g' \
|
|
|
|
-e 's/\(virStoragePoolDefineXML.*\));/\1, 0);/' \
|
|
|
|
-e 's/dom/pool/g' \
|
2009-02-16 22:51:31 +00:00
|
|
|
-e 's/int flags.*/int flags = 0;/g' \
|
2008-08-01 14:30:41 +00:00
|
|
|
>> $@-tmp
|
|
|
|
chmod a-w $@-tmp
|
|
|
|
rm -f $@
|
|
|
|
mv $@-tmp $@
|
2005-11-10 16:12:31 +00:00
|
|
|
|
2008-10-15 18:39:34 +00:00
|
|
|
if WITH_WIN_ICON
|
|
|
|
virsh_LDADD += virsh_win_icon.$(OBJEXT)
|
|
|
|
|
|
|
|
# Before you edit virsh_win_icon.rc, please note the following
|
|
|
|
# limitations of the resource file format:
|
|
|
|
#
|
|
|
|
# (1) '..' is not permitted in the icon filename field.
|
|
|
|
# (2) '-' is not permitted in the icon filename field.
|
|
|
|
# (3) Comments are not permitted in the file.
|
|
|
|
#
|
|
|
|
# Windows appears to choose the first <= 32x32 icon it finds
|
|
|
|
# in the resource file. Therefore you should list the available
|
|
|
|
# icons from largest to smallest, and make sure that the 32x32
|
|
|
|
# icon is the most legible.
|
|
|
|
#
|
|
|
|
# Windows .ICO is a special MS-only format. GIMP and other
|
|
|
|
# tools can write it. However there are several variations,
|
|
|
|
# and Windows seems to do its own colour quantization. More
|
|
|
|
# information is needed in this area.
|
|
|
|
|
|
|
|
virsh_win_icon.$(OBJEXT): virsh_win_icon.rc
|
|
|
|
$(WINDRES) \
|
|
|
|
--input-format rc --input $< \
|
|
|
|
--output-format coff --output $@
|
|
|
|
endif
|
|
|
|
|
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) \
|
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
|
2009-06-29 17:00:52 +00:00
|
|
|
libvirt_lxc_CFLAGS = $(LIBPARTED_CFLAGS) $(NUMACTL_CFLAGS) $(CAPNG_CFLAGS)
|
2008-08-20 20:55:32 +00:00
|
|
|
endif
|
|
|
|
endif
|
|
|
|
EXTRA_DIST += $(LXC_CONTROLLER_SOURCES)
|
|
|
|
|
2008-06-10 10:43:28 +00:00
|
|
|
install-exec-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-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"
|
|
|
|
endif
|
|
|
|
|
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)
|