]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
build: fix missing dependencies for libvirt-qemu.so
authorEric Blake <eblake@redhat.com>
Tue, 29 May 2012 18:41:06 +0000 (12:41 -0600)
committerEric Blake <eblake@redhat.com>
Tue, 29 May 2012 18:51:36 +0000 (12:51 -0600)
The moment you specify a _DEPENDENCIES, older automake (stupidly)
assumes that you will specify _all_ dependencies for that target.
This stupidity has been fixed in automake 1.12, but we cannot rely on
newer automake everywhere.  For libvirt_la_DEPENDENCIES, we took
care of providing the full list, but for libvirt_qemu_la_DEPENDENCIES,
we were missing the dependency on libvirt_qemu_impl.la, which resulted
in a failed build:

make[3]: Entering directory `/home/ajia/Workspace/libvirt/src'
   CCLD   libvirt_driver_qemu.la
libtool: link: `libvirt_qemu_probes.lo' is not a valid libtool object

* src/Makefile.am (libvirt_driver_qemu_la_DEPENDENCIES): Delete;
automake does a better job if it does the entire job.

src/Makefile.am

index e172e55b1059aa8972c09f72f6b1b9f01099deac..533e78ae0721dadb2c181c89665dbd3ef08d4c92 100644 (file)
@@ -1294,7 +1294,6 @@ 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.lo libvirt_qemu_probes.o
 
 $(libvirt_driver_qemu_la_SOURCES): libvirt_qemu_probes.h
 endif