Fix windows build & build without QEMU driver

diff --git a/ChangeLog b/ChangeLog
index 8a6cc8337ed27cf30af90069cca874b79cc828a2..7b1dac780dc26f86b5245e98a752b8c15e856df5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
        Generate domain events for QEMU driver config files

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

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