mirror of
https://github.com/libvirt/libvirt.git
synced 2025-02-25 18:55:26 -06:00
Avoid link errors with "configure --disable-shared".
* src/Makefile.am: Create a convenience library, libvirt_test.la, and don't restrict access to *its* symbols. * tests/Makefile.am (LDADDS): Add ../src/libvirt_test.la, so that "configure --disable-shared" no longer provokes link errors. (LIBVIRT): Remove definition. (LDADDS): Remove use. ($(LIBVIRT)): Remove rule. (LDADDS): Use the new convenience library instead. (CLEANFILES): Define. * docs/examples/index.py (dump_Makefile): Append $(COVERAGE_LDFLAGS), to the LDADDS definition, to avoid link error with the combination of --enable-test-coverage and --disable-shared. * docs/examples/Makefile.am: Regenerate. * docs/examples/index.html: Likewise. * qemud/Makefile.am (libvirtd_LDFLAGS): Append $(COVERAGE_LDFLAGS). * src/libvirt_sym.version: Remove some SP-before-TAB.
This commit is contained in:
@@ -3,14 +3,6 @@
|
||||
SUBDIRS = virshdata confdata sexpr2xmldata \
|
||||
xml2sexprdata xmconfigdata xencapsdata
|
||||
|
||||
# Wierd libtool related juju...
|
||||
#
|
||||
# We explicitly want wildcard here instead of just linking
|
||||
# to the libvirt.a file. This ensures that when coverage
|
||||
# tests are run, all the output data ends up in the correct
|
||||
# location. ie, src/ instead of src/.libs.
|
||||
LIBVIRT = $(wildcard $(top_builddir)/src/.libs/libvirt_la-*.o)
|
||||
|
||||
INCLUDES = \
|
||||
-I$(top_srcdir)/gnulib/lib -I../gnulib/lib \
|
||||
-I$(top_builddir)/include \
|
||||
@@ -34,7 +26,7 @@ LDADDS = \
|
||||
$(SASL_LIBS) \
|
||||
$(SELINUX_LIBS) \
|
||||
$(WARN_CFLAGS) \
|
||||
$(LIBVIRT) \
|
||||
../src/libvirt_test.la \
|
||||
../gnulib/lib/libgnu.la \
|
||||
$(COVERAGE_LDFLAGS)
|
||||
|
||||
@@ -132,5 +124,4 @@ reconnect_SOURCES = \
|
||||
reconnect.c
|
||||
reconnect_LDADD = $(LDADDS)
|
||||
|
||||
$(LIBVIRT):
|
||||
-@(cd $(top_builddir)/src && $(MAKE) MAKEFLAGS+=--silent)
|
||||
CLEANFILES = *.cov *.gcov .libs/*.gcda .libs/*.gcno *.gcno *.gcda
|
||||
|
||||
Reference in New Issue
Block a user