提交 b5bb62a6 编写于 作者: P Pavel Hrdina

build: src: fix libtool dependency issue

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 <3097282d>.
Signed-off-by: NPavel Hrdina <phrdina@redhat.com>
Reviewed-by: NDaniel P. Berrangé <berrange@redhat.com>
上级 3b4df5d3
...@@ -100,6 +100,10 @@ COMMON_UNIT_VARS = \ ...@@ -100,6 +100,10 @@ COMMON_UNIT_VARS = \
-e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \ -e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \
$(NULL) $(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 util/Makefile.inc.am
include conf/Makefile.inc.am include conf/Makefile.inc.am
include cpu/Makefile.inc.am include cpu/Makefile.inc.am
...@@ -146,8 +150,6 @@ SECDRIVER_LIBS += $(APPARMOR_LIBS) ...@@ -146,8 +150,6 @@ SECDRIVER_LIBS += $(APPARMOR_LIBS)
endif WITH_SECDRIVER_APPARMOR endif WITH_SECDRIVER_APPARMOR
lib_LTLIBRARIES += libvirt.la libvirt-qemu.la libvirt-lxc.la
moddir = $(libdir)/libvirt/connection-driver moddir = $(libdir)/libvirt/connection-driver
confdir = $(sysconfdir)/libvirt confdir = $(sysconfdir)/libvirt
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册