meson: remove '.libs' from all relevant paths

Meson doesn't use .libs directory, everything is placed directly into
directories where meson.build file is used.

In order to have working tests and running libvirt directly from GIT we
need to fix all the paths pointing '.libs' directory.

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Neal Gompa <ngompa13@gmail.com>

diff --git a/examples/systemtap/lock-debug.stp b/examples/systemtap/lock-debug.stp
index 0c9cc3869249e2fc43805fb1a183ef70dc07435c..a68a38556957fafa3c6212f18ce23865a7b68307 100644 (file)
--- a/examples/systemtap/lock-debug.stp
+++ b/examples/systemtap/lock-debug.stp
@@ -12,7 +12,7 @@
 # source git directory, it should be only slight modification to the following:
 #
 #     ./run stap --ldd -c src/libvirtd -d src/libvirtd
-#       examples/systemtap/lock-debug.stp src/.libs/libvirt.so
+#       examples/systemtap/lock-debug.stp src/libvirt.so
 #
 # Debug RWLock mechanisms as well.
 #

diff --git a/run.in b/run.in
index d508e64802059cb5ea3349718f1a108ff2198fe3..1a0dee4d9ee854fefb2b237ffdd475c484549640 100644 (file)
--- a/run.in
+++ b/run.in
@@ -50,7 +50,7 @@ prepend()
 # Find this script.
 b=@abs_builddir@
 
-prepend LD_LIBRARY_PATH "$b/src/.libs"
+prepend LD_LIBRARY_PATH "$b/src"
 export LD_LIBRARY_PATH
 
 prepend PKG_CONFIG_PATH "$b/src"

