meson: rename libbasic to libbasic_static

Our variables for internal libraries are named 'libfoo' for the shared lib
variant, and 'libfoo_static' for the static lib variant. The only exception was
libbasic, because we didn't have a shared variant for it. But let's rename it
for consitency. This makes the build config easier to understand.

diff --git a/meson.build b/meson.build
index 15bb11ecd494174e0cb2fd28d2c8822a67cdc0b3..074ed42a661175edbdfa317177930fd794ae760f 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -2082,7 +2082,7 @@ libsystemd = shared_library(
                      # Make sure our library is never deleted from memory, so that our open logging fds don't leak on dlopen/dlclose cycles.
                      '-z', 'nodelete',
                      '-Wl,--version-script=' + libsystemd_sym_path],
-        link_with : [libbasic],
+        link_with : [libbasic_static],
         link_whole : [libsystemd_static],
         dependencies : [librt,
                         threads,
@@ -2248,7 +2248,7 @@ nss_template = {
         'link_with' : [
                 libsystemd_static,
                 libshared_static,
-                libbasic,
+                libbasic_static,
         ],
         'dependencies' : [
                 librt,

diff --git a/src/basic/meson.build b/src/basic/meson.build
index 9a214575a563b2a8e3ed482ef6c8591db490efbb..b538775576ab9d91d7e4ffb56bfb291d0f38eb66 100644 (file)
--- a/src/basic/meson.build
+++ b/src/basic/meson.build
@@ -274,7 +274,7 @@ filesystem_switch_case_h = custom_target(
 
 basic_sources += [filesystem_list_h, filesystem_switch_case_h, filesystems_gperf_h]
 
-libbasic = static_library(
+libbasic_static = static_library(
         'basic',
         basic_sources,
         fundamental_sources,

diff --git a/src/libsystemd/meson.build b/src/libsystemd/meson.build
index 2b0ad906f8b97a024460578366d4e46b5d71a856..ee7b18da8210942647d7d774c1a3741ba9115892 100644 (file)
--- a/src/libsystemd/meson.build
+++ b/src/libsystemd/meson.build
@@ -125,7 +125,7 @@ libsystemd_static = static_library(
         libsystemd_sources,
         include_directories : libsystemd_includes,
         c_args : libsystemd_c_args,
-        link_with : [libbasic],
+        link_with : [libbasic_static],
         dependencies : [threads,
                         libm,
                         librt,

diff --git a/src/partition/meson.build b/src/partition/meson.build
index 52e13681166968543aac8b854d08d08ac47bdcc5..2cfe43e029bc582a02acc2e30e8c44ed05e4c9b4 100644 (file)
--- a/src/partition/meson.build
+++ b/src/partition/meson.build
@@ -32,7 +32,7 @@ executables += [
                 'sources' : files('repart.c'),
                 'c_args' : '-DSTANDALONE',
                 'link_with' : [
-                        libbasic,
+                        libbasic_static,
                         libshared_fdisk,
                         libshared_static,
                         libsystemd_static,

diff --git a/src/shared/meson.build b/src/shared/meson.build
index ea1e0092869cb216cff5e1d81297d3c568952865..2250af703af5ba8f4c8ea606fcbec6f45f3aa893 100644 (file)
--- a/src/shared/meson.build
+++ b/src/shared/meson.build
@@ -357,7 +357,7 @@ libshared = shared_library(
                      '-Wl,--version-script=' + libshared_sym_path],
         link_depends : libshared_sym_path,
         link_whole : [libshared_static,
-                      libbasic,
+                      libbasic_static,
                       libsystemd_static],
         dependencies : [libshared_deps,
                         userspace],

diff --git a/src/shutdown/meson.build b/src/shutdown/meson.build
index 219f9fd308ece3c1ab054b980afe18564b93a010..9bc60f83e5c199211209c58749f281edac76dfbb 100644 (file)
--- a/src/shutdown/meson.build
+++ b/src/shutdown/meson.build
@@ -20,7 +20,7 @@ executables += [
                 'sources' : systemd_shutdown_sources,
                 'c_args' : '-DSTANDALONE',
                 'link_with' : [
-                        libbasic,
+                        libbasic_static,
                         libshared_static,
                         libsystemd_static,
                 ],

diff --git a/src/sysusers/meson.build b/src/sysusers/meson.build
index 0f9c067d50607848cd8e64905e9f2ae8306bbe6a..403d82a3405e49f056c42250ef51c78998bebecb 100644 (file)
--- a/src/sysusers/meson.build
+++ b/src/sysusers/meson.build
@@ -14,7 +14,7 @@ executables += [
                 'sources' : files('sysusers.c'),
                 'c_args' : '-DSTANDALONE',
                 'link_with' : [
-                        libbasic,
+                        libbasic_static,
                         libshared_static,
                         libsystemd_static,
                 ],

diff --git a/src/test/meson.build b/src/test/meson.build
index 8b2b8b98da8b0a0db1f506486d9cdc829a004a18..b43bd5d8228e0d86f2ae2912c6b015f859f2bc8f 100644 (file)
--- a/src/test/meson.build
+++ b/src/test/meson.build
@@ -273,7 +273,7 @@ executables += [
                 # only static linking apart from libdl, to make sure that the
                 # module is linked to all libraries that it uses.
                 'sources' : files('test-dlopen.c'),
-                'link_with' : libbasic,
+                'link_with' : libbasic_static,
                 'dependencies' : libdl,
                 'install' : false,
                 'type' : 'manual',
@@ -408,7 +408,7 @@ executables += [
         },
         test_template + {
                 'sources' : files('test-sizeof.c'),
-                'link_with' : libbasic,
+                'link_with' : libbasic_static,
         },
         test_template + {
                 'sources' : files('test-time-util.c'),
@@ -588,7 +588,7 @@ executables += [
         test_template + {
                 'sources' : files('../libsystemd/sd-device/test-sd-device-thread.c'),
                 'link_with' : [
-                        libbasic,
+                        libbasic_static,
                         libsystemd,
                 ],
                 'dependencies' : threads,
@@ -596,7 +596,7 @@ executables += [
         test_template + {
                 'sources' : files('../libudev/test-udev-device-thread.c'),
                 'link_with' : [
-                        libbasic,
+                        libbasic_static,
                         libudev,
                 ],
                 'dependencies' : threads,

diff --git a/src/tmpfiles/meson.build b/src/tmpfiles/meson.build
index 2e918509a7b45ce972507bedb673401a2379fe4c..09ad8395866730af84f7b733ce4c89f12d46b4fa 100644 (file)
--- a/src/tmpfiles/meson.build
+++ b/src/tmpfiles/meson.build
@@ -20,7 +20,7 @@ executables += [
                 'sources' : systemd_tmpfiles_sources,
                 'c_args' : '-DSTANDALONE',
                 'link_with' : [
-                        libbasic,
+                        libbasic_static,
                         libshared_static,
                         libsystemd_static,
                 ],