External/libvirt
1
0
Fork 0
Code

Fix windows build & build without QEMU driver

Browse Source
This commit is contained in:
Daniel P. Berrange 2008-11-18 12:46:13 +00:00
parent a5e72f9177
commit 8a1553e43a
3 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Mon Nov 18 12:24:00 GMT 2008 Daniel Berrange <berrange@redhat.com>
* src/Makefile.am: Fix build on MinGW where linker flags
must be listed in LDFLAGS variable
* tests/Makefile.am: Fix build when QEMU is disabled, by
skipping QEMU tests
Mon Nov 17 16:45:00 GMT 2008 Daniel Berrange <berrange@redhat.com> Mon Nov 17 16:45:00 GMT 2008 Daniel Berrange <berrange@redhat.com>
Generate domain events for QEMU driver config files Generate domain events for QEMU driver config files

3
src/Makefile.am
View File

@ -258,11 +258,12 @@ EXTRA_DIST += \
# Empty source list - it merely links a bunch of convenience libs together # Empty source list - it merely links a bunch of convenience libs together
libvirt_la_SOURCES = libvirt_la_SOURCES =
libvirt_la_LIBADD += $(LIBXML_LIBS) $(SELINUX_LIBS) \ libvirt_la_LIBADD += \
@CYGWIN_EXTRA_LIBADD@ ../gnulib/lib/libgnu.la @CYGWIN_EXTRA_LIBADD@ ../gnulib/lib/libgnu.la
libvirt_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libvirt_sym.version \ libvirt_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libvirt_sym.version \
-version-info @LIBVIRT_VERSION_INFO@ \ -version-info @LIBVIRT_VERSION_INFO@ \
$(COVERAGE_CFLAGS:-f%=-Wc,-f%) \ $(COVERAGE_CFLAGS:-f%=-Wc,-f%) \
$(LIBXML_LIBS) $(SELINUX_LIBS) \
@CYGWIN_EXTRA_LDFLAGS@ @MINGW_EXTRA_LDFLAGS@ @CYGWIN_EXTRA_LDFLAGS@ @MINGW_EXTRA_LDFLAGS@
libvirt_la_CFLAGS = $(COVERAGE_CFLAGS) -DIN_LIBVIRT libvirt_la_CFLAGS = $(COVERAGE_CFLAGS) -DIN_LIBVIRT
libvirt_la_DEPENDENCIES = $(libvirt_la_LIBADD) $(srcdir)/libvirt_sym.version libvirt_la_DEPENDENCIES = $(libvirt_la_LIBADD) $(srcdir)/libvirt_sym.version

15
tests/Makefile.am
View File

@ -39,9 +39,13 @@ EXTRA_DIST = \
domainschematest domainschematest
noinst_PROGRAMS = xmlrpctest xml2sexprtest sexpr2xmltest virshtest conftest \ noinst_PROGRAMS = xmlrpctest xml2sexprtest sexpr2xmltest virshtest conftest \
reconnect xmconfigtest xencapstest qemuxml2argvtest qemuxml2xmltest \ reconnect xmconfigtest xencapstest \
nodeinfotest statstest qparamtest nodeinfotest statstest qparamtest
if WITH_QEMU
noinst_PROGRAMS += qemuxml2argvtest qemuxml2xmltest
endif
test_scripts = domainschematest test_scripts = domainschematest
if WITH_LIBVIRTD if WITH_LIBVIRTD
test_scripts += \ test_scripts += \
@ -58,11 +62,14 @@ endif
EXTRA_DIST += $(test_scripts) EXTRA_DIST += $(test_scripts)
TESTS = xml2sexprtest sexpr2xmltest virshtest xmconfigtest \ TESTS = xml2sexprtest sexpr2xmltest virshtest xmconfigtest \
xencapstest qemuxml2argvtest qemuxml2xmltest nodeinfotest \ xencapstest nodeinfotest \
statstest qparamtest $(test_scripts) statstest qparamtest $(test_scripts)
if ENABLE_XEN_TESTS if ENABLE_XEN_TESTS
TESTS += reconnect TESTS += reconnect
endif endif
if WITH_QEMU
TESTS += qemuxml2argvtest qemuxml2xmltest
endif
path_add = $$abs_top_builddir/src$(PATH_SEPARATOR)$$abs_top_builddir/qemud path_add = $$abs_top_builddir/src$(PATH_SEPARATOR)$$abs_top_builddir/qemud
@ -105,6 +112,7 @@ xmconfigtest_SOURCES = \
testutils.c testutils.h testutils.c testutils.h
xmconfigtest_LDADD = $(LDADDS) xmconfigtest_LDADD = $(LDADDS)
if WITH_QEMU
qemuxml2argvtest_SOURCES = \ qemuxml2argvtest_SOURCES = \
qemuxml2argvtest.c testutilsqemu.c testutilsqemu.h \ qemuxml2argvtest.c testutilsqemu.c testutilsqemu.h \
testutils.c testutils.h testutils.c testutils.h
@ -114,6 +122,9 @@ qemuxml2xmltest_SOURCES = \
qemuxml2xmltest.c testutilsqemu.c testutilsqemu.h \ qemuxml2xmltest.c testutilsqemu.c testutilsqemu.h \
testutils.c testutils.h testutils.c testutils.h
qemuxml2xmltest_LDADD = ../src/libvirt_driver_qemu.la $(LDADDS) qemuxml2xmltest_LDADD = ../src/libvirt_driver_qemu.la $(LDADDS)
else
EXTRA_DIST += qemuxml2argvtest.c qemuxml2xmltest.c testutilsqemu.c testutilsqemu.h
endif
virshtest_SOURCES = \ virshtest_SOURCES = \
virshtest.c \ virshtest.c \