From: Daniel P. Berrange <berrange@redhat.com>
Date: Mon, 28 May 2012 11:33:23 +0000 (+0100)
Subject: Fix linking to DTrace probes file
X-Git-Tag: v0.9.13-rc1~187
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1e8ecfedeb41d229d43f720de83a85380fa70d66;p=thirdparty%2Flibvirt.git

Fix linking to DTrace probes file

There was no rule forcing libvirt_qemu_probes.o to be built
before libvirt_qemu_probes.lo was used. Also libvirtd was
still referencing the .o file, rather than the .lo file.

Both the .lo and .o file must be listed as DEPENDENCIES,
otherwise libtool will unhelpfully delete the .o file
once the .lo file is created.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---

diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 187fa9396a..daf24ea48a 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -114,7 +114,7 @@ libvirtd_LDADD =					\
 	$(POLKIT_LIBS)
 
 if WITH_DTRACE_PROBES
-libvirtd_LDADD += ../src/libvirt_probes.o
+libvirtd_LDADD += ../src/libvirt_probes.lo
 endif
 
 libvirtd_LDADD += \
@@ -124,7 +124,7 @@ if ! WITH_DRIVER_MODULES
 if WITH_QEMU
     libvirtd_LDADD += ../src/libvirt_driver_qemu.la
 if WITH_DTRACE_PROBES
-    libvirtd_LDADD += ../src/libvirt_qemu_probes.o
+    libvirtd_LDADD += ../src/libvirt_qemu_probes.lo
 endif
 endif
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 18942620a4..f840e5311b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1271,7 +1271,7 @@ libvirt_la_DEPENDENCIES = $(libvirt_la_BUILT_LIBADD) $(LIBVIRT_SYMBOL_FILE)
 
 if WITH_DTRACE_PROBES
 libvirt_la_BUILT_LIBADD += libvirt_probes.lo
-libvirt_la_DEPENDENCIES += libvirt_probes.o
+libvirt_la_DEPENDENCIES += libvirt_probes.lo libvirt_probes.o
 nodist_libvirt_la_SOURCES = libvirt_probes.h
 if WITH_REMOTE
 $(REMOTE_DRIVER_GENERATED): libvirt_probes.h
@@ -1282,7 +1282,7 @@ BUILT_SOURCES += libvirt_probes.h libvirt_probes.stp libvirt_functions.stp
 if WITH_QEMU
 libvirt_driver_qemu_la_LIBADD += libvirt_qemu_probes.lo
 nodist_libvirt_driver_qemu_la_SOURCES = libvirt_qemu_probes.h
-libvirt_driver_qemu_la_DEPENDENCIES = libvirt_qemu_probes.o
+libvirt_driver_qemu_la_DEPENDENCIES = libvirt_qemu_probes.lo libvirt_qemu_probes.o
 
 $(libvirt_driver_qemu_la_SOURCES): libvirt_qemu_probes.h
 endif