diff --git a/src/driver.c b/src/driver.c
index e7452106ed9bd6e73a164989f8cce1ec98d8854f..37bf9de3921200778a79e448d2062314684ef05d 100644 (file)
--- a/src/driver.c
+++ b/src/driver.c
@@ -56,7 +56,7 @@ virDriverLoadModule(const char *name,
     if (!(modfile = virFileFindResourceFull(name,
                                             "libvirt_driver_",
                                             ".so",
-                                            abs_top_builddir "/src/.libs",
+                                            abs_top_builddir "/src",
                                             DEFAULT_DRIVER_DIR,
                                             "LIBVIRT_DRIVER_DIR")))
         return -1;

diff --git a/src/libvirt-lxc.pc.in b/src/libvirt-lxc.pc.in
index 9243bcf90349935782865806b81f29bcf8c5c707..f6d4dd71e7ea04182e7fb225203cc27b0714a72c 100644 (file)
--- a/src/libvirt-lxc.pc.in
+++ b/src/libvirt-lxc.pc.in
@@ -4,7 +4,7 @@
 
 prefix=@abs_top_builddir@
 exec_prefix=@abs_top_builddir@
-libdir=@abs_top_builddir@/src/.libs
+libdir=@abs_top_builddir@/src
 includedir=@abs_top_builddir@/include
 source_includedir=@abs_top_srcdir@/include
 datarootdir=@abs_top_builddir@

diff --git a/src/libvirt-qemu.pc.in b/src/libvirt-qemu.pc.in
index a4f9e65c03e76c5d812138ba5ef8fb3514701e50..b224679d7e31005fbcbf0703313fe58c4232b19d 100644 (file)
--- a/src/libvirt-qemu.pc.in
+++ b/src/libvirt-qemu.pc.in
@@ -4,7 +4,7 @@
 
 prefix=@abs_top_builddir@
 exec_prefix=@abs_top_builddir@
-libdir=@abs_top_builddir@/src/.libs
+libdir=@abs_top_builddir@/src
 includedir=@abs_top_builddir@/include
 source_includedir=@abs_top_srcdir@/include
 datarootdir=@abs_top_builddir@

diff --git a/src/libvirt.pc.in b/src/libvirt.pc.in
index a16e4552105ffca4112ef96c88578251f84ba2a5..93a42a457b4eb3037f66ee9cc9869cc3de51cd72 100644 (file)
--- a/src/libvirt.pc.in
+++ b/src/libvirt.pc.in
@@ -4,7 +4,7 @@
 
 prefix=@abs_top_builddir@
 exec_prefix=@abs_top_builddir@
-libdir=@abs_top_builddir@/src/.libs
+libdir=@abs_top_builddir@/src
 includedir=@abs_top_builddir@/include
 source_includedir=@abs_top_srcdir@/include
 datarootdir=@abs_top_builddir@

diff --git a/src/locking/lock_manager.c b/src/locking/lock_manager.c
index 07318fb53f0b4f7da0212193a8eda4c2fcfb7344..39e482f11cd1c6433b3c1bc54b053f1fb76b03fa 100644 (file)
--- a/src/locking/lock_manager.c
+++ b/src/locking/lock_manager.c
@@ -139,7 +139,7 @@ virLockManagerPluginPtr virLockManagerPluginNew(const char *name,
         if (!(modfile = virFileFindResourceFull(name,
                                                 NULL,
                                                 ".so",
-                                                abs_top_builddir "/src/.libs",
+                                                abs_top_builddir "/src",
                                                 LIBDIR "/libvirt/lock-driver",
                                                 "LIBVIRT_LOCK_MANAGER_PLUGIN_DIR")))
             goto cleanup;

diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c
index e9f6663e6d16078fb0808d1b5572f54753effd1f..1f83236f2fc68afab18d6dbd5b04e4d7c8888f53 100644 (file)
--- a/src/storage/storage_backend.c
+++ b/src/storage/storage_backend.c
@@ -92,7 +92,7 @@ virStorageDriverLoadBackendModule(const char *name,
     if (!(modfile = virFileFindResourceFull(name,
                                             "libvirt_storage_backend_",
                                             ".so",
-                                            abs_top_builddir "/src/.libs",
+                                            abs_top_builddir "/src",
                                             STORAGE_BACKEND_MODULE_DIR,
                                             "LIBVIRT_STORAGE_BACKEND_DIR")))
         return -1;

diff --git a/src/util/virstoragefilebackend.c b/src/util/virstoragefilebackend.c
index f362436d9ba683558a8bd9227d5ec835401df151..bf452a1dc5dc315322bb98ffd9b8d4ef007e88bb 100644 (file)
--- a/src/util/virstoragefilebackend.c
+++ b/src/util/virstoragefilebackend.c
@@ -57,7 +57,7 @@ virStorageFileLoadBackendModule(const char *name,
     if (!(modfile = virFileFindResourceFull(name,
                                             "libvirt_storage_file_",
                                             ".so",
-                                            abs_top_builddir "/src/.libs",
+                                            abs_top_builddir "/src",
                                             STORAGE_FILE_MODULE_DIR,
                                             "LIBVIRT_STORAGE_FILE_DIR")))
         return -1;

diff --git a/tests/securityselinuxlabeltest.c b/tests/securityselinuxlabeltest.c
index 50b447c1637b263580ad5995960e8adbb5feae0d..2989a668b7563b0efa382039417ee04870d25d6d 100644 (file)
--- a/tests/securityselinuxlabeltest.c
+++ b/tests/securityselinuxlabeltest.c
@@ -374,4 +374,4 @@ mymain(void)
 
 VIR_TEST_MAIN_PRELOAD(mymain,
                       VIR_TEST_MOCK("domaincaps"),
-                      abs_builddir "/.libs/libsecurityselinuxhelper.so")
+                      abs_builddir "/libsecurityselinuxhelper.so")

diff --git a/tests/securityselinuxtest.c b/tests/securityselinuxtest.c
index 3f069c2d6bea5867395d97fc2b2e12977e746538..ae4b08b9d8a531090bbf79fa8189220e9cbcb05b 100644 (file)
--- a/tests/securityselinuxtest.c
+++ b/tests/securityselinuxtest.c
@@ -339,4 +339,4 @@ mymain(void)
     return (ret == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/libsecurityselinuxhelper.so")
+VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/libsecurityselinuxhelper.so")

diff --git a/tests/shunloadtest.c b/tests/shunloadtest.c
index b377c07294ffd608537a78c7ab6ff2b3e926a88a..d4ab3cd5acf12d520567f3bd8cf032069b0884f1 100644 (file)
--- a/tests/shunloadtest.c
+++ b/tests/shunloadtest.c
@@ -105,8 +105,8 @@ int main(int argc G_GNUC_UNUSED, char **argv)
     fprintf(stderr, "      .%*s 1   ", 39, "");
     signal(SIGSEGV, sigHandler);
 
-    if (!(lib = dlopen("./.libs/libshunload.so", RTLD_LAZY))) {
-        fprintf(stderr, "Cannot load ./.libs/libshunload.so %s\n", dlerror());
+    if (!(lib = dlopen(abs_builddir "/libshunload.so", RTLD_LAZY))) {
+        fprintf(stderr, "Cannot load ./libshunload.so %s\n", dlerror());
         return 1;
     }
     if (!(startup = dlsym(lib, "shunloadStart"))) {

diff --git a/tests/testutils.h b/tests/testutils.h
index 3f32aa720024079ab8737995cf2605a269775f7b..ff5c98a07853b3f0ebd1c5ecf01bb26468ed402f 100644 (file)
--- a/tests/testutils.h
+++ b/tests/testutils.h
@@ -140,7 +140,7 @@ int virTestMain(int argc,
         return virTestMain(argc, argv, func, __VA_ARGS__, NULL); \
     }
 
-#define VIR_TEST_MOCK(mock) (abs_builddir "/.libs/lib" mock "mock" MOCK_EXT)
+#define VIR_TEST_MOCK(mock) (abs_builddir "/lib" mock "mock" MOCK_EXT)
 
 virCapsPtr virTestGenericCapsInit(void);
 virCapsHostNUMAPtr virTestCapsBuildNUMATopology(int seq);

diff --git a/tests/viridentitytest.c b/tests/viridentitytest.c
index 9a8c8914d36721cb631181fa9ed144f3521eaeb3..fd01eeaa80b3e424e06e50b391a6fb107ff7c22a 100644 (file)
--- a/tests/viridentitytest.c
+++ b/tests/viridentitytest.c
@@ -158,7 +158,7 @@ mymain(void)
 }
 
 #if WITH_SELINUX
-VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/libsecurityselinuxhelper.so")
+VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/libsecurityselinuxhelper.so")
 #else
 VIR_TEST_MAIN(mymain)
 #endif

diff --git a/tests/virt-aa-helper-test b/tests/virt-aa-helper-test
index 6a6703ecf5cc715c877209b90aecdf62ef48e967..8dbe82a6b982ff648277622a6f4f2979a9736cc8 100755 (executable)
--- a/tests/virt-aa-helper-test
+++ b/tests/virt-aa-helper-test
@@ -15,7 +15,7 @@ fi
 
 output="/dev/null"
 use_valgrind=""
-ld_library_path="../src/.libs/"
+ld_library_path="../src/"
 if [ ! -z "$1" ] && [ "$1" = "-d" ]; then
     output="/dev/stdout"
     shift