storage: fix sheepdog driver / test linking to avoid duplicating source

The libvirt_storage_backend_sheepdog_priv.la library depends on symbols
provided in the libvirt_driver_storage_impl.la library. As such the
latter must be listed 2nd when passed to the linker to avoid symbol
resolution problems. This mistake is being masked by the sheepdog
driver linking in a second copy of the storage driver code. Remove
this duplicate linkage of backend source and fix the test link order.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

diff --git a/src/Makefile.am b/src/Makefile.am
index d3a01dbbe73341f58f0dfbbeeabc0849d8066e26..8d72f2f1e5c3b4f289a9f7a1303bb6d9696eb0f8 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1359,8 +1359,7 @@ libvirt_storage_backend_sheepdog_la_CFLAGS = \
        $(AM_CFLAGS)
 
 libvirt_storage_backend_sheepdog_priv_la_SOURCES = \
-       $(STORAGE_DRIVER_SHEEPDOG_SOURCES) \
-       $(STORAGE_DRIVER_BACKEND_SOURCES)
+       $(STORAGE_DRIVER_SHEEPDOG_SOURCES)
 libvirt_storage_backend_sheepdog_priv_la_CFLAGS = \
        -I$(srcdir)/conf \
        $(AM_CFLAGS)

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 09647a959d563037ca904ee5b62611a7e00753ea..d794df3e5c9459b153ab2e539063e517a5b31c8b 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -842,8 +842,8 @@ storagebackendsheepdogtest_SOURCES = \
        storagebackendsheepdogtest.c \
        testutils.c testutils.h
 storagebackendsheepdogtest_LDADD = \
-       ../src/libvirt_driver_storage_impl.la \
        ../src/libvirt_storage_backend_sheepdog_priv.la \
+       ../src/libvirt_driver_storage_impl.la \
        $(LDADDS)
 else ! WITH_STORAGE_SHEEPDOG
 EXTRA_DIST += storagebackendsheepdogtest.c