diff --git a/ChangeLog b/ChangeLog index 3a89826176..f9e787da5e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Dec 8 12:00:53 GMT 2008 Daniel P. Berrange + + * qemud/Makefile.am: Fix mixup between _LDFLAGS & _LDADD + variables to make compilation work in certain configs. + Mon Dec 8 11:28:53 GMT 2008 Daniel P. Berrange * src/storage_conf.c: Workaround missing ULLONG_MAX in diff --git a/qemud/Makefile.am b/qemud/Makefile.am index a4386e0ad2..31a41141f3 100644 --- a/qemud/Makefile.am +++ b/qemud/Makefile.am @@ -83,13 +83,16 @@ libvirtd_CFLAGS = \ -DREMOTE_PID_FILE="\"$(REMOTE_PID_FILE)\"" \ -DGETTEXT_PACKAGE=\"$(PACKAGE)\" -libvirtd_LDFLAGS = \ - $(WARN_CFLAGS) $(LIBXML_LIBS) $(GNUTLS_LIBS) $(SASL_LIBS) \ - $(COVERAGE_LDFLAGS) \ - $(POLKIT_LIBS) +libvirtd_LDFLAGS = \ + $(WARN_CFLAGS) \ + $(COVERAGE_LDFLAGS) libvirtd_LDADD = \ - ../gnulib/lib/libgnu.la + $(LIBXML_LIBS) \ + $(GNUTLS_LIBS) \ + $(SASL_LIBS) \ + $(POLKIT_LIBS) \ + ../gnulib/lib/libgnu.la if ! WITH_DRIVER_MODULES if WITH_QEMU @@ -129,8 +132,6 @@ libvirtd_CFLAGS += $(AVAHI_CFLAGS) libvirtd_LDADD += $(AVAHI_LIBS) endif -libvirtd_DEPENDENCIES = $(libvirtd_LDADD) - default_xml_dest = libvirt/qemu/networks/default.xml install-data-local: install-init install-data-sasl install-data-polkit