Fix mixup between LDFLAGS & LDADD vars

上级 ca1a1b06
Mon Dec 8 12:00:53 GMT 2008 Daniel P. Berrange <berrange@redhat.com>
* 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 <berrange@redhat.com>
* src/storage_conf.c: Workaround missing ULLONG_MAX in
......
......@@ -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
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册