From: "Daniel P. Berrange" <berrange@xxxxxxxxxx>
Pushing as a build-fix
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@xxxxxxxxxx>
---
daemon/Makefile.am | 4 ++--
src/Makefile.am | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 5d4c1a7..e049942 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -112,7 +112,7 @@ libvirtd_LDADD = \
$(POLKIT_LIBS)
if WITH_DTRACE_PROBES
-libvirtd_LDADD += ../src/libvirt_probes.o
+libvirtd_LDADD += ../src/libvirt_probes.lo
endif
libvirtd_LDADD += \
@@ -122,7 +122,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 1f98bac..fe86820 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1247,7 +1247,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
@@ -1258,7 +1258,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
--
1.7.7.6
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list