External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-03 11:35:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix mixup between LDFLAGS & LDADD vars

Browse Source
This commit is contained in:
Daniel P. Berrange 2008-12-08 12:04:27 +00:00
parent ca1a1b06d0
commit 62db1b13f7
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
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> Mon Dec 8 11:28:53 GMT 2008 Daniel P. Berrange <berrange@redhat.com>
* src/storage_conf.c: Workaround missing ULLONG_MAX in * src/storage_conf.c: Workaround missing ULLONG_MAX in

15
qemud/Makefile.am
View File

@ -83,13 +83,16 @@ libvirtd_CFLAGS = \
-DREMOTE_PID_FILE="\"$(REMOTE_PID_FILE)\"" \ -DREMOTE_PID_FILE="\"$(REMOTE_PID_FILE)\"" \
-DGETTEXT_PACKAGE=\"$(PACKAGE)\" -DGETTEXT_PACKAGE=\"$(PACKAGE)\"
libvirtd_LDFLAGS = \ libvirtd_LDFLAGS = \
$(WARN_CFLAGS) $(LIBXML_LIBS) $(GNUTLS_LIBS) $(SASL_LIBS) \ $(WARN_CFLAGS) \
$(COVERAGE_LDFLAGS) \ $(COVERAGE_LDFLAGS)
$(POLKIT_LIBS)
libvirtd_LDADD = \ libvirtd_LDADD = \
../gnulib/lib/libgnu.la $(LIBXML_LIBS) \
$(GNUTLS_LIBS) \
$(SASL_LIBS) \
$(POLKIT_LIBS) \
../gnulib/lib/libgnu.la
if ! WITH_DRIVER_MODULES if ! WITH_DRIVER_MODULES
if WITH_QEMU if WITH_QEMU
@ -129,8 +132,6 @@ libvirtd_CFLAGS += $(AVAHI_CFLAGS)
libvirtd_LDADD += $(AVAHI_LIBS) libvirtd_LDADD += $(AVAHI_LIBS)
endif endif
libvirtd_DEPENDENCIES = $(libvirtd_LDADD)
default_xml_dest = libvirt/qemu/networks/default.xml default_xml_dest = libvirt/qemu/networks/default.xml
install-data-local: install-init install-data-sasl install-data-polkit install-data-local: install-init install-data-sasl install-data-polkit