]> xenbits.xensource.com Git - libvirt.git/commitdiff
build: src: fix libtool dependency issue
authorPavel Hrdina <phrdina@redhat.com>
Thu, 24 Oct 2019 10:11:18 +0000 (12:11 +0200)
committerPavel Hrdina <phrdina@redhat.com>
Thu, 24 Oct 2019 10:40:45 +0000 (12:40 +0200)
Libtool gets a wrong order of arguments of libraries to install and it
fails when installing libvirt-admin.so that libvirt.so is not yet
installed.  Caused by commit <3097282d8668693eb4b7c3fb1b4fe5b474996b9c>.

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
src/Makefile.am

index 34dfeeb9f9d423a5aac51d7820102d8854db68ee..ebc24610e255b1162637ee5d913bce0f6483692f 100644 (file)
@@ -100,6 +100,10 @@ COMMON_UNIT_VARS = \
        -e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \
        $(NULL)
 
+# Set these variables before we include any of the subdirs as libvirt-admin.la
+# has to be installed after libvirt.la.
+lib_LTLIBRARIES += libvirt.la libvirt-qemu.la libvirt-lxc.la
+
 include util/Makefile.inc.am
 include conf/Makefile.inc.am
 include cpu/Makefile.inc.am
@@ -146,8 +150,6 @@ SECDRIVER_LIBS += $(APPARMOR_LIBS)
 endif WITH_SECDRIVER_APPARMOR
 
 
-lib_LTLIBRARIES += libvirt.la libvirt-qemu.la libvirt-lxc.la
-
 moddir = $(libdir)/libvirt/connection-driver
 
 confdir = $(sysconfdir)/libvirt