mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-08-27 19:11:16 +00:00
build: enforce makefile conditional style
Automake has builtin support to prevent botched conditional nesting, but only if you use: if FOO else !FOO endif !FOO An example error message when using the wrong name: daemon/Makefile.am:378: error: else reminder (LIBVIRT_INIT_SCRIPT_SYSTEMD_TRUE) incompatible with current conditional: LIBVIRT_INIT_SCRIPT_SYSTEMD_FALSE daemon/Makefile.am:381: error: endif reminder (LIBVIRT_INIT_SCRIPT_SYSTEMD_TRUE) incompatible with current conditional: LIBVIRT_INIT_SCRIPT_SYSTEMD_FALSE As our makefiles tend to have quite a bit of nested conditionals, it's better to take advantage of the benefits of the build system double-checking that our conditionals are well-nested, but that requires a syntax check to enforce our usage style. Alas, unlike C preprocessor and spec files, we can't use indentation to make it easier to see how deeply nesting goes. * cfg.mk (sc_makefile_conditionals): New rule. * daemon/Makefile.am: Enforce the style. * gnulib/tests/Makefile.am: Likewise. * python/Makefile.am: Likewise. * src/Makefile.am: Likewise. * tests/Makefile.am: Likewise. * tools/Makefile.am: Likewise. Signed-off-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
parent
d7d8fef4b9
commit
ec81852f46
8
cfg.mk
8
cfg.mk
@ -692,6 +692,14 @@ sc_spec_indentation:
|
|||||||
echo '$(ME): skipping test $@: cppi not installed' 1>&2; \
|
echo '$(ME): skipping test $@: cppi not installed' 1>&2; \
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Nested conditionals are easier to understand if we enforce that endifs
|
||||||
|
# can be paired back to the if
|
||||||
|
sc_makefile_conditionals:
|
||||||
|
@prohibit='(else|endif)($$| *#)' \
|
||||||
|
in_vc_files='Makefile\.am' \
|
||||||
|
halt='match "if FOO" with "endif FOO" in Makefiles' \
|
||||||
|
$(_sc_search_regexp)
|
||||||
|
|
||||||
# Long lines can be harder to diff; too long, and git send-email chokes.
|
# Long lines can be harder to diff; too long, and git send-email chokes.
|
||||||
# For now, only enforce line length on files where we have intentionally
|
# For now, only enforce line length on files where we have intentionally
|
||||||
# fixed things and don't want to regress.
|
# fixed things and don't want to regress.
|
||||||
|
@ -142,7 +142,7 @@ libvirtd_LDADD = \
|
|||||||
|
|
||||||
if WITH_DTRACE_PROBES
|
if WITH_DTRACE_PROBES
|
||||||
libvirtd_LDADD += ../src/libvirt_probes.lo
|
libvirtd_LDADD += ../src/libvirt_probes.lo
|
||||||
endif
|
endif WITH_DTRACE_PROBES
|
||||||
|
|
||||||
libvirtd_LDADD += \
|
libvirtd_LDADD += \
|
||||||
../src/libvirt-lxc.la \
|
../src/libvirt-lxc.la \
|
||||||
@ -153,53 +153,53 @@ if WITH_QEMU
|
|||||||
libvirtd_LDADD += ../src/libvirt_driver_qemu.la
|
libvirtd_LDADD += ../src/libvirt_driver_qemu.la
|
||||||
if WITH_DTRACE_PROBES
|
if WITH_DTRACE_PROBES
|
||||||
libvirtd_LDADD += ../src/libvirt_qemu_probes.lo
|
libvirtd_LDADD += ../src/libvirt_qemu_probes.lo
|
||||||
endif
|
endif WITH_DTRACE_PROBES
|
||||||
endif
|
endif WITH_QEMU
|
||||||
|
|
||||||
if WITH_LXC
|
if WITH_LXC
|
||||||
libvirtd_LDADD += ../src/libvirt_driver_lxc.la
|
libvirtd_LDADD += ../src/libvirt_driver_lxc.la
|
||||||
endif
|
endif WITH_LXC
|
||||||
|
|
||||||
if WITH_XEN
|
if WITH_XEN
|
||||||
libvirtd_LDADD += ../src/libvirt_driver_xen.la
|
libvirtd_LDADD += ../src/libvirt_driver_xen.la
|
||||||
endif
|
endif WITH_XEN
|
||||||
|
|
||||||
if WITH_LIBXL
|
if WITH_LIBXL
|
||||||
libvirtd_LDADD += ../src/libvirt_driver_libxl.la
|
libvirtd_LDADD += ../src/libvirt_driver_libxl.la
|
||||||
endif
|
endif WITH_LIBXL
|
||||||
|
|
||||||
if WITH_UML
|
if WITH_UML
|
||||||
libvirtd_LDADD += ../src/libvirt_driver_uml.la
|
libvirtd_LDADD += ../src/libvirt_driver_uml.la
|
||||||
endif
|
endif WITH_UML
|
||||||
|
|
||||||
if WITH_VBOX
|
if WITH_VBOX
|
||||||
libvirtd_LDADD += ../src/libvirt_driver_vbox.la
|
libvirtd_LDADD += ../src/libvirt_driver_vbox.la
|
||||||
endif
|
endif WITH_VBOX
|
||||||
|
|
||||||
if WITH_STORAGE
|
if WITH_STORAGE
|
||||||
libvirtd_LDADD += ../src/libvirt_driver_storage.la
|
libvirtd_LDADD += ../src/libvirt_driver_storage.la
|
||||||
endif
|
endif WITH_STORAGE
|
||||||
|
|
||||||
if WITH_NETWORK
|
if WITH_NETWORK
|
||||||
libvirtd_LDADD += ../src/libvirt_driver_network.la
|
libvirtd_LDADD += ../src/libvirt_driver_network.la
|
||||||
endif
|
endif WITH_NETWORK
|
||||||
|
|
||||||
if WITH_INTERFACE
|
if WITH_INTERFACE
|
||||||
libvirtd_LDADD += ../src/libvirt_driver_interface.la
|
libvirtd_LDADD += ../src/libvirt_driver_interface.la
|
||||||
endif
|
endif WITH_INTERFACE
|
||||||
|
|
||||||
if WITH_NODE_DEVICES
|
if WITH_NODE_DEVICES
|
||||||
libvirtd_LDADD += ../src/libvirt_driver_nodedev.la
|
libvirtd_LDADD += ../src/libvirt_driver_nodedev.la
|
||||||
endif
|
endif WITH_NODE_DEVICES
|
||||||
|
|
||||||
if WITH_SECRETS
|
if WITH_SECRETS
|
||||||
libvirtd_LDADD += ../src/libvirt_driver_secret.la
|
libvirtd_LDADD += ../src/libvirt_driver_secret.la
|
||||||
endif
|
endif WITH_SECRETS
|
||||||
|
|
||||||
if WITH_NWFILTER
|
if WITH_NWFILTER
|
||||||
libvirtd_LDADD += ../src/libvirt_driver_nwfilter.la
|
libvirtd_LDADD += ../src/libvirt_driver_nwfilter.la
|
||||||
endif
|
endif WITH_NWFILTER
|
||||||
endif
|
endif ! WITH_DRIVER_MODULES
|
||||||
|
|
||||||
libvirtd_LDADD += ../src/libvirt.la
|
libvirtd_LDADD += ../src/libvirt.la
|
||||||
|
|
||||||
@ -207,11 +207,11 @@ if WITH_POLKIT
|
|||||||
if WITH_POLKIT0
|
if WITH_POLKIT0
|
||||||
policydir = $(datadir)/PolicyKit/policy
|
policydir = $(datadir)/PolicyKit/policy
|
||||||
policyauth = auth_admin_keep_session
|
policyauth = auth_admin_keep_session
|
||||||
else
|
else ! WITH_POLKIT0
|
||||||
policydir = $(datadir)/polkit-1/actions
|
policydir = $(datadir)/polkit-1/actions
|
||||||
policyauth = auth_admin_keep
|
policyauth = auth_admin_keep
|
||||||
endif
|
endif ! WITH_POLKIT0
|
||||||
endif
|
endif WITH_POLKIT
|
||||||
|
|
||||||
libvirtd.policy: libvirtd.policy.in $(top_builddir)/config.status
|
libvirtd.policy: libvirtd.policy.in $(top_builddir)/config.status
|
||||||
$(AM_V_GEN) sed \
|
$(AM_V_GEN) sed \
|
||||||
@ -243,10 +243,10 @@ install-data-polkit::
|
|||||||
uninstall-data-polkit::
|
uninstall-data-polkit::
|
||||||
rm -f $(DESTDIR)$(policydir)/org.libvirt.unix.policy
|
rm -f $(DESTDIR)$(policydir)/org.libvirt.unix.policy
|
||||||
rmdir $(DESTDIR)$(policydir) || :
|
rmdir $(DESTDIR)$(policydir) || :
|
||||||
else
|
else ! WITH_POLKIT
|
||||||
install-data-polkit::
|
install-data-polkit::
|
||||||
uninstall-data-polkit::
|
uninstall-data-polkit::
|
||||||
endif
|
endif ! WITH_POLKIT
|
||||||
|
|
||||||
remote.c: $(DAEMON_GENERATED)
|
remote.c: $(DAEMON_GENERATED)
|
||||||
remote.h: $(DAEMON_GENERATED)
|
remote.h: $(DAEMON_GENERATED)
|
||||||
@ -323,10 +323,10 @@ install-sysctl:
|
|||||||
uninstall-sysctl:
|
uninstall-sysctl:
|
||||||
rm -f $(DESTDIR)$(prefix)/lib/sysctl.d/libvirtd.conf
|
rm -f $(DESTDIR)$(prefix)/lib/sysctl.d/libvirtd.conf
|
||||||
rmdir $(DESTDIR)$(prefix)/lib/sysctl.d || :
|
rmdir $(DESTDIR)$(prefix)/lib/sysctl.d || :
|
||||||
else
|
else ! WITH_SYSCTL
|
||||||
install-sysctl:
|
install-sysctl:
|
||||||
uninstall-sysctl:
|
uninstall-sysctl:
|
||||||
endif
|
endif ! WITH_SYSCTL
|
||||||
|
|
||||||
if LIBVIRT_INIT_SCRIPT_RED_HAT
|
if LIBVIRT_INIT_SCRIPT_RED_HAT
|
||||||
|
|
||||||
@ -340,10 +340,10 @@ install-init-redhat: install-sysconfig libvirtd.init
|
|||||||
uninstall-init-redhat: uninstall-sysconfig
|
uninstall-init-redhat: uninstall-sysconfig
|
||||||
rm -f $(DESTDIR)$(sysconfdir)/rc.d/init.d/libvirtd
|
rm -f $(DESTDIR)$(sysconfdir)/rc.d/init.d/libvirtd
|
||||||
rmdir $(DESTDIR)$(sysconfdir)/rc.d/init.d || :
|
rmdir $(DESTDIR)$(sysconfdir)/rc.d/init.d || :
|
||||||
else
|
else ! LIBVIRT_INIT_SCRIPT_RED_HAT
|
||||||
install-init-redhat:
|
install-init-redhat:
|
||||||
uninstall-init-redhat:
|
uninstall-init-redhat:
|
||||||
endif # LIBVIRT_INIT_SCRIPT_RED_HAT
|
endif ! LIBVIRT_INIT_SCRIPT_RED_HAT
|
||||||
|
|
||||||
|
|
||||||
if LIBVIRT_INIT_SCRIPT_UPSTART
|
if LIBVIRT_INIT_SCRIPT_UPSTART
|
||||||
@ -356,10 +356,10 @@ install-init-upstart: install-sysconfig
|
|||||||
uninstall-init-upstart: uninstall-sysconfig
|
uninstall-init-upstart: uninstall-sysconfig
|
||||||
rm -f $(DESTDIR)$(sysconfdir)/event.d/libvirtd
|
rm -f $(DESTDIR)$(sysconfdir)/event.d/libvirtd
|
||||||
rmdir $(DESTDIR)$(sysconfdir)/event.d || :
|
rmdir $(DESTDIR)$(sysconfdir)/event.d || :
|
||||||
else
|
else ! LIBVIRT_INIT_SCRIPT_UPSTART
|
||||||
install-init-upstart:
|
install-init-upstart:
|
||||||
uninstall-init-upstart:
|
uninstall-init-upstart:
|
||||||
endif # LIBVIRT_INIT_SCRIPT_UPSTART
|
endif ! LIBVIRT_INIT_SCRIPT_UPSTART
|
||||||
|
|
||||||
|
|
||||||
if LIBVIRT_INIT_SCRIPT_SYSTEMD
|
if LIBVIRT_INIT_SCRIPT_SYSTEMD
|
||||||
@ -375,10 +375,10 @@ install-init-systemd: install-sysconfig libvirtd.service
|
|||||||
uninstall-init-systemd: uninstall-sysconfig
|
uninstall-init-systemd: uninstall-sysconfig
|
||||||
rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirtd.service
|
rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirtd.service
|
||||||
rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) || :
|
rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) || :
|
||||||
else
|
else ! LIBVIRT_INIT_SCRIPT_SYSTEMD
|
||||||
install-init-systemd:
|
install-init-systemd:
|
||||||
uninstall-init-systemd:
|
uninstall-init-systemd:
|
||||||
endif # LIBVIRT_INIT_SCRIPT_SYSTEMD
|
endif ! LIBVIRT_INIT_SCRIPT_SYSTEMD
|
||||||
|
|
||||||
libvirtd.init: libvirtd.init.in $(top_builddir)/config.status
|
libvirtd.init: libvirtd.init.in $(top_builddir)/config.status
|
||||||
$(AM_V_GEN)sed \
|
$(AM_V_GEN)sed \
|
||||||
@ -415,10 +415,10 @@ check-augeas: test_libvirtd.aug
|
|||||||
# are used by nearly every other library.
|
# are used by nearly every other library.
|
||||||
libvirtd_LDADD += ../gnulib/lib/libgnu.la $(LIBSOCKET)
|
libvirtd_LDADD += ../gnulib/lib/libgnu.la $(LIBSOCKET)
|
||||||
|
|
||||||
else # WITH_LIBVIRTD
|
else ! WITH_LIBVIRTD
|
||||||
install-data-local: install-data-sasl
|
install-data-local: install-data-sasl
|
||||||
uninstall-local:: uninstall-data-sasl
|
uninstall-local:: uninstall-data-sasl
|
||||||
endif # WITH_LIBVIRTD
|
endif ! WITH_LIBVIRTD
|
||||||
|
|
||||||
POD2MAN = pod2man -c "Virtualization Support" \
|
POD2MAN = pod2man -c "Virtualization Support" \
|
||||||
-r "$(PACKAGE)-$(VERSION)" -s 8
|
-r "$(PACKAGE)-$(VERSION)" -s 8
|
||||||
@ -438,10 +438,10 @@ install-data-sasl:
|
|||||||
uninstall-data-sasl:
|
uninstall-data-sasl:
|
||||||
rm -f $(DESTDIR)$(sysconfdir)/sasl2/libvirt.conf
|
rm -f $(DESTDIR)$(sysconfdir)/sasl2/libvirt.conf
|
||||||
rmdir $(DESTDIR)$(sysconfdir)/sasl2/ || :
|
rmdir $(DESTDIR)$(sysconfdir)/sasl2/ || :
|
||||||
else
|
else ! WITH_SASL
|
||||||
install-data-sasl:
|
install-data-sasl:
|
||||||
uninstall-data-sasl:
|
uninstall-data-sasl:
|
||||||
endif
|
endif ! WITH_SASL
|
||||||
|
|
||||||
|
|
||||||
CLEANFILES += $(BUILT_SOURCES) $(man8_MANS)
|
CLEANFILES += $(BUILT_SOURCES) $(man8_MANS)
|
||||||
|
@ -26,7 +26,7 @@ if WITH_EXPENSIVE_TESTS
|
|||||||
## Automake requires that at least one conditional call out all tests to
|
## Automake requires that at least one conditional call out all tests to
|
||||||
## be run, for those tests to be shipped in the tarball
|
## be run, for those tests to be shipped in the tarball
|
||||||
TESTS = $(GNULIB_TESTS)
|
TESTS = $(GNULIB_TESTS)
|
||||||
endif
|
endif WITH_EXPENSIVE_TESTS
|
||||||
## However, we want to change the set of tests based on the make environment,
|
## However, we want to change the set of tests based on the make environment,
|
||||||
## where the default was set at configure time. Use GNU make constructs to
|
## where the default was set at configure time. Use GNU make constructs to
|
||||||
## hide our actions from Automake, so we don't get it too confused.
|
## hide our actions from Automake, so we don't get it too confused.
|
||||||
|
@ -162,9 +162,9 @@ uninstall-local:
|
|||||||
CLEANFILES= $(GENERATED) $(QEMU_GENERATED) $(LXC_GENERATED) $(GENERATE).stamp \
|
CLEANFILES= $(GENERATED) $(QEMU_GENERATED) $(LXC_GENERATED) $(GENERATE).stamp \
|
||||||
*.pyc
|
*.pyc
|
||||||
|
|
||||||
else
|
else ! WITH_PYTHON
|
||||||
all:
|
all:
|
||||||
endif
|
endif ! WITH_PYTHON
|
||||||
|
|
||||||
dummy:
|
dummy:
|
||||||
|
|
||||||
|
326
src/Makefile.am
326
src/Makefile.am
@ -51,14 +51,14 @@ THREAD_LIBS = $(LIB_PTHREAD) $(LTLIBMULTITHREAD)
|
|||||||
SECDRIVER_LIBS =
|
SECDRIVER_LIBS =
|
||||||
if WITH_SECDRIVER_SELINUX
|
if WITH_SECDRIVER_SELINUX
|
||||||
SECDRIVER_LIBS += $(SELINUX_LIBS)
|
SECDRIVER_LIBS += $(SELINUX_LIBS)
|
||||||
endif
|
endif WITH_SECDRIVER_SELINUX
|
||||||
if WITH_SECDRIVER_APPARMOR
|
if WITH_SECDRIVER_APPARMOR
|
||||||
SECDRIVER_LIBS += $(APPARMOR_LIBS)
|
SECDRIVER_LIBS += $(APPARMOR_LIBS)
|
||||||
endif
|
endif WITH_SECDRIVER_APPARMOR
|
||||||
|
|
||||||
if WITH_NETWORK
|
if WITH_NETWORK
|
||||||
UUID=$(shell uuidgen 2>/dev/null)
|
UUID=$(shell uuidgen 2>/dev/null)
|
||||||
endif
|
endif WITH_NETWORK
|
||||||
|
|
||||||
lib_LTLIBRARIES = libvirt.la libvirt-qemu.la libvirt-lxc.la
|
lib_LTLIBRARIES = libvirt.la libvirt-qemu.la libvirt-lxc.la
|
||||||
|
|
||||||
@ -414,9 +414,9 @@ if WITH_LINUX
|
|||||||
check-symfile: libvirt.syms libvirt.la
|
check-symfile: libvirt.syms libvirt.la
|
||||||
$(AM_V_GEN)$(PERL) $(srcdir)/check-symfile.pl libvirt.syms \
|
$(AM_V_GEN)$(PERL) $(srcdir)/check-symfile.pl libvirt.syms \
|
||||||
.libs/libvirt.so
|
.libs/libvirt.so
|
||||||
else
|
else ! WITH_LINUX
|
||||||
check-symfile:
|
check-symfile:
|
||||||
endif
|
endif ! WITH_LINUX
|
||||||
check-symsorting:
|
check-symsorting:
|
||||||
$(AM_V_GEN)$(PERL) $(srcdir)/check-symsorting.pl \
|
$(AM_V_GEN)$(PERL) $(srcdir)/check-symsorting.pl \
|
||||||
$(srcdir) $(SYM_FILES)
|
$(srcdir) $(SYM_FILES)
|
||||||
@ -445,7 +445,7 @@ else !WITH_REMOTE
|
|||||||
# The $(PROTOCOL_STRUCTS) files must live in git, because they cannot be
|
# The $(PROTOCOL_STRUCTS) files must live in git, because they cannot be
|
||||||
# re-generated when configured --without-remote.
|
# re-generated when configured --without-remote.
|
||||||
check-protocol:
|
check-protocol:
|
||||||
endif
|
endif !WITH_REMOTE
|
||||||
EXTRA_DIST += $(PROTOCOL_STRUCTS)
|
EXTRA_DIST += $(PROTOCOL_STRUCTS)
|
||||||
|
|
||||||
check-drivername:
|
check-drivername:
|
||||||
@ -531,7 +531,7 @@ XEN_DRIVER_SOURCES = \
|
|||||||
xen/xs_internal.c xen/xs_internal.h
|
xen/xs_internal.c xen/xs_internal.h
|
||||||
if WITH_XEN_INOTIFY
|
if WITH_XEN_INOTIFY
|
||||||
XEN_DRIVER_SOURCES += xen/xen_inotify.c xen/xen_inotify.h
|
XEN_DRIVER_SOURCES += xen/xen_inotify.c xen/xen_inotify.h
|
||||||
endif
|
endif WITH_XEN_INOTIFY
|
||||||
|
|
||||||
LXC_MONITOR_PROTOCOL_GENERATED = \
|
LXC_MONITOR_PROTOCOL_GENERATED = \
|
||||||
$(srcdir)/lxc/lxc_monitor_protocol.h \
|
$(srcdir)/lxc/lxc_monitor_protocol.h \
|
||||||
@ -750,12 +750,12 @@ INTERFACE_DRIVER_SOURCES += \
|
|||||||
if WITH_NETCF
|
if WITH_NETCF
|
||||||
INTERFACE_DRIVER_SOURCES += \
|
INTERFACE_DRIVER_SOURCES += \
|
||||||
interface/interface_backend_netcf.c
|
interface/interface_backend_netcf.c
|
||||||
endif
|
endif WITH_NETCF
|
||||||
if WITH_UDEV
|
if WITH_UDEV
|
||||||
INTERFACE_DRIVER_SOURCES += \
|
INTERFACE_DRIVER_SOURCES += \
|
||||||
interface/interface_backend_udev.c
|
interface/interface_backend_udev.c
|
||||||
endif
|
endif WITH_UDEV
|
||||||
endif
|
endif WITH_INTERFACE
|
||||||
|
|
||||||
SECRET_DRIVER_SOURCES = \
|
SECRET_DRIVER_SOURCES = \
|
||||||
secret/secret_driver.h secret/secret_driver.c
|
secret/secret_driver.h secret/secret_driver.c
|
||||||
@ -928,7 +928,7 @@ libvirt_la_BUILT_LIBADD += libvirt_vmx.la
|
|||||||
libvirt_vmx_la_CFLAGS = \
|
libvirt_vmx_la_CFLAGS = \
|
||||||
-I$(top_srcdir)/src/conf $(AM_CFLAGS)
|
-I$(top_srcdir)/src/conf $(AM_CFLAGS)
|
||||||
libvirt_vmx_la_SOURCES = $(VMX_SOURCES)
|
libvirt_vmx_la_SOURCES = $(VMX_SOURCES)
|
||||||
endif
|
endif WITH_VMX
|
||||||
|
|
||||||
if WITH_XENXS
|
if WITH_XENXS
|
||||||
noinst_LTLIBRARIES += libvirt_xenxs.la
|
noinst_LTLIBRARIES += libvirt_xenxs.la
|
||||||
@ -936,7 +936,7 @@ libvirt_la_BUILT_LIBADD += libvirt_xenxs.la
|
|||||||
libvirt_xenxs_la_CFLAGS = \
|
libvirt_xenxs_la_CFLAGS = \
|
||||||
-I$(top_srcdir)/src/conf $(AM_CFLAGS)
|
-I$(top_srcdir)/src/conf $(AM_CFLAGS)
|
||||||
libvirt_xenxs_la_SOURCES = $(XENXS_SOURCES)
|
libvirt_xenxs_la_SOURCES = $(XENXS_SOURCES)
|
||||||
endif
|
endif WITH_XENXS
|
||||||
|
|
||||||
|
|
||||||
noinst_LTLIBRARIES += libvirt_driver.la
|
noinst_LTLIBRARIES += libvirt_driver.la
|
||||||
@ -964,7 +964,7 @@ libvirt_la_BUILT_LIBADD += libvirt_driver_test.la
|
|||||||
libvirt_driver_test_la_CFLAGS = \
|
libvirt_driver_test_la_CFLAGS = \
|
||||||
-I$(top_srcdir)/src/conf $(AM_CFLAGS)
|
-I$(top_srcdir)/src/conf $(AM_CFLAGS)
|
||||||
libvirt_driver_test_la_SOURCES = $(TEST_DRIVER_SOURCES)
|
libvirt_driver_test_la_SOURCES = $(TEST_DRIVER_SOURCES)
|
||||||
endif
|
endif WITH_TEST
|
||||||
|
|
||||||
if WITH_REMOTE
|
if WITH_REMOTE
|
||||||
noinst_LTLIBRARIES += libvirt_driver_remote.la
|
noinst_LTLIBRARIES += libvirt_driver_remote.la
|
||||||
@ -1002,11 +1002,11 @@ if WITH_DRIVER_MODULES
|
|||||||
mod_LTLIBRARIES += libvirt_driver_xen.la
|
mod_LTLIBRARIES += libvirt_driver_xen.la
|
||||||
libvirt_driver_xen_la_LIBADD += ../gnulib/lib/libgnu.la
|
libvirt_driver_xen_la_LIBADD += ../gnulib/lib/libgnu.la
|
||||||
libvirt_driver_xen_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS)
|
libvirt_driver_xen_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS)
|
||||||
else
|
else ! WITH_DRIVER_MODULES
|
||||||
noinst_LTLIBRARIES += libvirt_driver_xen.la
|
noinst_LTLIBRARIES += libvirt_driver_xen.la
|
||||||
# Stateful, so linked to daemon instead
|
# Stateful, so linked to daemon instead
|
||||||
#libvirt_la_BUILT_LIBADD += libvirt_driver_xen.la
|
#libvirt_la_BUILT_LIBADD += libvirt_driver_xen.la
|
||||||
endif
|
endif ! WITH_DRIVER_MODULES
|
||||||
|
|
||||||
libvirt_driver_xen_impl_la_CFLAGS = \
|
libvirt_driver_xen_impl_la_CFLAGS = \
|
||||||
$(XEN_CFLAGS) \
|
$(XEN_CFLAGS) \
|
||||||
@ -1017,7 +1017,7 @@ libvirt_driver_xen_impl_la_CFLAGS = \
|
|||||||
libvirt_driver_xen_impl_la_LDFLAGS = $(AM_LDFLAGS)
|
libvirt_driver_xen_impl_la_LDFLAGS = $(AM_LDFLAGS)
|
||||||
libvirt_driver_xen_impl_la_LIBADD = $(XEN_LIBS)
|
libvirt_driver_xen_impl_la_LIBADD = $(XEN_LIBS)
|
||||||
libvirt_driver_xen_impl_la_SOURCES = $(XEN_DRIVER_SOURCES)
|
libvirt_driver_xen_impl_la_SOURCES = $(XEN_DRIVER_SOURCES)
|
||||||
endif
|
endif WITH_XEN
|
||||||
|
|
||||||
if WITH_PHYP
|
if WITH_PHYP
|
||||||
noinst_LTLIBRARIES += libvirt_driver_phyp.la
|
noinst_LTLIBRARIES += libvirt_driver_phyp.la
|
||||||
@ -1026,7 +1026,7 @@ libvirt_driver_phyp_la_LIBADD = $(SSH2_LIBS)
|
|||||||
libvirt_driver_phyp_la_CFLAGS = $(SSH2_CFLAGS) \
|
libvirt_driver_phyp_la_CFLAGS = $(SSH2_CFLAGS) \
|
||||||
-I$(top_srcdir)/src/conf $(AM_CFLAGS)
|
-I$(top_srcdir)/src/conf $(AM_CFLAGS)
|
||||||
libvirt_driver_phyp_la_SOURCES = $(PHYP_DRIVER_SOURCES)
|
libvirt_driver_phyp_la_SOURCES = $(PHYP_DRIVER_SOURCES)
|
||||||
endif
|
endif WITH_PHYP
|
||||||
|
|
||||||
if WITH_OPENVZ
|
if WITH_OPENVZ
|
||||||
noinst_LTLIBRARIES += libvirt_driver_openvz.la
|
noinst_LTLIBRARIES += libvirt_driver_openvz.la
|
||||||
@ -1034,7 +1034,7 @@ libvirt_la_BUILT_LIBADD += libvirt_driver_openvz.la
|
|||||||
libvirt_driver_openvz_la_CFLAGS = \
|
libvirt_driver_openvz_la_CFLAGS = \
|
||||||
-I$(top_srcdir)/src/conf $(AM_CFLAGS)
|
-I$(top_srcdir)/src/conf $(AM_CFLAGS)
|
||||||
libvirt_driver_openvz_la_SOURCES = $(OPENVZ_DRIVER_SOURCES)
|
libvirt_driver_openvz_la_SOURCES = $(OPENVZ_DRIVER_SOURCES)
|
||||||
endif
|
endif WITH_OPENVZ
|
||||||
|
|
||||||
if WITH_VMWARE
|
if WITH_VMWARE
|
||||||
noinst_LTLIBRARIES += libvirt_driver_vmware.la
|
noinst_LTLIBRARIES += libvirt_driver_vmware.la
|
||||||
@ -1042,7 +1042,7 @@ libvirt_la_BUILT_LIBADD += libvirt_driver_vmware.la
|
|||||||
libvirt_driver_vmware_la_CFLAGS = \
|
libvirt_driver_vmware_la_CFLAGS = \
|
||||||
-I$(top_srcdir)/src/conf -I$(top_srcdir)/src/vmx $(AM_CFLAGS)
|
-I$(top_srcdir)/src/conf -I$(top_srcdir)/src/vmx $(AM_CFLAGS)
|
||||||
libvirt_driver_vmware_la_SOURCES = $(VMWARE_DRIVER_SOURCES)
|
libvirt_driver_vmware_la_SOURCES = $(VMWARE_DRIVER_SOURCES)
|
||||||
endif
|
endif WITH_VMWARE
|
||||||
|
|
||||||
if WITH_VBOX
|
if WITH_VBOX
|
||||||
noinst_LTLIBRARIES += libvirt_driver_vbox_impl.la
|
noinst_LTLIBRARIES += libvirt_driver_vbox_impl.la
|
||||||
@ -1052,12 +1052,12 @@ if WITH_DRIVER_MODULES
|
|||||||
mod_LTLIBRARIES += libvirt_driver_vbox.la
|
mod_LTLIBRARIES += libvirt_driver_vbox.la
|
||||||
libvirt_driver_vbox_la_LIBADD += ../gnulib/lib/libgnu.la
|
libvirt_driver_vbox_la_LIBADD += ../gnulib/lib/libgnu.la
|
||||||
libvirt_driver_vbox_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS)
|
libvirt_driver_vbox_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS)
|
||||||
else
|
else ! WITH_DRIVER_MODULES
|
||||||
noinst_LTLIBRARIES += libvirt_driver_vbox.la
|
noinst_LTLIBRARIES += libvirt_driver_vbox.la
|
||||||
# GPLv2-only license requries that it be linked into
|
# GPLv2-only license requries that it be linked into
|
||||||
# libvirtd and *not* libvirt.so
|
# libvirtd and *not* libvirt.so
|
||||||
#libvirt_la_BUILT_LIBADD += libvirt_driver_vbox.la
|
#libvirt_la_BUILT_LIBADD += libvirt_driver_vbox.la
|
||||||
endif
|
endif ! WITH_DRIVER_MODULES
|
||||||
|
|
||||||
libvirt_driver_vbox_impl_la_CFLAGS = \
|
libvirt_driver_vbox_impl_la_CFLAGS = \
|
||||||
-I$(top_srcdir)/src/conf \
|
-I$(top_srcdir)/src/conf \
|
||||||
@ -1065,7 +1065,7 @@ libvirt_driver_vbox_impl_la_CFLAGS = \
|
|||||||
libvirt_driver_vbox_impl_la_LDFLAGS = $(AM_LDFLAGS)
|
libvirt_driver_vbox_impl_la_LDFLAGS = $(AM_LDFLAGS)
|
||||||
libvirt_driver_vbox_impl_la_LIBADD = $(DLOPEN_LIBS) $(MSCOM_LIBS)
|
libvirt_driver_vbox_impl_la_LIBADD = $(DLOPEN_LIBS) $(MSCOM_LIBS)
|
||||||
libvirt_driver_vbox_impl_la_SOURCES = $(VBOX_DRIVER_SOURCES)
|
libvirt_driver_vbox_impl_la_SOURCES = $(VBOX_DRIVER_SOURCES)
|
||||||
endif
|
endif WITH_VBOX
|
||||||
|
|
||||||
if WITH_XENAPI
|
if WITH_XENAPI
|
||||||
noinst_LTLIBRARIES += libvirt_driver_xenapi.la
|
noinst_LTLIBRARIES += libvirt_driver_xenapi.la
|
||||||
@ -1075,7 +1075,7 @@ libvirt_driver_xenapi_la_CFLAGS = $(LIBXENSERVER_CFLAGS) $(CURL_CFLAGS) \
|
|||||||
libvirt_driver_xenapi_la_LDFLAGS = $(AM_LDFLAGS)
|
libvirt_driver_xenapi_la_LDFLAGS = $(AM_LDFLAGS)
|
||||||
libvirt_driver_xenapi_la_LIBADD = $(LIBXENSERVER_LIBS) $(CURL_LIBS)
|
libvirt_driver_xenapi_la_LIBADD = $(LIBXENSERVER_LIBS) $(CURL_LIBS)
|
||||||
libvirt_driver_xenapi_la_SOURCES = $(XENAPI_DRIVER_SOURCES)
|
libvirt_driver_xenapi_la_SOURCES = $(XENAPI_DRIVER_SOURCES)
|
||||||
endif
|
endif WITH_XENAPI
|
||||||
|
|
||||||
if WITH_LIBXL
|
if WITH_LIBXL
|
||||||
noinst_LTLIBRARIES += libvirt_driver_libxl_impl.la
|
noinst_LTLIBRARIES += libvirt_driver_libxl_impl.la
|
||||||
@ -1085,11 +1085,11 @@ if WITH_DRIVER_MODULES
|
|||||||
mod_LTLIBRARIES += libvirt_driver_libxl.la
|
mod_LTLIBRARIES += libvirt_driver_libxl.la
|
||||||
libvirt_driver_libxl_la_LIBADD += ../gnulib/lib/libgnu.la
|
libvirt_driver_libxl_la_LIBADD += ../gnulib/lib/libgnu.la
|
||||||
libvirt_driver_libxl_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS)
|
libvirt_driver_libxl_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS)
|
||||||
else
|
else ! WITH_DRIVER_MODULES
|
||||||
noinst_LTLIBRARIES += libvirt_driver_libxl.la
|
noinst_LTLIBRARIES += libvirt_driver_libxl.la
|
||||||
# Stateful, so linked to daemon instead
|
# Stateful, so linked to daemon instead
|
||||||
#libvirt_la_BUILT_LIBADD += libvirt_driver_libxl.la
|
#libvirt_la_BUILT_LIBADD += libvirt_driver_libxl.la
|
||||||
endif
|
endif ! WITH_DRIVER_MODULES
|
||||||
|
|
||||||
libvirt_driver_libxl_impl_la_CFLAGS = \
|
libvirt_driver_libxl_impl_la_CFLAGS = \
|
||||||
$(LIBXL_CFLAGS) \
|
$(LIBXL_CFLAGS) \
|
||||||
@ -1100,7 +1100,7 @@ libvirt_driver_libxl_impl_la_CFLAGS = \
|
|||||||
libvirt_driver_libxl_impl_la_LDFLAGS = $(AM_LDFLAGS)
|
libvirt_driver_libxl_impl_la_LDFLAGS = $(AM_LDFLAGS)
|
||||||
libvirt_driver_libxl_impl_la_LIBADD = $(LIBXL_LIBS) libvirt_xenxs.la
|
libvirt_driver_libxl_impl_la_LIBADD = $(LIBXL_LIBS) libvirt_xenxs.la
|
||||||
libvirt_driver_libxl_impl_la_SOURCES = $(LIBXL_DRIVER_SOURCES)
|
libvirt_driver_libxl_impl_la_SOURCES = $(LIBXL_DRIVER_SOURCES)
|
||||||
endif
|
endif WITH_LIBXL
|
||||||
|
|
||||||
if WITH_QEMU
|
if WITH_QEMU
|
||||||
noinst_LTLIBRARIES += libvirt_driver_qemu_impl.la
|
noinst_LTLIBRARIES += libvirt_driver_qemu_impl.la
|
||||||
@ -1110,11 +1110,11 @@ if WITH_DRIVER_MODULES
|
|||||||
mod_LTLIBRARIES += libvirt_driver_qemu.la
|
mod_LTLIBRARIES += libvirt_driver_qemu.la
|
||||||
libvirt_driver_qemu_la_LIBADD += ../gnulib/lib/libgnu.la
|
libvirt_driver_qemu_la_LIBADD += ../gnulib/lib/libgnu.la
|
||||||
libvirt_driver_qemu_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS)
|
libvirt_driver_qemu_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS)
|
||||||
else
|
else ! WITH_DRIVER_MODULES
|
||||||
noinst_LTLIBRARIES += libvirt_driver_qemu.la
|
noinst_LTLIBRARIES += libvirt_driver_qemu.la
|
||||||
# Stateful, so linked to daemon instead
|
# Stateful, so linked to daemon instead
|
||||||
#libvirt_la_BUILT_LIBADD += libvirt_driver_qemu.la
|
#libvirt_la_BUILT_LIBADD += libvirt_driver_qemu.la
|
||||||
endif
|
endif ! WITH_DRIVER_MODULES
|
||||||
|
|
||||||
libvirt_driver_qemu_impl_la_CFLAGS = \
|
libvirt_driver_qemu_impl_la_CFLAGS = \
|
||||||
$(GNUTLS_CFLAGS) \
|
$(GNUTLS_CFLAGS) \
|
||||||
@ -1136,7 +1136,7 @@ augeas_DATA += qemu/libvirtd_qemu.aug
|
|||||||
augeastest_DATA += test_libvirtd_qemu.aug
|
augeastest_DATA += test_libvirtd_qemu.aug
|
||||||
CLEANFILES += test_libvirtd_qemu.aug
|
CLEANFILES += test_libvirtd_qemu.aug
|
||||||
|
|
||||||
endif
|
endif WITH_QEMU
|
||||||
EXTRA_DIST += qemu/qemu.conf qemu/libvirtd_qemu.aug \
|
EXTRA_DIST += qemu/qemu.conf qemu/libvirtd_qemu.aug \
|
||||||
qemu/test_libvirtd_qemu.aug.in qemu/THREADS.txt
|
qemu/test_libvirtd_qemu.aug.in qemu/THREADS.txt
|
||||||
|
|
||||||
@ -1149,11 +1149,11 @@ if WITH_DRIVER_MODULES
|
|||||||
mod_LTLIBRARIES += libvirt_driver_lxc.la
|
mod_LTLIBRARIES += libvirt_driver_lxc.la
|
||||||
libvirt_driver_lxc_la_LIBADD += ../gnulib/lib/libgnu.la
|
libvirt_driver_lxc_la_LIBADD += ../gnulib/lib/libgnu.la
|
||||||
libvirt_driver_lxc_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS)
|
libvirt_driver_lxc_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS)
|
||||||
else
|
else ! WITH_DRIVER_MODULES
|
||||||
noinst_LTLIBRARIES += libvirt_driver_lxc.la
|
noinst_LTLIBRARIES += libvirt_driver_lxc.la
|
||||||
# Stateful, so linked to daemon instead
|
# Stateful, so linked to daemon instead
|
||||||
#libvirt_la_BUILT_LIBADD += libvirt_driver_lxc.la
|
#libvirt_la_BUILT_LIBADD += libvirt_driver_lxc.la
|
||||||
endif
|
endif ! WITH_DRIVER_MODULES
|
||||||
|
|
||||||
libvirt_driver_lxc_impl_la_CFLAGS = \
|
libvirt_driver_lxc_impl_la_CFLAGS = \
|
||||||
$(LIBNL_CFLAGS) \
|
$(LIBNL_CFLAGS) \
|
||||||
@ -1165,7 +1165,7 @@ libvirt_driver_lxc_impl_la_LIBADD = $(CAPNG_LIBS) $(LIBNL_LIBS) $(FUSE_LIBS)
|
|||||||
if WITH_BLKID
|
if WITH_BLKID
|
||||||
libvirt_driver_lxc_impl_la_CFLAGS += $(BLKID_CFLAGS)
|
libvirt_driver_lxc_impl_la_CFLAGS += $(BLKID_CFLAGS)
|
||||||
libvirt_driver_lxc_impl_la_LIBADD += $(BLKID_LIBS)
|
libvirt_driver_lxc_impl_la_LIBADD += $(BLKID_LIBS)
|
||||||
endif
|
endif WITH_BLKID
|
||||||
libvirt_driver_lxc_impl_la_LIBADD += $(SECDRIVER_LIBS)
|
libvirt_driver_lxc_impl_la_LIBADD += $(SECDRIVER_LIBS)
|
||||||
libvirt_driver_lxc_impl_la_SOURCES = $(LXC_DRIVER_SOURCES)
|
libvirt_driver_lxc_impl_la_SOURCES = $(LXC_DRIVER_SOURCES)
|
||||||
|
|
||||||
@ -1175,7 +1175,7 @@ augeas_DATA += lxc/libvirtd_lxc.aug
|
|||||||
augeastest_DATA += test_libvirtd_lxc.aug
|
augeastest_DATA += test_libvirtd_lxc.aug
|
||||||
CLEANFILES += test_libvirtd_lxc.aug
|
CLEANFILES += test_libvirtd_lxc.aug
|
||||||
|
|
||||||
endif
|
endif WITH_LXC
|
||||||
EXTRA_DIST += lxc/lxc.conf lxc/libvirtd_lxc.aug lxc/test_libvirtd_lxc.aug.in
|
EXTRA_DIST += lxc/lxc.conf lxc/libvirtd_lxc.aug lxc/test_libvirtd_lxc.aug.in
|
||||||
|
|
||||||
if WITH_UML
|
if WITH_UML
|
||||||
@ -1186,11 +1186,11 @@ if WITH_DRIVER_MODULES
|
|||||||
mod_LTLIBRARIES += libvirt_driver_uml.la
|
mod_LTLIBRARIES += libvirt_driver_uml.la
|
||||||
libvirt_driver_uml_la_LIBADD += ../gnulib/lib/libgnu.la
|
libvirt_driver_uml_la_LIBADD += ../gnulib/lib/libgnu.la
|
||||||
libvirt_driver_uml_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS)
|
libvirt_driver_uml_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS)
|
||||||
else
|
else ! WITH_DRIVER_MODULES
|
||||||
noinst_LTLIBRARIES += libvirt_driver_uml.la
|
noinst_LTLIBRARIES += libvirt_driver_uml.la
|
||||||
# Stateful, so linked to daemon instead
|
# Stateful, so linked to daemon instead
|
||||||
#libvirt_la_BUILT_LIBADD += libvirt_driver_uml.la
|
#libvirt_la_BUILT_LIBADD += libvirt_driver_uml.la
|
||||||
endif
|
endif ! WITH_DRIVER_MODULES
|
||||||
|
|
||||||
libvirt_driver_uml_impl_la_CFLAGS = \
|
libvirt_driver_uml_impl_la_CFLAGS = \
|
||||||
-I$(top_srcdir)/src/access \
|
-I$(top_srcdir)/src/access \
|
||||||
@ -1199,7 +1199,7 @@ libvirt_driver_uml_impl_la_CFLAGS = \
|
|||||||
libvirt_driver_uml_impl_la_LDFLAGS = $(AM_LDFLAGS)
|
libvirt_driver_uml_impl_la_LDFLAGS = $(AM_LDFLAGS)
|
||||||
# libvirt_driver_uml_impl_la_LIBADD =
|
# libvirt_driver_uml_impl_la_LIBADD =
|
||||||
libvirt_driver_uml_impl_la_SOURCES = $(UML_DRIVER_SOURCES)
|
libvirt_driver_uml_impl_la_SOURCES = $(UML_DRIVER_SOURCES)
|
||||||
endif
|
endif WITH_UML
|
||||||
|
|
||||||
|
|
||||||
BUILT_SOURCES += $(ESX_DRIVER_GENERATED)
|
BUILT_SOURCES += $(ESX_DRIVER_GENERATED)
|
||||||
@ -1227,7 +1227,7 @@ libvirt_driver_esx_la_LDFLAGS = $(AM_LDFLAGS)
|
|||||||
libvirt_driver_esx_la_LIBADD = $(CURL_LIBS)
|
libvirt_driver_esx_la_LIBADD = $(CURL_LIBS)
|
||||||
libvirt_driver_esx_la_SOURCES = $(ESX_DRIVER_SOURCES)
|
libvirt_driver_esx_la_SOURCES = $(ESX_DRIVER_SOURCES)
|
||||||
libvirt_driver_esx_la_DEPENDENCIES = $(ESX_DRIVER_GENERATED)
|
libvirt_driver_esx_la_DEPENDENCIES = $(ESX_DRIVER_GENERATED)
|
||||||
endif
|
endif WITH_ESX
|
||||||
|
|
||||||
|
|
||||||
BUILT_SOURCES += $(HYPERV_DRIVER_GENERATED)
|
BUILT_SOURCES += $(HYPERV_DRIVER_GENERATED)
|
||||||
@ -1254,7 +1254,7 @@ libvirt_driver_hyperv_la_CFLAGS = $(OPENWSMAN_CFLAGS) \
|
|||||||
libvirt_driver_hyperv_la_LDFLAGS = $(AM_LDFLAGS)
|
libvirt_driver_hyperv_la_LDFLAGS = $(AM_LDFLAGS)
|
||||||
libvirt_driver_hyperv_la_LIBADD = $(OPENWSMAN_LIBS)
|
libvirt_driver_hyperv_la_LIBADD = $(OPENWSMAN_LIBS)
|
||||||
libvirt_driver_hyperv_la_SOURCES = $(HYPERV_DRIVER_SOURCES)
|
libvirt_driver_hyperv_la_SOURCES = $(HYPERV_DRIVER_SOURCES)
|
||||||
endif
|
endif WITH_HYPERV
|
||||||
|
|
||||||
if WITH_PARALLELS
|
if WITH_PARALLELS
|
||||||
noinst_LTLIBRARIES += libvirt_driver_parallels.la
|
noinst_LTLIBRARIES += libvirt_driver_parallels.la
|
||||||
@ -1262,7 +1262,7 @@ libvirt_la_BUILT_LIBADD += libvirt_driver_parallels.la
|
|||||||
libvirt_driver_parallels_la_CFLAGS = \
|
libvirt_driver_parallels_la_CFLAGS = \
|
||||||
-I$(top_srcdir)/src/conf $(AM_CFLAGS)
|
-I$(top_srcdir)/src/conf $(AM_CFLAGS)
|
||||||
libvirt_driver_parallels_la_SOURCES = $(PARALLELS_DRIVER_SOURCES)
|
libvirt_driver_parallels_la_SOURCES = $(PARALLELS_DRIVER_SOURCES)
|
||||||
endif
|
endif WITH_PARALLELS
|
||||||
|
|
||||||
if WITH_NETWORK
|
if WITH_NETWORK
|
||||||
noinst_LTLIBRARIES += libvirt_driver_network_impl.la
|
noinst_LTLIBRARIES += libvirt_driver_network_impl.la
|
||||||
@ -1275,11 +1275,11 @@ libvirt_driver_network_la_LIBADD += ../gnulib/lib/libgnu.la \
|
|||||||
$(DBUS_LIBS) \
|
$(DBUS_LIBS) \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
libvirt_driver_network_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS)
|
libvirt_driver_network_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS)
|
||||||
else
|
else ! WITH_DRIVER_MODULES
|
||||||
noinst_LTLIBRARIES += libvirt_driver_network.la
|
noinst_LTLIBRARIES += libvirt_driver_network.la
|
||||||
# Stateful, so linked to daemon instead
|
# Stateful, so linked to daemon instead
|
||||||
#libvirt_la_BUILT_LIBADD += libvirt_driver_network.la
|
#libvirt_la_BUILT_LIBADD += libvirt_driver_network.la
|
||||||
endif
|
endif ! WITH_DRIVER_MODULES
|
||||||
|
|
||||||
libvirt_driver_network_impl_la_CFLAGS = \
|
libvirt_driver_network_impl_la_CFLAGS = \
|
||||||
$(LIBNL_CFLAGS) \
|
$(LIBNL_CFLAGS) \
|
||||||
@ -1289,18 +1289,18 @@ libvirt_driver_network_impl_la_CFLAGS = \
|
|||||||
$(AM_CFLAGS)
|
$(AM_CFLAGS)
|
||||||
libvirt_driver_network_impl_la_SOURCES = $(NETWORK_DRIVER_SOURCES)
|
libvirt_driver_network_impl_la_SOURCES = $(NETWORK_DRIVER_SOURCES)
|
||||||
libvirt_driver_network_impl_la_LIBADD = $(DBUS_LIBS)
|
libvirt_driver_network_impl_la_LIBADD = $(DBUS_LIBS)
|
||||||
endif
|
endif WITH_NETWORK
|
||||||
EXTRA_DIST += network/default.xml
|
EXTRA_DIST += network/default.xml
|
||||||
|
|
||||||
|
|
||||||
if WITH_INTERFACE
|
if WITH_INTERFACE
|
||||||
if WITH_DRIVER_MODULES
|
if WITH_DRIVER_MODULES
|
||||||
mod_LTLIBRARIES += libvirt_driver_interface.la
|
mod_LTLIBRARIES += libvirt_driver_interface.la
|
||||||
else
|
else ! WITH_DRIVER_MODULES
|
||||||
noinst_LTLIBRARIES += libvirt_driver_interface.la
|
noinst_LTLIBRARIES += libvirt_driver_interface.la
|
||||||
# Stateful, so linked to daemon instead
|
# Stateful, so linked to daemon instead
|
||||||
#libvirt_la_BUILT_LIBADD += libvirt_driver_interface.la
|
#libvirt_la_BUILT_LIBADD += libvirt_driver_interface.la
|
||||||
endif
|
endif ! WITH_DRIVER_MODULES
|
||||||
libvirt_driver_interface_la_CFLAGS = \
|
libvirt_driver_interface_la_CFLAGS = \
|
||||||
-I$(top_srcdir)/src/access \
|
-I$(top_srcdir)/src/access \
|
||||||
-I$(top_srcdir)/src/conf \
|
-I$(top_srcdir)/src/conf \
|
||||||
@ -1310,27 +1310,27 @@ libvirt_driver_interface_la_LIBADD =
|
|||||||
if WITH_NETCF
|
if WITH_NETCF
|
||||||
libvirt_driver_interface_la_CFLAGS += $(NETCF_CFLAGS)
|
libvirt_driver_interface_la_CFLAGS += $(NETCF_CFLAGS)
|
||||||
libvirt_driver_interface_la_LIBADD += $(NETCF_LIBS)
|
libvirt_driver_interface_la_LIBADD += $(NETCF_LIBS)
|
||||||
else
|
else ! WITH_NETCF
|
||||||
if WITH_UDEV
|
if WITH_UDEV
|
||||||
libvirt_driver_interface_la_CFLAGS += $(UDEV_CFLAGS)
|
libvirt_driver_interface_la_CFLAGS += $(UDEV_CFLAGS)
|
||||||
libvirt_driver_interface_la_LIBADD += $(UDEV_LIBS)
|
libvirt_driver_interface_la_LIBADD += $(UDEV_LIBS)
|
||||||
endif
|
endif WITH_UDEV
|
||||||
endif
|
endif ! WITH_NETCF
|
||||||
if WITH_DRIVER_MODULES
|
if WITH_DRIVER_MODULES
|
||||||
libvirt_driver_interface_la_LIBADD += ../gnulib/lib/libgnu.la
|
libvirt_driver_interface_la_LIBADD += ../gnulib/lib/libgnu.la
|
||||||
libvirt_driver_interface_la_LDFLAGS += -module -avoid-version
|
libvirt_driver_interface_la_LDFLAGS += -module -avoid-version
|
||||||
endif
|
endif WITH_DRIVER_MODULES
|
||||||
libvirt_driver_interface_la_SOURCES = $(INTERFACE_DRIVER_SOURCES)
|
libvirt_driver_interface_la_SOURCES = $(INTERFACE_DRIVER_SOURCES)
|
||||||
endif
|
endif WITH_INTERFACE
|
||||||
|
|
||||||
if WITH_SECRETS
|
if WITH_SECRETS
|
||||||
if WITH_DRIVER_MODULES
|
if WITH_DRIVER_MODULES
|
||||||
mod_LTLIBRARIES += libvirt_driver_secret.la
|
mod_LTLIBRARIES += libvirt_driver_secret.la
|
||||||
else
|
else ! WITH_DRIVER_MODULES
|
||||||
noinst_LTLIBRARIES += libvirt_driver_secret.la
|
noinst_LTLIBRARIES += libvirt_driver_secret.la
|
||||||
# Stateful, so linked to daemon instead
|
# Stateful, so linked to daemon instead
|
||||||
#libvirt_la_BUILT_LIBADD += libvirt_driver_secret.la
|
#libvirt_la_BUILT_LIBADD += libvirt_driver_secret.la
|
||||||
endif
|
endif ! WITH_DRIVER_MODULES
|
||||||
libvirt_driver_secret_la_CFLAGS = \
|
libvirt_driver_secret_la_CFLAGS = \
|
||||||
-I$(top_srcdir)/src/access \
|
-I$(top_srcdir)/src/access \
|
||||||
-I$(top_srcdir)/src/conf \
|
-I$(top_srcdir)/src/conf \
|
||||||
@ -1338,9 +1338,9 @@ libvirt_driver_secret_la_CFLAGS = \
|
|||||||
if WITH_DRIVER_MODULES
|
if WITH_DRIVER_MODULES
|
||||||
libvirt_driver_secret_la_LIBADD = ../gnulib/lib/libgnu.la
|
libvirt_driver_secret_la_LIBADD = ../gnulib/lib/libgnu.la
|
||||||
libvirt_driver_secret_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS)
|
libvirt_driver_secret_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS)
|
||||||
endif
|
endif WITH_DRIVER_MODULES
|
||||||
libvirt_driver_secret_la_SOURCES = $(SECRET_DRIVER_SOURCES)
|
libvirt_driver_secret_la_SOURCES = $(SECRET_DRIVER_SOURCES)
|
||||||
endif
|
endif WITH_SECRETS
|
||||||
|
|
||||||
# Needed to keep automake quiet about conditionals
|
# Needed to keep automake quiet about conditionals
|
||||||
libvirt_driver_storage_impl_la_SOURCES =
|
libvirt_driver_storage_impl_la_SOURCES =
|
||||||
@ -1354,7 +1354,7 @@ libvirt_driver_storage_impl_la_LIBADD += $(SECDRIVER_LIBS)
|
|||||||
if WITH_BLKID
|
if WITH_BLKID
|
||||||
libvirt_driver_storage_impl_la_CFLAGS += $(BLKID_CFLAGS)
|
libvirt_driver_storage_impl_la_CFLAGS += $(BLKID_CFLAGS)
|
||||||
libvirt_driver_storage_impl_la_LIBADD += $(BLKID_LIBS)
|
libvirt_driver_storage_impl_la_LIBADD += $(BLKID_LIBS)
|
||||||
endif
|
endif WITH_BLKID
|
||||||
if WITH_STORAGE
|
if WITH_STORAGE
|
||||||
noinst_LTLIBRARIES += libvirt_driver_storage_impl.la
|
noinst_LTLIBRARIES += libvirt_driver_storage_impl.la
|
||||||
libvirt_driver_storage_la_SOURCES =
|
libvirt_driver_storage_la_SOURCES =
|
||||||
@ -1363,55 +1363,55 @@ if WITH_DRIVER_MODULES
|
|||||||
mod_LTLIBRARIES += libvirt_driver_storage.la
|
mod_LTLIBRARIES += libvirt_driver_storage.la
|
||||||
libvirt_driver_storage_la_LIBADD += ../gnulib/lib/libgnu.la
|
libvirt_driver_storage_la_LIBADD += ../gnulib/lib/libgnu.la
|
||||||
libvirt_driver_storage_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS)
|
libvirt_driver_storage_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS)
|
||||||
else
|
else ! WITH_DRIVER_MODULES
|
||||||
noinst_LTLIBRARIES += libvirt_driver_storage.la
|
noinst_LTLIBRARIES += libvirt_driver_storage.la
|
||||||
# Stateful, so linked to daemon instead
|
# Stateful, so linked to daemon instead
|
||||||
#libvirt_la_BUILT_LIBADD += libvirt_driver_storage.la
|
#libvirt_la_BUILT_LIBADD += libvirt_driver_storage.la
|
||||||
endif
|
endif ! WITH_DRIVER_MODULES
|
||||||
libvirt_driver_storage_impl_la_SOURCES += $(STORAGE_DRIVER_SOURCES)
|
libvirt_driver_storage_impl_la_SOURCES += $(STORAGE_DRIVER_SOURCES)
|
||||||
libvirt_driver_storage_impl_la_SOURCES += $(STORAGE_DRIVER_FS_SOURCES)
|
libvirt_driver_storage_impl_la_SOURCES += $(STORAGE_DRIVER_FS_SOURCES)
|
||||||
endif
|
endif WITH_STORAGE
|
||||||
|
|
||||||
if WITH_STORAGE_LVM
|
if WITH_STORAGE_LVM
|
||||||
libvirt_driver_storage_impl_la_SOURCES += $(STORAGE_DRIVER_LVM_SOURCES)
|
libvirt_driver_storage_impl_la_SOURCES += $(STORAGE_DRIVER_LVM_SOURCES)
|
||||||
endif
|
endif WITH_STORAGE_LVM
|
||||||
|
|
||||||
if WITH_STORAGE_ISCSI
|
if WITH_STORAGE_ISCSI
|
||||||
libvirt_driver_storage_impl_la_SOURCES += $(STORAGE_DRIVER_ISCSI_SOURCES)
|
libvirt_driver_storage_impl_la_SOURCES += $(STORAGE_DRIVER_ISCSI_SOURCES)
|
||||||
endif
|
endif WITH_STORAGE_ISCSI
|
||||||
|
|
||||||
if WITH_STORAGE_SCSI
|
if WITH_STORAGE_SCSI
|
||||||
libvirt_driver_storage_impl_la_SOURCES += $(STORAGE_DRIVER_SCSI_SOURCES)
|
libvirt_driver_storage_impl_la_SOURCES += $(STORAGE_DRIVER_SCSI_SOURCES)
|
||||||
endif
|
endif WITH_STORAGE_SCSI
|
||||||
|
|
||||||
if WITH_STORAGE_MPATH
|
if WITH_STORAGE_MPATH
|
||||||
libvirt_driver_storage_impl_la_SOURCES += $(STORAGE_DRIVER_MPATH_SOURCES)
|
libvirt_driver_storage_impl_la_SOURCES += $(STORAGE_DRIVER_MPATH_SOURCES)
|
||||||
libvirt_driver_storage_impl_la_CFLAGS += $(DEVMAPPER_CFLAGS)
|
libvirt_driver_storage_impl_la_CFLAGS += $(DEVMAPPER_CFLAGS)
|
||||||
libvirt_driver_storage_impl_la_LIBADD += $(DEVMAPPER_LIBS)
|
libvirt_driver_storage_impl_la_LIBADD += $(DEVMAPPER_LIBS)
|
||||||
endif
|
endif WITH_STORAGE_MPATH
|
||||||
|
|
||||||
if WITH_STORAGE_DISK
|
if WITH_STORAGE_DISK
|
||||||
libvirt_driver_storage_impl_la_SOURCES += $(STORAGE_DRIVER_DISK_SOURCES)
|
libvirt_driver_storage_impl_la_SOURCES += $(STORAGE_DRIVER_DISK_SOURCES)
|
||||||
endif
|
endif WITH_STORAGE_DISK
|
||||||
|
|
||||||
if WITH_STORAGE_RBD
|
if WITH_STORAGE_RBD
|
||||||
libvirt_driver_storage_impl_la_SOURCES += $(STORAGE_DRIVER_RBD_SOURCES)
|
libvirt_driver_storage_impl_la_SOURCES += $(STORAGE_DRIVER_RBD_SOURCES)
|
||||||
libvirt_driver_storage_impl_la_LIBADD += $(LIBRBD_LIBS)
|
libvirt_driver_storage_impl_la_LIBADD += $(LIBRBD_LIBS)
|
||||||
endif
|
endif WITH_STORAGE_RBD
|
||||||
|
|
||||||
if WITH_STORAGE_SHEEPDOG
|
if WITH_STORAGE_SHEEPDOG
|
||||||
libvirt_driver_storage_impl_la_SOURCES += $(STORAGE_DRIVER_SHEEPDOG_SOURCES)
|
libvirt_driver_storage_impl_la_SOURCES += $(STORAGE_DRIVER_SHEEPDOG_SOURCES)
|
||||||
endif
|
endif WITH_STORAGE_SHEEPDOG
|
||||||
|
|
||||||
if WITH_NODE_DEVICES
|
if WITH_NODE_DEVICES
|
||||||
# Needed to keep automake quiet about conditionals
|
# Needed to keep automake quiet about conditionals
|
||||||
if WITH_DRIVER_MODULES
|
if WITH_DRIVER_MODULES
|
||||||
mod_LTLIBRARIES += libvirt_driver_nodedev.la
|
mod_LTLIBRARIES += libvirt_driver_nodedev.la
|
||||||
else
|
else ! WITH_DRIVER_MODULES
|
||||||
noinst_LTLIBRARIES += libvirt_driver_nodedev.la
|
noinst_LTLIBRARIES += libvirt_driver_nodedev.la
|
||||||
# Stateful, so linked to daemon instead
|
# Stateful, so linked to daemon instead
|
||||||
#libvirt_la_BUILT_LIBADD += libvirt_driver_nodedev.la
|
#libvirt_la_BUILT_LIBADD += libvirt_driver_nodedev.la
|
||||||
endif
|
endif ! WITH_DRIVER_MODULES
|
||||||
libvirt_driver_nodedev_la_SOURCES = $(NODE_DEVICE_DRIVER_SOURCES)
|
libvirt_driver_nodedev_la_SOURCES = $(NODE_DEVICE_DRIVER_SOURCES)
|
||||||
|
|
||||||
libvirt_driver_nodedev_la_CFLAGS = \
|
libvirt_driver_nodedev_la_CFLAGS = \
|
||||||
@ -1426,29 +1426,29 @@ if WITH_HAL
|
|||||||
libvirt_driver_nodedev_la_SOURCES += $(NODE_DEVICE_DRIVER_HAL_SOURCES)
|
libvirt_driver_nodedev_la_SOURCES += $(NODE_DEVICE_DRIVER_HAL_SOURCES)
|
||||||
libvirt_driver_nodedev_la_CFLAGS += $(HAL_CFLAGS)
|
libvirt_driver_nodedev_la_CFLAGS += $(HAL_CFLAGS)
|
||||||
libvirt_driver_nodedev_la_LIBADD += $(HAL_LIBS)
|
libvirt_driver_nodedev_la_LIBADD += $(HAL_LIBS)
|
||||||
endif
|
endif WITH_HAL
|
||||||
if WITH_UDEV
|
if WITH_UDEV
|
||||||
libvirt_driver_nodedev_la_SOURCES += $(NODE_DEVICE_DRIVER_UDEV_SOURCES)
|
libvirt_driver_nodedev_la_SOURCES += $(NODE_DEVICE_DRIVER_UDEV_SOURCES)
|
||||||
libvirt_driver_nodedev_la_CFLAGS += $(UDEV_CFLAGS) $(PCIACCESS_CFLAGS)
|
libvirt_driver_nodedev_la_CFLAGS += $(UDEV_CFLAGS) $(PCIACCESS_CFLAGS)
|
||||||
libvirt_driver_nodedev_la_LIBADD += $(UDEV_LIBS) $(PCIACCESS_LIBS)
|
libvirt_driver_nodedev_la_LIBADD += $(UDEV_LIBS) $(PCIACCESS_LIBS)
|
||||||
endif
|
endif WITH_UDEV
|
||||||
endif
|
endif WITH_LIBVIRTD
|
||||||
|
|
||||||
if WITH_DRIVER_MODULES
|
if WITH_DRIVER_MODULES
|
||||||
libvirt_driver_nodedev_la_LIBADD += ../gnulib/lib/libgnu.la
|
libvirt_driver_nodedev_la_LIBADD += ../gnulib/lib/libgnu.la
|
||||||
libvirt_driver_nodedev_la_LDFLAGS += -module -avoid-version
|
libvirt_driver_nodedev_la_LDFLAGS += -module -avoid-version
|
||||||
endif
|
endif WITH_DRIVER_MODULES
|
||||||
endif
|
endif WITH_NODE_DEVICES
|
||||||
|
|
||||||
|
|
||||||
if WITH_NWFILTER
|
if WITH_NWFILTER
|
||||||
if WITH_DRIVER_MODULES
|
if WITH_DRIVER_MODULES
|
||||||
mod_LTLIBRARIES += libvirt_driver_nwfilter.la
|
mod_LTLIBRARIES += libvirt_driver_nwfilter.la
|
||||||
else
|
else ! WITH_DRIVER_MODULES
|
||||||
noinst_LTLIBRARIES += libvirt_driver_nwfilter.la
|
noinst_LTLIBRARIES += libvirt_driver_nwfilter.la
|
||||||
# Stateful, so linked to daemon instead
|
# Stateful, so linked to daemon instead
|
||||||
#libvirt_la_BUILT_LIBADD += libvirt_driver_nwfilter.la
|
#libvirt_la_BUILT_LIBADD += libvirt_driver_nwfilter.la
|
||||||
endif
|
endif ! WITH_DRIVER_MODULES
|
||||||
libvirt_driver_nwfilter_la_CFLAGS = \
|
libvirt_driver_nwfilter_la_CFLAGS = \
|
||||||
$(LIBPCAP_CFLAGS) \
|
$(LIBPCAP_CFLAGS) \
|
||||||
$(LIBNL_CFLAGS) \
|
$(LIBNL_CFLAGS) \
|
||||||
@ -1461,9 +1461,9 @@ libvirt_driver_nwfilter_la_LIBADD = $(LIBPCAP_LIBS) $(LIBNL_LIBS) $(DBUS_LIBS)
|
|||||||
if WITH_DRIVER_MODULES
|
if WITH_DRIVER_MODULES
|
||||||
libvirt_driver_nwfilter_la_LIBADD += ../gnulib/lib/libgnu.la
|
libvirt_driver_nwfilter_la_LIBADD += ../gnulib/lib/libgnu.la
|
||||||
libvirt_driver_nwfilter_la_LDFLAGS += -module -avoid-version
|
libvirt_driver_nwfilter_la_LDFLAGS += -module -avoid-version
|
||||||
endif
|
endif WITH_DRIVER_MODULES
|
||||||
libvirt_driver_nwfilter_la_SOURCES = $(NWFILTER_DRIVER_SOURCES)
|
libvirt_driver_nwfilter_la_SOURCES = $(NWFILTER_DRIVER_SOURCES)
|
||||||
endif
|
endif WITH_NWFILTER
|
||||||
|
|
||||||
|
|
||||||
libvirt_security_manager_la_SOURCES = $(SECURITY_DRIVER_SOURCES)
|
libvirt_security_manager_la_SOURCES = $(SECURITY_DRIVER_SOURCES)
|
||||||
@ -1476,11 +1476,11 @@ libvirt_security_manager_la_LIBADD = $(SECDRIVER_LIBS)
|
|||||||
if WITH_SECDRIVER_SELINUX
|
if WITH_SECDRIVER_SELINUX
|
||||||
libvirt_security_manager_la_SOURCES += $(SECURITY_DRIVER_SELINUX_SOURCES)
|
libvirt_security_manager_la_SOURCES += $(SECURITY_DRIVER_SELINUX_SOURCES)
|
||||||
libvirt_security_manager_la_CFLAGS += $(SELINUX_CFLAGS)
|
libvirt_security_manager_la_CFLAGS += $(SELINUX_CFLAGS)
|
||||||
endif
|
endif WITH_SECDRIVER_SELINUX
|
||||||
if WITH_SECDRIVER_APPARMOR
|
if WITH_SECDRIVER_APPARMOR
|
||||||
libvirt_security_manager_la_SOURCES += $(SECURITY_DRIVER_APPARMOR_SOURCES)
|
libvirt_security_manager_la_SOURCES += $(SECURITY_DRIVER_APPARMOR_SOURCES)
|
||||||
libvirt_security_manager_la_CFLAGS += $(APPARMOR_CFLAGS)
|
libvirt_security_manager_la_CFLAGS += $(APPARMOR_CFLAGS)
|
||||||
endif
|
endif WITH_SECDRIVER_APPARMOR
|
||||||
|
|
||||||
libvirt_driver_access_la_SOURCES = \
|
libvirt_driver_access_la_SOURCES = \
|
||||||
$(ACCESS_DRIVER_SOURCES) $(ACCESS_DRIVER_GENERATED)
|
$(ACCESS_DRIVER_SOURCES) $(ACCESS_DRIVER_GENERATED)
|
||||||
@ -1505,9 +1505,9 @@ $(ACCESS_DRIVER_POLKIT_POLICY): $(srcdir)/access/viraccessperm.h \
|
|||||||
|
|
||||||
CLEANFILES += $(ACCESS_DRIVER_POLKIT_POLICY)
|
CLEANFILES += $(ACCESS_DRIVER_POLKIT_POLICY)
|
||||||
BUILT_SOURCES += $(ACCESS_DRIVER_POLKIT_POLICY)
|
BUILT_SOURCES += $(ACCESS_DRIVER_POLKIT_POLICY)
|
||||||
else
|
else ! WITH_POLKIT1
|
||||||
EXTRA_DIST += $(ACCESS_DRIVER_POLKIT_SOURCES)
|
EXTRA_DIST += $(ACCESS_DRIVER_POLKIT_SOURCES)
|
||||||
endif
|
endif ! WITH_POLKIT1
|
||||||
|
|
||||||
|
|
||||||
BUILT_SOURCES += $(ACCESS_DRIVER_GENERATED) $(ACCESS_DRIVER_API_FILES)
|
BUILT_SOURCES += $(ACCESS_DRIVER_GENERATED) $(ACCESS_DRIVER_API_FILES)
|
||||||
@ -1631,9 +1631,9 @@ check-augeas-qemu: test_libvirtd_qemu.aug
|
|||||||
$(AM_V_GEN)if test -x '$(AUGPARSE)'; then \
|
$(AM_V_GEN)if test -x '$(AUGPARSE)'; then \
|
||||||
'$(AUGPARSE)' -I $(srcdir)/qemu test_libvirtd_qemu.aug; \
|
'$(AUGPARSE)' -I $(srcdir)/qemu test_libvirtd_qemu.aug; \
|
||||||
fi
|
fi
|
||||||
else
|
else ! WITH_QEMU
|
||||||
check-augeas-qemu:
|
check-augeas-qemu:
|
||||||
endif
|
endif ! WITH_QEMU
|
||||||
|
|
||||||
if WITH_LXC
|
if WITH_LXC
|
||||||
test_libvirtd_lxc.aug: lxc/test_libvirtd_lxc.aug.in \
|
test_libvirtd_lxc.aug: lxc/test_libvirtd_lxc.aug.in \
|
||||||
@ -1644,9 +1644,9 @@ check-augeas-lxc: test_libvirtd_lxc.aug
|
|||||||
$(AM_V_GEN)if test -x '$(AUGPARSE)'; then \
|
$(AM_V_GEN)if test -x '$(AUGPARSE)'; then \
|
||||||
'$(AUGPARSE)' -I $(srcdir)/lxc test_libvirtd_lxc.aug; \
|
'$(AUGPARSE)' -I $(srcdir)/lxc test_libvirtd_lxc.aug; \
|
||||||
fi
|
fi
|
||||||
else
|
else ! WITH_LXC
|
||||||
check-augeas-lxc:
|
check-augeas-lxc:
|
||||||
endif
|
endif ! WITH_LXC
|
||||||
|
|
||||||
if WITH_SANLOCK
|
if WITH_SANLOCK
|
||||||
test_libvirt_sanlock.aug: locking/test_libvirt_sanlock.aug.in \
|
test_libvirt_sanlock.aug: locking/test_libvirt_sanlock.aug.in \
|
||||||
@ -1657,9 +1657,9 @@ check-augeas-sanlock: test_libvirt_sanlock.aug
|
|||||||
$(AM_V_GEN)if test -x '$(AUGPARSE)'; then \
|
$(AM_V_GEN)if test -x '$(AUGPARSE)'; then \
|
||||||
'$(AUGPARSE)' -I $(srcdir)/locking test_libvirt_sanlock.aug; \
|
'$(AUGPARSE)' -I $(srcdir)/locking test_libvirt_sanlock.aug; \
|
||||||
fi
|
fi
|
||||||
else
|
else ! WITH_SANLOCK
|
||||||
check-augeas-sanlock:
|
check-augeas-sanlock:
|
||||||
endif
|
endif ! WITH_SANLOCK
|
||||||
|
|
||||||
test_libvirt_lockd.aug: locking/test_libvirt_lockd.aug.in \
|
test_libvirt_lockd.aug: locking/test_libvirt_lockd.aug.in \
|
||||||
locking/qemu-lockd.conf $(AUG_GENTEST)
|
locking/qemu-lockd.conf $(AUG_GENTEST)
|
||||||
@ -1700,69 +1700,69 @@ check-augeas-virtlockd: test_virtlockd.aug
|
|||||||
|
|
||||||
if WITH_DRIVER_MODULES
|
if WITH_DRIVER_MODULES
|
||||||
USED_SYM_FILES += $(srcdir)/libvirt_driver_modules.syms
|
USED_SYM_FILES += $(srcdir)/libvirt_driver_modules.syms
|
||||||
else
|
else ! WITH_DRIVER_MODULES
|
||||||
SYM_FILES += $(srcdir)/libvirt_driver_modules.syms
|
SYM_FILES += $(srcdir)/libvirt_driver_modules.syms
|
||||||
endif
|
endif ! WITH_DRIVER_MODULES
|
||||||
|
|
||||||
if WITH_LINUX
|
if WITH_LINUX
|
||||||
USED_SYM_FILES += $(srcdir)/libvirt_linux.syms
|
USED_SYM_FILES += $(srcdir)/libvirt_linux.syms
|
||||||
else
|
else ! WITH_LINUX
|
||||||
SYM_FILES += $(srcdir)/libvirt_linux.syms
|
SYM_FILES += $(srcdir)/libvirt_linux.syms
|
||||||
endif
|
endif ! WITH_LINUX
|
||||||
|
|
||||||
if WITH_ESX
|
if WITH_ESX
|
||||||
USED_SYM_FILES += $(srcdir)/libvirt_esx.syms
|
USED_SYM_FILES += $(srcdir)/libvirt_esx.syms
|
||||||
else
|
else ! WITH_ESX
|
||||||
SYM_FILES += $(srcdir)/libvirt_esx.syms
|
SYM_FILES += $(srcdir)/libvirt_esx.syms
|
||||||
endif
|
endif ! WITH_ESX
|
||||||
|
|
||||||
if WITH_LIBVIRTD
|
if WITH_LIBVIRTD
|
||||||
USED_SYM_FILES += $(srcdir)/libvirt_daemon.syms
|
USED_SYM_FILES += $(srcdir)/libvirt_daemon.syms
|
||||||
else
|
else ! WITH_LIBVIRTD
|
||||||
SYM_FILES += $(srcdir)/libvirt_daemon.syms
|
SYM_FILES += $(srcdir)/libvirt_daemon.syms
|
||||||
endif
|
endif ! WITH_LIBVIRTD
|
||||||
|
|
||||||
if WITH_OPENVZ
|
if WITH_OPENVZ
|
||||||
USED_SYM_FILES += $(srcdir)/libvirt_openvz.syms
|
USED_SYM_FILES += $(srcdir)/libvirt_openvz.syms
|
||||||
else
|
else ! WITH_OPENVZ
|
||||||
SYM_FILES += $(srcdir)/libvirt_openvz.syms
|
SYM_FILES += $(srcdir)/libvirt_openvz.syms
|
||||||
endif
|
endif ! WITH_OPENVZ
|
||||||
|
|
||||||
if WITH_VMX
|
if WITH_VMX
|
||||||
USED_SYM_FILES += $(srcdir)/libvirt_vmx.syms
|
USED_SYM_FILES += $(srcdir)/libvirt_vmx.syms
|
||||||
else
|
else ! WITH_VMX
|
||||||
SYM_FILES += $(srcdir)/libvirt_vmx.syms
|
SYM_FILES += $(srcdir)/libvirt_vmx.syms
|
||||||
endif
|
endif ! WITH_VMX
|
||||||
|
|
||||||
if WITH_XENXS
|
if WITH_XENXS
|
||||||
USED_SYM_FILES += $(srcdir)/libvirt_xenxs.syms
|
USED_SYM_FILES += $(srcdir)/libvirt_xenxs.syms
|
||||||
else
|
else ! WITH_XENXS
|
||||||
SYM_FILES += $(srcdir)/libvirt_xenxs.syms
|
SYM_FILES += $(srcdir)/libvirt_xenxs.syms
|
||||||
endif
|
endif ! WITH_XENXS
|
||||||
|
|
||||||
if WITH_SASL
|
if WITH_SASL
|
||||||
USED_SYM_FILES += $(srcdir)/libvirt_sasl.syms
|
USED_SYM_FILES += $(srcdir)/libvirt_sasl.syms
|
||||||
else
|
else ! WITH_SASL
|
||||||
SYM_FILES += $(srcdir)/libvirt_sasl.syms
|
SYM_FILES += $(srcdir)/libvirt_sasl.syms
|
||||||
endif
|
endif ! WITH_SASL
|
||||||
|
|
||||||
if WITH_GNUTLS
|
if WITH_GNUTLS
|
||||||
USED_SYM_FILES += $(srcdir)/libvirt_gnutls.syms
|
USED_SYM_FILES += $(srcdir)/libvirt_gnutls.syms
|
||||||
else
|
else ! WITH_GNUTLS
|
||||||
SYM_FILES += $(srcdir)/libvirt_gnutls.syms
|
SYM_FILES += $(srcdir)/libvirt_gnutls.syms
|
||||||
endif
|
endif ! WITH_GNUTLS
|
||||||
|
|
||||||
if WITH_SSH2
|
if WITH_SSH2
|
||||||
USED_SYM_FILES += $(srcdir)/libvirt_libssh2.syms
|
USED_SYM_FILES += $(srcdir)/libvirt_libssh2.syms
|
||||||
else
|
else ! WITH_SSH2
|
||||||
SYM_FILES += $(srcdir)/libvirt_libssh2.syms
|
SYM_FILES += $(srcdir)/libvirt_libssh2.syms
|
||||||
endif
|
endif ! WITH_SSH2
|
||||||
|
|
||||||
if WITH_ATOMIC_OPS_PTHREAD
|
if WITH_ATOMIC_OPS_PTHREAD
|
||||||
USED_SYM_FILES += $(srcdir)/libvirt_atomic.syms
|
USED_SYM_FILES += $(srcdir)/libvirt_atomic.syms
|
||||||
else
|
else ! WITH_ATOMIC_OPS_PTHREAD
|
||||||
SYM_FILES += $(srcdir)/libvirt_atomic.syms
|
SYM_FILES += $(srcdir)/libvirt_atomic.syms
|
||||||
endif
|
endif ! WITH_ATOMIC_OPS_PTHREAD
|
||||||
|
|
||||||
EXTRA_DIST += \
|
EXTRA_DIST += \
|
||||||
libvirt_public.syms \
|
libvirt_public.syms \
|
||||||
@ -1842,7 +1842,7 @@ nodist_libvirt_driver_remote_la_SOURCES = libvirt_probes.h
|
|||||||
endif WITH_REMOTE
|
endif WITH_REMOTE
|
||||||
if WITH_DRIVER_MODULES
|
if WITH_DRIVER_MODULES
|
||||||
DTRACE2SYSTEMTAP_FLAGS = --with-modules
|
DTRACE2SYSTEMTAP_FLAGS = --with-modules
|
||||||
endif
|
endif WITH_DRIVER_MODULES
|
||||||
|
|
||||||
BUILT_SOURCES += libvirt_probes.h libvirt_probes.stp libvirt_functions.stp
|
BUILT_SOURCES += libvirt_probes.h libvirt_probes.stp libvirt_functions.stp
|
||||||
|
|
||||||
@ -1850,7 +1850,7 @@ if WITH_QEMU
|
|||||||
libvirt_driver_qemu_la_LIBADD += libvirt_qemu_probes.lo
|
libvirt_driver_qemu_la_LIBADD += libvirt_qemu_probes.lo
|
||||||
nodist_libvirt_driver_qemu_la_SOURCES = libvirt_qemu_probes.h
|
nodist_libvirt_driver_qemu_la_SOURCES = libvirt_qemu_probes.h
|
||||||
BUILT_SOURCES += libvirt_qemu_probes.h
|
BUILT_SOURCES += libvirt_qemu_probes.h
|
||||||
endif
|
endif WITH_QEMU
|
||||||
|
|
||||||
tapsetdir = $(datadir)/systemtap/tapset
|
tapsetdir = $(datadir)/systemtap/tapset
|
||||||
tapset_DATA = libvirt_probes.stp libvirt_qemu_probes.stp libvirt_functions.stp
|
tapset_DATA = libvirt_probes.stp libvirt_qemu_probes.stp libvirt_functions.stp
|
||||||
@ -1892,7 +1892,7 @@ CLEANFILES += libvirt_probes.h libvirt_probes.o libvirt_probes.lo \
|
|||||||
libvirt_qemu_probes.lo\
|
libvirt_qemu_probes.lo\
|
||||||
libvirt_functions.stp libvirt_probes.stp \
|
libvirt_functions.stp libvirt_probes.stp \
|
||||||
libvirt_qemu_probes.stp
|
libvirt_qemu_probes.stp
|
||||||
endif
|
endif WITH_DTRACE_PROBES
|
||||||
|
|
||||||
EXTRA_DIST += libvirt_probes.d libvirt_qemu_probes.d
|
EXTRA_DIST += libvirt_probes.d libvirt_qemu_probes.d
|
||||||
|
|
||||||
@ -1940,12 +1940,12 @@ augeastest_DATA += test_libvirt_lockd.aug
|
|||||||
CLEANFILES += test_libvirt_lockd.aug
|
CLEANFILES += test_libvirt_lockd.aug
|
||||||
if WITH_DTRACE_PROBES
|
if WITH_DTRACE_PROBES
|
||||||
lockd_la_LIBADD += libvirt_probes.lo
|
lockd_la_LIBADD += libvirt_probes.lo
|
||||||
endif
|
endif WITH_DTRACE_PROBES
|
||||||
if WITH_QEMU
|
if WITH_QEMU
|
||||||
nodist_conf_DATA += locking/qemu-lockd.conf
|
nodist_conf_DATA += locking/qemu-lockd.conf
|
||||||
BUILT_SOURCES += locking/qemu-lockd.conf
|
BUILT_SOURCES += locking/qemu-lockd.conf
|
||||||
DISTCLEANFILES += locking/qemu-lockd.conf
|
DISTCLEANFILES += locking/qemu-lockd.conf
|
||||||
endif
|
endif WITH_QEMU
|
||||||
|
|
||||||
locking/%-lockd.conf: $(srcdir)/locking/lockd.conf
|
locking/%-lockd.conf: $(srcdir)/locking/lockd.conf
|
||||||
$(AM_V_GEN)$(MKDIR_P) locking ; \
|
$(AM_V_GEN)$(MKDIR_P) locking ; \
|
||||||
@ -1979,12 +1979,12 @@ virtlockd_LDADD = \
|
|||||||
$(NULL)
|
$(NULL)
|
||||||
if WITH_DTRACE_PROBES
|
if WITH_DTRACE_PROBES
|
||||||
virtlockd_LDADD += libvirt_probes.lo
|
virtlockd_LDADD += libvirt_probes.lo
|
||||||
endif
|
endif WITH_DTRACE_PROBES
|
||||||
|
|
||||||
else
|
else ! WITH_LIBVIRTD
|
||||||
EXTRA_DIST += $(LOCK_DAEMON_SOURCES) \
|
EXTRA_DIST += $(LOCK_DAEMON_SOURCES) \
|
||||||
$(LOCK_DRIVER_LOCKD_SOURCES)
|
$(LOCK_DRIVER_LOCKD_SOURCES)
|
||||||
endif
|
endif ! WITH_LIBVIRTD
|
||||||
|
|
||||||
EXTRA_DIST += locking/virtlockd.sysconf \
|
EXTRA_DIST += locking/virtlockd.sysconf \
|
||||||
locking/lockd.conf \
|
locking/lockd.conf \
|
||||||
@ -2015,14 +2015,14 @@ uninstall-init:: uninstall-sysconfig
|
|||||||
|
|
||||||
BUILT_SOURCES += virtlockd.init
|
BUILT_SOURCES += virtlockd.init
|
||||||
DISTCLEANFILES += virtlockd.init
|
DISTCLEANFILES += virtlockd.init
|
||||||
else
|
else ! LIBVIRT_INIT_SCRIPT_RED_HAT
|
||||||
install-init::
|
install-init::
|
||||||
uninstall-init::
|
uninstall-init::
|
||||||
endif
|
endif ! LIBVIRT_INIT_SCRIPT_RED_HAT
|
||||||
else
|
else ! WITH_LIBVIRTD
|
||||||
install-init::
|
install-init::
|
||||||
uninstall-init::
|
uninstall-init::
|
||||||
endif
|
endif ! WITH_LIBVIRTD
|
||||||
|
|
||||||
virtlockd.init: locking/virtlockd.init.in $(top_builddir)/config.status
|
virtlockd.init: locking/virtlockd.init.in $(top_builddir)/config.status
|
||||||
$(AM_V_GEN)sed \
|
$(AM_V_GEN)sed \
|
||||||
@ -2089,14 +2089,14 @@ uninstall-systemd: uninstall-sysconfig
|
|||||||
rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/virtlockd.service \
|
rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/virtlockd.service \
|
||||||
$(DESTDIR)$(SYSTEMD_UNIT_DIR)/virtlockd.socket
|
$(DESTDIR)$(SYSTEMD_UNIT_DIR)/virtlockd.socket
|
||||||
rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) || :
|
rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) || :
|
||||||
else
|
else ! LIBVIRT_INIT_SCRIPT_SYSTEMD
|
||||||
install-systemd:
|
install-systemd:
|
||||||
uninstall-systemd:
|
uninstall-systemd:
|
||||||
endif
|
endif ! LIBVIRT_INIT_SCRIPT_SYSTEMD
|
||||||
else
|
else ! WITH_LIBVIRTD
|
||||||
install-systemd:
|
install-systemd:
|
||||||
uninstall-systemd:
|
uninstall-systemd:
|
||||||
endif
|
endif ! WITH_LIBVIRTD
|
||||||
|
|
||||||
virtlockd.service: locking/virtlockd.service.in $(top_builddir)/config.status
|
virtlockd.service: locking/virtlockd.service.in $(top_builddir)/config.status
|
||||||
$(AM_V_GEN)sed \
|
$(AM_V_GEN)sed \
|
||||||
@ -2131,10 +2131,10 @@ if WITH_QEMU
|
|||||||
nodist_conf_DATA += locking/qemu-sanlock.conf
|
nodist_conf_DATA += locking/qemu-sanlock.conf
|
||||||
BUILT_SOURCES += locking/qemu-sanlock.conf
|
BUILT_SOURCES += locking/qemu-sanlock.conf
|
||||||
DISTCLEANFILES += locking/qemu-sanlock.conf
|
DISTCLEANFILES += locking/qemu-sanlock.conf
|
||||||
endif
|
endif WITH_QEMU
|
||||||
else
|
else ! WITH_SANLOCK
|
||||||
EXTRA_DIST += $(LOCK_DRIVER_SANLOCK_SOURCES)
|
EXTRA_DIST += $(LOCK_DRIVER_SANLOCK_SOURCES)
|
||||||
endif
|
endif ! WITH_SANLOCK
|
||||||
EXTRA_DIST += locking/sanlock.conf \
|
EXTRA_DIST += locking/sanlock.conf \
|
||||||
locking/libvirt_sanlock.aug \
|
locking/libvirt_sanlock.aug \
|
||||||
locking/test_libvirt_sanlock.aug.in
|
locking/test_libvirt_sanlock.aug.in
|
||||||
@ -2169,24 +2169,24 @@ libvirt_net_rpc_la_SOURCES = \
|
|||||||
if WITH_SSH2
|
if WITH_SSH2
|
||||||
libvirt_net_rpc_la_SOURCES += \
|
libvirt_net_rpc_la_SOURCES += \
|
||||||
rpc/virnetsshsession.h rpc/virnetsshsession.c
|
rpc/virnetsshsession.h rpc/virnetsshsession.c
|
||||||
else
|
else ! WITH_SSH2
|
||||||
EXTRA_DIST += \
|
EXTRA_DIST += \
|
||||||
rpc/virnetsshsession.h rpc/virnetsshsession.c
|
rpc/virnetsshsession.h rpc/virnetsshsession.c
|
||||||
endif
|
endif ! WITH_SSH2
|
||||||
if WITH_GNUTLS
|
if WITH_GNUTLS
|
||||||
libvirt_net_rpc_la_SOURCES += \
|
libvirt_net_rpc_la_SOURCES += \
|
||||||
rpc/virnettlscontext.h rpc/virnettlscontext.c
|
rpc/virnettlscontext.h rpc/virnettlscontext.c
|
||||||
else
|
else ! WITH_GNUTLS
|
||||||
EXTRA_DIST += \
|
EXTRA_DIST += \
|
||||||
rpc/virnettlscontext.h rpc/virnettlscontext.c
|
rpc/virnettlscontext.h rpc/virnettlscontext.c
|
||||||
endif
|
endif ! WITH_GNUTLS
|
||||||
if WITH_SASL
|
if WITH_SASL
|
||||||
libvirt_net_rpc_la_SOURCES += \
|
libvirt_net_rpc_la_SOURCES += \
|
||||||
rpc/virnetsaslcontext.h rpc/virnetsaslcontext.c
|
rpc/virnetsaslcontext.h rpc/virnetsaslcontext.c
|
||||||
else
|
else ! WITH_SASL
|
||||||
EXTRA_DIST += \
|
EXTRA_DIST += \
|
||||||
rpc/virnetsaslcontext.h rpc/virnetsaslcontext.c
|
rpc/virnetsaslcontext.h rpc/virnetsaslcontext.c
|
||||||
endif
|
endif ! WITH_SASL
|
||||||
libvirt_net_rpc_la_CFLAGS = \
|
libvirt_net_rpc_la_CFLAGS = \
|
||||||
$(GNUTLS_CFLAGS) \
|
$(GNUTLS_CFLAGS) \
|
||||||
$(SASL_CFLAGS) \
|
$(SASL_CFLAGS) \
|
||||||
@ -2253,13 +2253,13 @@ libvirt_iohelper_LDADD = \
|
|||||||
../gnulib/lib/libgnu.la
|
../gnulib/lib/libgnu.la
|
||||||
if WITH_DTRACE_PROBES
|
if WITH_DTRACE_PROBES
|
||||||
libvirt_iohelper_LDADD += libvirt_probes.lo
|
libvirt_iohelper_LDADD += libvirt_probes.lo
|
||||||
endif
|
endif WITH_DTRACE_PROBES
|
||||||
|
|
||||||
libvirt_iohelper_CFLAGS = \
|
libvirt_iohelper_CFLAGS = \
|
||||||
$(AM_CFLAGS) \
|
$(AM_CFLAGS) \
|
||||||
$(PIE_CFLAGS) \
|
$(PIE_CFLAGS) \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
endif
|
endif WITH_LIBVIRTD
|
||||||
|
|
||||||
if WITH_STORAGE_DISK
|
if WITH_STORAGE_DISK
|
||||||
if WITH_LIBVIRTD
|
if WITH_LIBVIRTD
|
||||||
@ -2276,15 +2276,15 @@ libvirt_parthelper_LDADD = \
|
|||||||
../gnulib/lib/libgnu.la
|
../gnulib/lib/libgnu.la
|
||||||
if WITH_DTRACE_PROBES
|
if WITH_DTRACE_PROBES
|
||||||
libvirt_parthelper_LDADD += libvirt_probes.lo
|
libvirt_parthelper_LDADD += libvirt_probes.lo
|
||||||
endif
|
endif WITH_DTRACE_PROBES
|
||||||
|
|
||||||
libvirt_parthelper_CFLAGS = \
|
libvirt_parthelper_CFLAGS = \
|
||||||
$(LIBPARTED_CFLAGS) \
|
$(LIBPARTED_CFLAGS) \
|
||||||
$(AM_CFLAGS) \
|
$(AM_CFLAGS) \
|
||||||
$(PIE_CFLAGS) \
|
$(PIE_CFLAGS) \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
endif
|
endif WITH_LIBVIRTD
|
||||||
endif
|
endif WITH_STORAGE_DISK
|
||||||
EXTRA_DIST += $(STORAGE_HELPER_DISK_SOURCES)
|
EXTRA_DIST += $(STORAGE_HELPER_DISK_SOURCES)
|
||||||
|
|
||||||
|
|
||||||
@ -2302,7 +2302,7 @@ libvirt_sanlock_helper_LDFLAGS = \
|
|||||||
$(PIE_LDFLAGS) \
|
$(PIE_LDFLAGS) \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
libvirt_sanlock_helper_LDADD = libvirt.la
|
libvirt_sanlock_helper_LDADD = libvirt.la
|
||||||
endif
|
endif WITH_SANLOCK
|
||||||
|
|
||||||
if WITH_LXC
|
if WITH_LXC
|
||||||
if WITH_LIBVIRTD
|
if WITH_LIBVIRTD
|
||||||
@ -2326,7 +2326,7 @@ libvirt_lxc_LDADD = \
|
|||||||
../gnulib/lib/libgnu.la
|
../gnulib/lib/libgnu.la
|
||||||
if WITH_DTRACE_PROBES
|
if WITH_DTRACE_PROBES
|
||||||
libvirt_lxc_LDADD += libvirt_probes.lo
|
libvirt_lxc_LDADD += libvirt_probes.lo
|
||||||
endif
|
endif WITH_DTRACE_PROBES
|
||||||
libvirt_lxc_LDADD += $(SECDRIVER_LIBS)
|
libvirt_lxc_LDADD += $(SECDRIVER_LIBS)
|
||||||
libvirt_lxc_CFLAGS = \
|
libvirt_lxc_CFLAGS = \
|
||||||
-I$(top_srcdir)/src/conf \
|
-I$(top_srcdir)/src/conf \
|
||||||
@ -2338,15 +2338,15 @@ libvirt_lxc_CFLAGS = \
|
|||||||
if WITH_BLKID
|
if WITH_BLKID
|
||||||
libvirt_lxc_CFLAGS += $(BLKID_CFLAGS)
|
libvirt_lxc_CFLAGS += $(BLKID_CFLAGS)
|
||||||
libvirt_lxc_LDADD += $(BLKID_LIBS)
|
libvirt_lxc_LDADD += $(BLKID_LIBS)
|
||||||
endif
|
endif WITH_BLKID
|
||||||
if WITH_SECDRIVER_SELINUX
|
if WITH_SECDRIVER_SELINUX
|
||||||
libvirt_lxc_CFLAGS += $(SELINUX_CFLAGS)
|
libvirt_lxc_CFLAGS += $(SELINUX_CFLAGS)
|
||||||
endif
|
endif WITH_SECDRIVER_SELINUX
|
||||||
if WITH_SECDRIVER_APPARMOR
|
if WITH_SECDRIVER_APPARMOR
|
||||||
libvirt_lxc_CFLAGS += $(APPARMOR_CFLAGS)
|
libvirt_lxc_CFLAGS += $(APPARMOR_CFLAGS)
|
||||||
endif
|
endif WITH_SECDRIVER_APPARMOR
|
||||||
endif
|
endif WITH_LIBVIRTD
|
||||||
endif
|
endif WITH_LXC
|
||||||
EXTRA_DIST += $(LXC_CONTROLLER_SOURCES)
|
EXTRA_DIST += $(LXC_CONTROLLER_SOURCES)
|
||||||
|
|
||||||
if WITH_SECDRIVER_APPARMOR
|
if WITH_SECDRIVER_APPARMOR
|
||||||
@ -2365,15 +2365,15 @@ virt_aa_helper_LDADD = \
|
|||||||
../gnulib/lib/libgnu.la
|
../gnulib/lib/libgnu.la
|
||||||
if WITH_DTRACE_PROBES
|
if WITH_DTRACE_PROBES
|
||||||
virt_aa_helper_LDADD += libvirt_probes.lo
|
virt_aa_helper_LDADD += libvirt_probes.lo
|
||||||
endif
|
endif WITH_DTRACE_PROBES
|
||||||
virt_aa_helper_CFLAGS = \
|
virt_aa_helper_CFLAGS = \
|
||||||
-I$(top_srcdir)/src/conf \
|
-I$(top_srcdir)/src/conf \
|
||||||
-I$(top_srcdir)/src/security \
|
-I$(top_srcdir)/src/security \
|
||||||
$(AM_CFLAGS) \
|
$(AM_CFLAGS) \
|
||||||
$(PIE_CFLAGS) \
|
$(PIE_CFLAGS) \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
endif
|
endif WITH_LIBVIRTD
|
||||||
endif
|
endif WITH_SECDRIVER_APPARMOR
|
||||||
EXTRA_DIST += $(SECURITY_DRIVER_APPARMOR_HELPER_SOURCES)
|
EXTRA_DIST += $(SECURITY_DRIVER_APPARMOR_HELPER_SOURCES)
|
||||||
|
|
||||||
install-data-local: install-init install-systemd
|
install-data-local: install-init install-systemd
|
||||||
@ -2381,37 +2381,37 @@ if WITH_LIBVIRTD
|
|||||||
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/lockd"
|
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/lockd"
|
||||||
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/lockd/files"
|
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/lockd/files"
|
||||||
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/run/libvirt/lockd"
|
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/run/libvirt/lockd"
|
||||||
endif
|
endif WITH_LIBVIRTD
|
||||||
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/cache/libvirt"
|
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/cache/libvirt"
|
||||||
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/images"
|
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/images"
|
||||||
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/filesystems"
|
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/filesystems"
|
||||||
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/boot"
|
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/boot"
|
||||||
if WITH_SANLOCK
|
if WITH_SANLOCK
|
||||||
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/sanlock"
|
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/sanlock"
|
||||||
endif
|
endif WITH_SANLOCK
|
||||||
if WITH_QEMU
|
if WITH_QEMU
|
||||||
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/qemu"
|
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/qemu"
|
||||||
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/qemu/channel/target"
|
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/qemu/channel/target"
|
||||||
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/run/libvirt/qemu"
|
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/run/libvirt/qemu"
|
||||||
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/cache/libvirt/qemu"
|
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/cache/libvirt/qemu"
|
||||||
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/log/libvirt/qemu"
|
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/log/libvirt/qemu"
|
||||||
endif
|
endif WITH_QEMU
|
||||||
if WITH_LXC
|
if WITH_LXC
|
||||||
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/lxc"
|
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/lxc"
|
||||||
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/run/libvirt/lxc"
|
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/run/libvirt/lxc"
|
||||||
endif
|
endif WITH_LXC
|
||||||
if WITH_LIBXL
|
if WITH_LIBXL
|
||||||
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/libxl"
|
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/libxl"
|
||||||
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/run/libvirt/libxl"
|
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/run/libvirt/libxl"
|
||||||
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/log/libvirt/libxl"
|
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/log/libvirt/libxl"
|
||||||
endif
|
endif WITH_LIBXL
|
||||||
if WITH_UML
|
if WITH_UML
|
||||||
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/uml"
|
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/uml"
|
||||||
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/run/libvirt/uml"
|
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/run/libvirt/uml"
|
||||||
endif
|
endif WITH_UML
|
||||||
if WITH_XEN
|
if WITH_XEN
|
||||||
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/xen"
|
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/xen"
|
||||||
endif
|
endif WITH_XEN
|
||||||
if WITH_NETWORK
|
if WITH_NETWORK
|
||||||
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/network"
|
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/network"
|
||||||
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/dnsmasq"
|
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/dnsmasq"
|
||||||
@ -2429,43 +2429,43 @@ if WITH_NETWORK
|
|||||||
test -e $(DESTDIR)$(confdir)/qemu/networks/autostart/default.xml || \
|
test -e $(DESTDIR)$(confdir)/qemu/networks/autostart/default.xml || \
|
||||||
ln -s ../default.xml \
|
ln -s ../default.xml \
|
||||||
$(DESTDIR)$(confdir)/qemu/networks/autostart/default.xml
|
$(DESTDIR)$(confdir)/qemu/networks/autostart/default.xml
|
||||||
endif
|
endif WITH_NETWORK
|
||||||
|
|
||||||
uninstall-local:: uninstall-init uninstall-systemd
|
uninstall-local:: uninstall-init uninstall-systemd
|
||||||
if WITH_LIBVIRTD
|
if WITH_LIBVIRTD
|
||||||
rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/lockd/files" ||:
|
rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/lockd/files" ||:
|
||||||
rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/lockd" ||:
|
rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/lockd" ||:
|
||||||
rmdir "$(DESTDIR)$(localstatedir)/run/libvirt/lockd" ||:
|
rmdir "$(DESTDIR)$(localstatedir)/run/libvirt/lockd" ||:
|
||||||
endif
|
endif WITH_LIBVIRTD
|
||||||
rmdir "$(DESTDIR)$(localstatedir)/cache/libvirt" ||:
|
rmdir "$(DESTDIR)$(localstatedir)/cache/libvirt" ||:
|
||||||
rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/images" ||:
|
rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/images" ||:
|
||||||
rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/filesystems" ||:
|
rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/filesystems" ||:
|
||||||
rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/boot" ||:
|
rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/boot" ||:
|
||||||
if WITH_SANLOCK
|
if WITH_SANLOCK
|
||||||
rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/sanlock" ||:
|
rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/sanlock" ||:
|
||||||
endif
|
endif WITH_SANLOCK
|
||||||
if WITH_QEMU
|
if WITH_QEMU
|
||||||
rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/qemu" ||:
|
rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/qemu" ||:
|
||||||
rmdir "$(DESTDIR)$(localstatedir)/run/libvirt/qemu" ||:
|
rmdir "$(DESTDIR)$(localstatedir)/run/libvirt/qemu" ||:
|
||||||
rmdir "$(DESTDIR)$(localstatedir)/cache/libvirt/qemu" ||:
|
rmdir "$(DESTDIR)$(localstatedir)/cache/libvirt/qemu" ||:
|
||||||
rmdir "$(DESTDIR)$(localstatedir)/log/libvirt/qemu" ||:
|
rmdir "$(DESTDIR)$(localstatedir)/log/libvirt/qemu" ||:
|
||||||
endif
|
endif WITH_QEMU
|
||||||
if WITH_LXC
|
if WITH_LXC
|
||||||
rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/lxc" ||:
|
rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/lxc" ||:
|
||||||
rmdir "$(DESTDIR)$(localstatedir)/run/libvirt/lxc" ||:
|
rmdir "$(DESTDIR)$(localstatedir)/run/libvirt/lxc" ||:
|
||||||
endif
|
endif WITH_LXC
|
||||||
if WITH_LIBXL
|
if WITH_LIBXL
|
||||||
rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/libxl" ||:
|
rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/libxl" ||:
|
||||||
rmdir "$(DESTDIR)$(localstatedir)/run/libvirt/libxl" ||:
|
rmdir "$(DESTDIR)$(localstatedir)/run/libvirt/libxl" ||:
|
||||||
rmdir "$(DESTDIR)$(localstatedir)/log/libvirt/libxl" ||:
|
rmdir "$(DESTDIR)$(localstatedir)/log/libvirt/libxl" ||:
|
||||||
endif
|
endif WITH_LIBXL
|
||||||
if WITH_UML
|
if WITH_UML
|
||||||
rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/uml" ||:
|
rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/uml" ||:
|
||||||
rmdir "$(DESTDIR)$(localstatedir)/run/libvirt/uml" ||:
|
rmdir "$(DESTDIR)$(localstatedir)/run/libvirt/uml" ||:
|
||||||
endif
|
endif WITH_UML
|
||||||
if WITH_XEN
|
if WITH_XEN
|
||||||
rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/xen" ||:
|
rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/xen" ||:
|
||||||
endif
|
endif WITH_XEN
|
||||||
if WITH_NETWORK
|
if WITH_NETWORK
|
||||||
rm -f $(DESTDIR)$(confdir)/qemu/networks/autostart/default.xml
|
rm -f $(DESTDIR)$(confdir)/qemu/networks/autostart/default.xml
|
||||||
rm -f $(DESTDIR)$(confdir)/qemu/networks/default.xml
|
rm -f $(DESTDIR)$(confdir)/qemu/networks/default.xml
|
||||||
@ -2473,7 +2473,7 @@ if WITH_NETWORK
|
|||||||
rmdir "$(DESTDIR)$(confdir)/qemu/networks" || :
|
rmdir "$(DESTDIR)$(confdir)/qemu/networks" || :
|
||||||
rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/network" ||:
|
rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/network" ||:
|
||||||
rmdir "$(DESTDIR)$(localstatedir)/run/libvirt/network" ||:
|
rmdir "$(DESTDIR)$(localstatedir)/run/libvirt/network" ||:
|
||||||
endif
|
endif WITH_NETWORK
|
||||||
rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt" ||:
|
rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt" ||:
|
||||||
|
|
||||||
CLEANFILES += *.gcov .libs/*.gcda .libs/*.gcno *.gcno *.gcda *.i *.s
|
CLEANFILES += *.gcov .libs/*.gcda .libs/*.gcno *.gcno *.gcda *.i *.s
|
||||||
|
@ -41,12 +41,12 @@ AM_CFLAGS = \
|
|||||||
if WITH_DRIVER_MODULES
|
if WITH_DRIVER_MODULES
|
||||||
INCLUDES += \
|
INCLUDES += \
|
||||||
-DTEST_DRIVER_DIR=\"$(top_builddir)/src/.libs\"
|
-DTEST_DRIVER_DIR=\"$(top_builddir)/src/.libs\"
|
||||||
endif
|
endif WITH_DRIVER_MODULES
|
||||||
|
|
||||||
PROBES_O =
|
PROBES_O =
|
||||||
if WITH_DTRACE_PROBES
|
if WITH_DTRACE_PROBES
|
||||||
PROBES_O += ../src/libvirt_probes.lo
|
PROBES_O += ../src/libvirt_probes.lo
|
||||||
endif
|
endif WITH_DTRACE_PROBES
|
||||||
|
|
||||||
LDADDS = \
|
LDADDS = \
|
||||||
$(WARN_CFLAGS) \
|
$(WARN_CFLAGS) \
|
||||||
@ -135,24 +135,24 @@ test_programs = virshtest sockettest \
|
|||||||
if WITH_DBUS
|
if WITH_DBUS
|
||||||
test_programs += virdbustest \
|
test_programs += virdbustest \
|
||||||
virsystemdtest
|
virsystemdtest
|
||||||
endif
|
endif WITH_DBUS
|
||||||
|
|
||||||
if WITH_GNUTLS
|
if WITH_GNUTLS
|
||||||
test_programs += virnettlscontexttest virnettlssessiontest
|
test_programs += virnettlscontexttest virnettlssessiontest
|
||||||
endif
|
endif WITH_GNUTLS
|
||||||
|
|
||||||
if WITH_SECDRIVER_SELINUX
|
if WITH_SECDRIVER_SELINUX
|
||||||
if WITH_ATTR
|
if WITH_ATTR
|
||||||
test_programs += securityselinuxtest
|
test_programs += securityselinuxtest
|
||||||
if WITH_QEMU
|
if WITH_QEMU
|
||||||
test_programs += securityselinuxlabeltest
|
test_programs += securityselinuxlabeltest
|
||||||
endif
|
endif WITH_QEMU
|
||||||
endif
|
endif WITH_ATTR
|
||||||
endif
|
endif WITH_SECDRIVER_SELINUX
|
||||||
|
|
||||||
if WITH_DRIVER_MODULES
|
if WITH_DRIVER_MODULES
|
||||||
test_programs += virdrivermoduletest
|
test_programs += virdrivermoduletest
|
||||||
endif
|
endif WITH_DRIVER_MODULES
|
||||||
|
|
||||||
# This is a fake SSH we use from virnetsockettest
|
# This is a fake SSH we use from virnetsockettest
|
||||||
ssh_SOURCES = ssh.c
|
ssh_SOURCES = ssh.c
|
||||||
@ -161,53 +161,53 @@ ssh_LDADD = $(COVERAGE_LDFLAGS)
|
|||||||
if WITH_XEN
|
if WITH_XEN
|
||||||
test_programs += xml2sexprtest sexpr2xmltest \
|
test_programs += xml2sexprtest sexpr2xmltest \
|
||||||
xmconfigtest xencapstest statstest reconnect
|
xmconfigtest xencapstest statstest reconnect
|
||||||
endif
|
endif WITH_XEN
|
||||||
if WITH_QEMU
|
if WITH_QEMU
|
||||||
test_programs += qemuxml2argvtest qemuxml2xmltest qemuxmlnstest \
|
test_programs += qemuxml2argvtest qemuxml2xmltest qemuxmlnstest \
|
||||||
qemuargv2xmltest qemuhelptest domainsnapshotxml2xmltest \
|
qemuargv2xmltest qemuhelptest domainsnapshotxml2xmltest \
|
||||||
qemumonitortest qemumonitorjsontest qemuhotplugtest \
|
qemumonitortest qemumonitorjsontest qemuhotplugtest \
|
||||||
qemuagenttest
|
qemuagenttest
|
||||||
endif
|
endif WITH_QEMU
|
||||||
|
|
||||||
if WITH_LXC
|
if WITH_LXC
|
||||||
test_programs += lxcxml2xmltest
|
test_programs += lxcxml2xmltest
|
||||||
endif
|
endif WITH_LXC
|
||||||
|
|
||||||
if WITH_OPENVZ
|
if WITH_OPENVZ
|
||||||
test_programs += openvzutilstest
|
test_programs += openvzutilstest
|
||||||
endif
|
endif WITH_OPENVZ
|
||||||
|
|
||||||
if WITH_ESX
|
if WITH_ESX
|
||||||
test_programs += esxutilstest
|
test_programs += esxutilstest
|
||||||
endif
|
endif WITH_ESX
|
||||||
|
|
||||||
if WITH_VMX
|
if WITH_VMX
|
||||||
test_programs += vmx2xmltest xml2vmxtest
|
test_programs += vmx2xmltest xml2vmxtest
|
||||||
endif
|
endif WITH_VMX
|
||||||
|
|
||||||
if WITH_CIL
|
if WITH_CIL
|
||||||
test_programs += object-locking
|
test_programs += object-locking
|
||||||
endif
|
endif WITH_CIL
|
||||||
|
|
||||||
if WITH_YAJL
|
if WITH_YAJL
|
||||||
test_programs += jsontest
|
test_programs += jsontest
|
||||||
endif
|
endif WITH_YAJL
|
||||||
|
|
||||||
test_programs += networkxml2xmltest networkxml2xmlupdatetest
|
test_programs += networkxml2xmltest networkxml2xmlupdatetest
|
||||||
|
|
||||||
if WITH_NETWORK
|
if WITH_NETWORK
|
||||||
test_programs += networkxml2conftest
|
test_programs += networkxml2conftest
|
||||||
endif
|
endif WITH_NETWORK
|
||||||
|
|
||||||
if WITH_STORAGE_SHEEPDOG
|
if WITH_STORAGE_SHEEPDOG
|
||||||
test_programs += storagebackendsheepdogtest
|
test_programs += storagebackendsheepdogtest
|
||||||
endif
|
endif WITH_STORAGE_SHEEPDOG
|
||||||
|
|
||||||
test_programs += nwfilterxml2xmltest
|
test_programs += nwfilterxml2xmltest
|
||||||
|
|
||||||
if WITH_STORAGE
|
if WITH_STORAGE
|
||||||
test_programs += storagevolxml2argvtest
|
test_programs += storagevolxml2argvtest
|
||||||
endif
|
endif WITH_STORAGE
|
||||||
|
|
||||||
test_programs += storagevolxml2xmltest storagepoolxml2xmltest
|
test_programs += storagevolxml2xmltest storagepoolxml2xmltest
|
||||||
|
|
||||||
@ -251,7 +251,7 @@ test_scripts += \
|
|||||||
test_programs += \
|
test_programs += \
|
||||||
eventtest \
|
eventtest \
|
||||||
libvirtdconftest
|
libvirtdconftest
|
||||||
else
|
else ! WITH_LIBVIRTD
|
||||||
EXTRA_DIST += \
|
EXTRA_DIST += \
|
||||||
test_conf.sh \
|
test_conf.sh \
|
||||||
cpuset \
|
cpuset \
|
||||||
@ -269,13 +269,13 @@ EXTRA_DIST += \
|
|||||||
virsh-synopsis \
|
virsh-synopsis \
|
||||||
virsh-undefine \
|
virsh-undefine \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
endif
|
endif ! WITH_LIBVIRTD
|
||||||
|
|
||||||
if WITH_SECDRIVER_APPARMOR
|
if WITH_SECDRIVER_APPARMOR
|
||||||
test_scripts += virt-aa-helper-test
|
test_scripts += virt-aa-helper-test
|
||||||
else
|
else ! WITH_SECDRIVER_APPARMOR
|
||||||
EXTRA_DIST += virt-aa-helper-test
|
EXTRA_DIST += virt-aa-helper-test
|
||||||
endif
|
endif ! WITH_SECDRIVER_APPARMOR
|
||||||
|
|
||||||
EXTRA_DIST += $(test_scripts)
|
EXTRA_DIST += $(test_scripts)
|
||||||
|
|
||||||
@ -285,19 +285,19 @@ test_libraries = libshunload.la \
|
|||||||
$(NULL)
|
$(NULL)
|
||||||
if WITH_QEMU
|
if WITH_QEMU
|
||||||
test_libraries += libqemumonitortestutils.la
|
test_libraries += libqemumonitortestutils.la
|
||||||
endif
|
endif WITH_QEMU
|
||||||
|
|
||||||
if WITH_DBUS
|
if WITH_DBUS
|
||||||
test_libraries += virsystemdmock.la
|
test_libraries += virsystemdmock.la
|
||||||
endif
|
endif WITH_DBUS
|
||||||
|
|
||||||
if WITH_TESTS
|
if WITH_TESTS
|
||||||
noinst_PROGRAMS = $(test_programs) $(test_helpers)
|
noinst_PROGRAMS = $(test_programs) $(test_helpers)
|
||||||
noinst_LTLIBRARIES = $(test_libraries)
|
noinst_LTLIBRARIES = $(test_libraries)
|
||||||
else
|
else ! WITH_TESTS
|
||||||
check_PROGRAMS = $(test_programs) $(test_helpers)
|
check_PROGRAMS = $(test_programs) $(test_helpers)
|
||||||
check_LTLIBRARIES = $(test_libraries)
|
check_LTLIBRARIES = $(test_libraries)
|
||||||
endif
|
endif ! WITH_TESTS
|
||||||
|
|
||||||
TESTS = $(test_programs) \
|
TESTS = $(test_programs) \
|
||||||
$(test_scripts)
|
$(test_scripts)
|
||||||
@ -369,11 +369,11 @@ statstest_SOURCES = \
|
|||||||
statstest.c testutils.h testutils.c
|
statstest.c testutils.h testutils.c
|
||||||
statstest_LDADD = $(xen_LDADDS)
|
statstest_LDADD = $(xen_LDADDS)
|
||||||
|
|
||||||
else
|
else ! WITH_XEN
|
||||||
EXTRA_DIST += xml2sexprtest.c sexpr2xmltest.c xmconfigtest.c \
|
EXTRA_DIST += xml2sexprtest.c sexpr2xmltest.c xmconfigtest.c \
|
||||||
xencapstest.c reconnect.c \
|
xencapstest.c reconnect.c \
|
||||||
testutilsxen.c testutilsxen.h
|
testutilsxen.c testutilsxen.h
|
||||||
endif
|
endif ! WITH_XEN
|
||||||
|
|
||||||
QEMUMONITORTESTUTILS_SOURCES = \
|
QEMUMONITORTESTUTILS_SOURCES = \
|
||||||
qemumonitortestutils.c \
|
qemumonitortestutils.c \
|
||||||
@ -387,10 +387,10 @@ libqemumonitortestutils_la_SOURCES = $(QEMUMONITORTESTUTILS_SOURCES)
|
|||||||
qemu_LDADDS = ../src/libvirt_driver_qemu_impl.la
|
qemu_LDADDS = ../src/libvirt_driver_qemu_impl.la
|
||||||
if WITH_NETWORK
|
if WITH_NETWORK
|
||||||
qemu_LDADDS += ../src/libvirt_driver_network_impl.la
|
qemu_LDADDS += ../src/libvirt_driver_network_impl.la
|
||||||
endif
|
endif WITH_NETWORK
|
||||||
if WITH_DTRACE_PROBES
|
if WITH_DTRACE_PROBES
|
||||||
qemu_LDADDS += ../src/libvirt_qemu_probes.lo
|
qemu_LDADDS += ../src/libvirt_qemu_probes.lo
|
||||||
endif
|
endif WITH_DTRACE_PROBES
|
||||||
qemu_LDADDS += $(LDADDS)
|
qemu_LDADDS += $(LDADDS)
|
||||||
|
|
||||||
qemuxml2argvtest_SOURCES = \
|
qemuxml2argvtest_SOURCES = \
|
||||||
@ -444,39 +444,39 @@ domainsnapshotxml2xmltest_SOURCES = \
|
|||||||
domainsnapshotxml2xmltest.c testutilsqemu.c testutilsqemu.h \
|
domainsnapshotxml2xmltest.c testutilsqemu.c testutilsqemu.h \
|
||||||
testutils.c testutils.h
|
testutils.c testutils.h
|
||||||
domainsnapshotxml2xmltest_LDADD = $(qemu_LDADDS)
|
domainsnapshotxml2xmltest_LDADD = $(qemu_LDADDS)
|
||||||
else
|
else ! WITH_QEMU
|
||||||
EXTRA_DIST += qemuxml2argvtest.c qemuxml2xmltest.c qemuargv2xmltest.c \
|
EXTRA_DIST += qemuxml2argvtest.c qemuxml2xmltest.c qemuargv2xmltest.c \
|
||||||
qemuxmlnstest.c qemuhelptest.c domainsnapshotxml2xmltest.c \
|
qemuxmlnstest.c qemuhelptest.c domainsnapshotxml2xmltest.c \
|
||||||
qemumonitortest.c testutilsqemu.c testutilsqemu.h \
|
qemumonitortest.c testutilsqemu.c testutilsqemu.h \
|
||||||
qemumonitorjsontest.c qemuhotplugtest.c \
|
qemumonitorjsontest.c qemuhotplugtest.c \
|
||||||
qemuagenttest.c \
|
qemuagenttest.c \
|
||||||
$(QEMUMONITORTESTUTILS_SOURCES)
|
$(QEMUMONITORTESTUTILS_SOURCES)
|
||||||
endif
|
endif ! WITH_QEMU
|
||||||
|
|
||||||
if WITH_LXC
|
if WITH_LXC
|
||||||
|
|
||||||
lxc_LDADDS = ../src/libvirt_driver_lxc_impl.la
|
lxc_LDADDS = ../src/libvirt_driver_lxc_impl.la
|
||||||
if WITH_NETWORK
|
if WITH_NETWORK
|
||||||
lxc_LDADDS += ../src/libvirt_driver_network_impl.la
|
lxc_LDADDS += ../src/libvirt_driver_network_impl.la
|
||||||
endif
|
endif WITH_NETWORK
|
||||||
lxc_LDADDS += $(LDADDS)
|
lxc_LDADDS += $(LDADDS)
|
||||||
|
|
||||||
lxcxml2xmltest_SOURCES = \
|
lxcxml2xmltest_SOURCES = \
|
||||||
lxcxml2xmltest.c testutilslxc.c testutilslxc.h \
|
lxcxml2xmltest.c testutilslxc.c testutilslxc.h \
|
||||||
testutils.c testutils.h
|
testutils.c testutils.h
|
||||||
lxcxml2xmltest_LDADD = $(lxc_LDADDS)
|
lxcxml2xmltest_LDADD = $(lxc_LDADDS)
|
||||||
else
|
else ! WITH_LXC
|
||||||
EXTRA_DIST += lxcxml2xmltest.c testutilslxc.c testutilslxc.h
|
EXTRA_DIST += lxcxml2xmltest.c testutilslxc.c testutilslxc.h
|
||||||
endif
|
endif ! WITH_LXC
|
||||||
|
|
||||||
if WITH_OPENVZ
|
if WITH_OPENVZ
|
||||||
openvzutilstest_SOURCES = \
|
openvzutilstest_SOURCES = \
|
||||||
openvzutilstest.c \
|
openvzutilstest.c \
|
||||||
testutils.c testutils.h
|
testutils.c testutils.h
|
||||||
openvzutilstest_LDADD = $(LDADDS)
|
openvzutilstest_LDADD = $(LDADDS)
|
||||||
else
|
else ! WITH_OPENVZ
|
||||||
EXTRA_DIST += openvzutilstest.c
|
EXTRA_DIST += openvzutilstest.c
|
||||||
endif
|
endif ! WITH_OPENVZ
|
||||||
EXTRA_DIST += openvzutilstest.conf
|
EXTRA_DIST += openvzutilstest.conf
|
||||||
|
|
||||||
if WITH_ESX
|
if WITH_ESX
|
||||||
@ -484,9 +484,9 @@ esxutilstest_SOURCES = \
|
|||||||
esxutilstest.c \
|
esxutilstest.c \
|
||||||
testutils.c testutils.h
|
testutils.c testutils.h
|
||||||
esxutilstest_LDADD = $(LDADDS)
|
esxutilstest_LDADD = $(LDADDS)
|
||||||
else
|
else ! WITH_ESX
|
||||||
EXTRA_DIST += esxutilstest.c
|
EXTRA_DIST += esxutilstest.c
|
||||||
endif
|
endif ! WITH_ESX
|
||||||
|
|
||||||
if WITH_VMX
|
if WITH_VMX
|
||||||
vmx2xmltest_SOURCES = \
|
vmx2xmltest_SOURCES = \
|
||||||
@ -498,9 +498,9 @@ xml2vmxtest_SOURCES = \
|
|||||||
xml2vmxtest.c \
|
xml2vmxtest.c \
|
||||||
testutils.c testutils.h
|
testutils.c testutils.h
|
||||||
xml2vmxtest_LDADD = $(LDADDS)
|
xml2vmxtest_LDADD = $(LDADDS)
|
||||||
else
|
else ! WITH_VMX
|
||||||
EXTRA_DIST += vmx2xmltest.c xml2vmxtest.c
|
EXTRA_DIST += vmx2xmltest.c xml2vmxtest.c
|
||||||
endif
|
endif ! WITH_VMX
|
||||||
|
|
||||||
networkxml2xmltest_SOURCES = \
|
networkxml2xmltest_SOURCES = \
|
||||||
networkxml2xmltest.c \
|
networkxml2xmltest.c \
|
||||||
@ -517,9 +517,9 @@ networkxml2conftest_SOURCES = \
|
|||||||
networkxml2conftest.c \
|
networkxml2conftest.c \
|
||||||
testutils.c testutils.h
|
testutils.c testutils.h
|
||||||
networkxml2conftest_LDADD = ../src/libvirt_driver_network_impl.la $(LDADDS)
|
networkxml2conftest_LDADD = ../src/libvirt_driver_network_impl.la $(LDADDS)
|
||||||
else
|
else ! WITH_NETWORK
|
||||||
EXTRA_DIST += networkxml2conftest.c
|
EXTRA_DIST += networkxml2conftest.c
|
||||||
endif
|
endif ! WITH_NETWORK
|
||||||
|
|
||||||
if WITH_STORAGE_SHEEPDOG
|
if WITH_STORAGE_SHEEPDOG
|
||||||
storagebackendsheepdogtest_SOURCES = \
|
storagebackendsheepdogtest_SOURCES = \
|
||||||
@ -527,9 +527,9 @@ storagebackendsheepdogtest_SOURCES = \
|
|||||||
testutils.c testutils.h
|
testutils.c testutils.h
|
||||||
storagebackendsheepdogtest_LDADD = \
|
storagebackendsheepdogtest_LDADD = \
|
||||||
../src/libvirt_driver_storage_impl.la $(LDADDS)
|
../src/libvirt_driver_storage_impl.la $(LDADDS)
|
||||||
else
|
else ! WITH_STORAGE_SHEEPDOG
|
||||||
EXTRA_DIST += storagebackendsheepdogtest.c
|
EXTRA_DIST += storagebackendsheepdogtest.c
|
||||||
endif
|
endif ! WITH_STORAGE_SHEEPDOG
|
||||||
|
|
||||||
nwfilterxml2xmltest_SOURCES = \
|
nwfilterxml2xmltest_SOURCES = \
|
||||||
nwfilterxml2xmltest.c \
|
nwfilterxml2xmltest.c \
|
||||||
@ -542,9 +542,9 @@ storagevolxml2argvtest_SOURCES = \
|
|||||||
testutils.c testutils.h
|
testutils.c testutils.h
|
||||||
storagevolxml2argvtest_LDADD = \
|
storagevolxml2argvtest_LDADD = \
|
||||||
../src/libvirt_driver_storage_impl.la $(LDADDS)
|
../src/libvirt_driver_storage_impl.la $(LDADDS)
|
||||||
else
|
else ! WITH_STORAGE
|
||||||
EXTRA_DIST += storagevolxml2argvtest.c
|
EXTRA_DIST += storagevolxml2argvtest.c
|
||||||
endif
|
endif ! WITH_STORAGE
|
||||||
|
|
||||||
storagevolxml2xmltest_SOURCES = \
|
storagevolxml2xmltest_SOURCES = \
|
||||||
storagevolxml2xmltest.c \
|
storagevolxml2xmltest.c \
|
||||||
@ -598,9 +598,9 @@ libvirtdconftest_SOURCES = \
|
|||||||
libvirtdconftest.c testutils.h testutils.c \
|
libvirtdconftest.c testutils.h testutils.c \
|
||||||
../daemon/libvirtd-config.c
|
../daemon/libvirtd-config.c
|
||||||
libvirtdconftest_LDADD = $(LDADDS)
|
libvirtdconftest_LDADD = $(LDADDS)
|
||||||
else
|
else ! WITH_LIBVIRTD
|
||||||
EXTRA_DIST += libvirtdconftest.c
|
EXTRA_DIST += libvirtdconftest.c
|
||||||
endif
|
endif ! WITH_LIBVIRTD
|
||||||
|
|
||||||
virnetmessagetest_SOURCES = \
|
virnetmessagetest_SOURCES = \
|
||||||
virnetmessagetest.c testutils.h testutils.c
|
virnetmessagetest.c testutils.h testutils.c
|
||||||
@ -627,15 +627,15 @@ virnettlscontexttest_SOURCES += pkix_asn1_tab.c
|
|||||||
virnettlscontexttest_LDADD += -ltasn1
|
virnettlscontexttest_LDADD += -ltasn1
|
||||||
virnettlssessiontest_SOURCES += pkix_asn1_tab.c
|
virnettlssessiontest_SOURCES += pkix_asn1_tab.c
|
||||||
virnettlssessiontest_LDADD += -ltasn1
|
virnettlssessiontest_LDADD += -ltasn1
|
||||||
else
|
else ! HAVE_LIBTASN1
|
||||||
EXTRA_DIST += pkix_asn1_tab.c
|
EXTRA_DIST += pkix_asn1_tab.c
|
||||||
endif
|
endif ! HAVE_LIBTASN1
|
||||||
else
|
else ! WITH_GNUTLS
|
||||||
EXTRA_DIST += \
|
EXTRA_DIST += \
|
||||||
virnettlscontexttest.c virnettlssessiontest.c \
|
virnettlscontexttest.c virnettlssessiontest.c \
|
||||||
virnettlshelpers.h virnettlshelpers.c \
|
virnettlshelpers.h virnettlshelpers.c \
|
||||||
testutils.h testutils.c pkix_asn1_tab.c
|
testutils.h testutils.c pkix_asn1_tab.c
|
||||||
endif
|
endif ! WITH_GNUTLS
|
||||||
|
|
||||||
virtimetest_SOURCES = \
|
virtimetest_SOURCES = \
|
||||||
virtimetest.c testutils.h testutils.c
|
virtimetest.c testutils.h testutils.c
|
||||||
@ -698,9 +698,9 @@ virsystemdmock_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
|
|||||||
virsystemdmock_la_LDFLAGS = -module -avoid-version \
|
virsystemdmock_la_LDFLAGS = -module -avoid-version \
|
||||||
-rpath /evil/libtool/hack/to/force/shared/lib/creation
|
-rpath /evil/libtool/hack/to/force/shared/lib/creation
|
||||||
|
|
||||||
else
|
else ! WITH_DBUS
|
||||||
EXTRA_DIST += virdbustest.c virsystemdtest.c virsystemdmock.c
|
EXTRA_DIST += virdbustest.c virsystemdtest.c virsystemdmock.c
|
||||||
endif
|
endif ! WITH_DBUS
|
||||||
|
|
||||||
viruritest_SOURCES = \
|
viruritest_SOURCES = \
|
||||||
viruritest.c testutils.h testutils.c
|
viruritest.c testutils.h testutils.c
|
||||||
@ -722,9 +722,9 @@ if WITH_SECDRIVER_SELINUX
|
|||||||
if WITH_ATTR
|
if WITH_ATTR
|
||||||
if WITH_TESTS
|
if WITH_TESTS
|
||||||
noinst_LTLIBRARIES += libsecurityselinuxhelper.la
|
noinst_LTLIBRARIES += libsecurityselinuxhelper.la
|
||||||
else
|
else ! WITH_TESTS
|
||||||
check_LTLIBRARIES += libsecurityselinuxhelper.la
|
check_LTLIBRARIES += libsecurityselinuxhelper.la
|
||||||
endif
|
endif ! WITH_TESTS
|
||||||
|
|
||||||
libsecurityselinuxhelper_la_SOURCES = \
|
libsecurityselinuxhelper_la_SOURCES = \
|
||||||
securityselinuxhelper.c
|
securityselinuxhelper.c
|
||||||
@ -744,9 +744,9 @@ securityselinuxlabeltest_SOURCES = \
|
|||||||
securityselinuxlabeltest_LDADD = $(qemu_LDADDS) $(SELINUX_LIBS)
|
securityselinuxlabeltest_LDADD = $(qemu_LDADDS) $(SELINUX_LIBS)
|
||||||
securityselinuxlabeltest_DEPENDENCIES = libsecurityselinuxhelper.la \
|
securityselinuxlabeltest_DEPENDENCIES = libsecurityselinuxhelper.la \
|
||||||
../src/libvirt.la
|
../src/libvirt.la
|
||||||
endif
|
endif WITH_QEMU
|
||||||
endif
|
endif WITH_ATTR
|
||||||
endif
|
endif WITH_SECDRIVER_SELINUX
|
||||||
EXTRA_DIST += securityselinuxtest.c securityselinuxlabeltest.c \
|
EXTRA_DIST += securityselinuxtest.c securityselinuxlabeltest.c \
|
||||||
securityselinuxhelper.c
|
securityselinuxhelper.c
|
||||||
|
|
||||||
@ -782,13 +782,13 @@ if WITH_DRIVER_MODULES
|
|||||||
virdrivermoduletest_SOURCES = \
|
virdrivermoduletest_SOURCES = \
|
||||||
virdrivermoduletest.c testutils.h testutils.c
|
virdrivermoduletest.c testutils.h testutils.c
|
||||||
virdrivermoduletest_LDADD = $(LDADDS)
|
virdrivermoduletest_LDADD = $(LDADDS)
|
||||||
endif
|
endif WITH_DRIVER_MODULES
|
||||||
|
|
||||||
if WITH_LIBVIRTD
|
if WITH_LIBVIRTD
|
||||||
eventtest_SOURCES = \
|
eventtest_SOURCES = \
|
||||||
eventtest.c testutils.h testutils.c
|
eventtest.c testutils.h testutils.c
|
||||||
eventtest_LDADD = -lrt $(LDADDS)
|
eventtest_LDADD = -lrt $(LDADDS)
|
||||||
endif
|
endif WITH_LIBVIRTD
|
||||||
|
|
||||||
libshunload_la_SOURCES = shunloadhelper.c
|
libshunload_la_SOURCES = shunloadhelper.c
|
||||||
libshunload_la_LIBADD = ../src/libvirt.la
|
libshunload_la_LIBADD = ../src/libvirt.la
|
||||||
@ -830,9 +830,9 @@ object-locking: object-locking.cmx object-locking-files.txt
|
|||||||
object-locking-files.txt:
|
object-locking-files.txt:
|
||||||
find $(top_builddir)/src/ -name '*.i' > $@
|
find $(top_builddir)/src/ -name '*.i' > $@
|
||||||
|
|
||||||
else
|
else ! WITH_CIL
|
||||||
EXTRA_DIST += object-locking.ml
|
EXTRA_DIST += object-locking.ml
|
||||||
endif
|
endif ! WITH_CIL
|
||||||
|
|
||||||
CLEANFILES = *.cov *.gcov .libs/*.gcda .libs/*.gcno *.gcno *.gcda *.cmi *.cmx \
|
CLEANFILES = *.cov *.gcov .libs/*.gcda .libs/*.gcno *.gcno *.gcda *.cmi *.cmx \
|
||||||
object-locking-files.txt
|
object-locking-files.txt
|
||||||
|
@ -69,7 +69,7 @@ libexec_SCRIPTS = libvirt-guests.sh
|
|||||||
if WITH_SANLOCK
|
if WITH_SANLOCK
|
||||||
sbin_SCRIPTS = virt-sanlock-cleanup
|
sbin_SCRIPTS = virt-sanlock-cleanup
|
||||||
DISTCLEANFILES += virt-sanlock-cleanup
|
DISTCLEANFILES += virt-sanlock-cleanup
|
||||||
endif
|
endif WITH_SANLOCK
|
||||||
|
|
||||||
if WITH_LXC
|
if WITH_LXC
|
||||||
conf_DATA += virt-login-shell.conf
|
conf_DATA += virt-login-shell.conf
|
||||||
@ -87,7 +87,7 @@ dist_man1_MANS += virt-login-shell.1
|
|||||||
endif WITH_LXC
|
endif WITH_LXC
|
||||||
if WITH_SANLOCK
|
if WITH_SANLOCK
|
||||||
dist_man8_MANS = virt-sanlock-cleanup.8
|
dist_man8_MANS = virt-sanlock-cleanup.8
|
||||||
endif
|
endif WITH_SANLOCK
|
||||||
|
|
||||||
virt-xml-validate: virt-xml-validate.in Makefile
|
virt-xml-validate: virt-xml-validate.in Makefile
|
||||||
$(AM_V_GEN)sed -e 's|[@]schemadir@|$(pkgdatadir)/schemas|g' \
|
$(AM_V_GEN)sed -e 's|[@]schemadir@|$(pkgdatadir)/schemas|g' \
|
||||||
@ -229,7 +229,7 @@ virsh_win_icon.$(OBJEXT): virsh_win_icon.rc
|
|||||||
$(AM_V_GEN)$(WINDRES) \
|
$(AM_V_GEN)$(WINDRES) \
|
||||||
--input-format rc --input $< \
|
--input-format rc --input $< \
|
||||||
--output-format coff --output $@
|
--output-format coff --output $@
|
||||||
endif
|
endif WITH_WIN_ICON
|
||||||
|
|
||||||
virt-login-shell.1: virt-login-shell.pod $(top_srcdir)/configure.ac
|
virt-login-shell.1: virt-login-shell.pod $(top_srcdir)/configure.ac
|
||||||
$(AM_V_GEN)$(POD2MAN) $< $(srcdir)/$@ \
|
$(AM_V_GEN)$(POD2MAN) $< $(srcdir)/$@ \
|
||||||
@ -270,10 +270,10 @@ if LIBVIRT_INIT_SCRIPT_RED_HAT
|
|||||||
BUILT_SOURCES += libvirt-guests.init
|
BUILT_SOURCES += libvirt-guests.init
|
||||||
install-init: install-sysconfig install-initscript
|
install-init: install-sysconfig install-initscript
|
||||||
uninstall-init: uninstall-sysconfig uninstall-initscript
|
uninstall-init: uninstall-sysconfig uninstall-initscript
|
||||||
else
|
else ! LIBVIRT_INIT_SCRIPT_RED_HAT
|
||||||
install-init:
|
install-init:
|
||||||
uninstall-init:
|
uninstall-init:
|
||||||
endif # LIBVIRT_INIT_SCRIPT_RED_HAT
|
endif ! LIBVIRT_INIT_SCRIPT_RED_HAT
|
||||||
|
|
||||||
libvirt-guests.sh: libvirt-guests.sh.in $(top_builddir)/config.status
|
libvirt-guests.sh: libvirt-guests.sh.in $(top_builddir)/config.status
|
||||||
$(AM_V_GEN)sed \
|
$(AM_V_GEN)sed \
|
||||||
@ -311,10 +311,10 @@ uninstall-systemd: uninstall-sysconfig
|
|||||||
|
|
||||||
BUILT_SOURCES += libvirt-guests.service
|
BUILT_SOURCES += libvirt-guests.service
|
||||||
|
|
||||||
else
|
else ! LIBVIRT_INIT_SCRIPT_SYSTEMD
|
||||||
install-systemd:
|
install-systemd:
|
||||||
uninstall-systemd:
|
uninstall-systemd:
|
||||||
endif # LIBVIRT_INIT_SCRIPT_SYSTEMD
|
endif ! LIBVIRT_INIT_SCRIPT_SYSTEMD
|
||||||
|
|
||||||
libvirt-guests.service: libvirt-guests.service.in $(top_builddir)/config.status
|
libvirt-guests.service: libvirt-guests.service.in $(top_builddir)/config.status
|
||||||
$(AM_V_GEN)sed \
|
$(AM_V_GEN)sed \
|
||||||
|
Loading…
Reference in New Issue
Block a user