meson: rename libsystemd_internal to libsystem_static

We already use the "_static" suffix for libshared_static ("shared" is the name
of the library, "static" is the format) and other libs, so let's rename for
consistency.

Also change libsystemd_static_sources to libsystemd_sources, since the same
list is used for both and shorter is better.

diff --git a/meson.build b/meson.build
index 11b73bcb199678d4bbb000721d3ae36051d0604d..9dabf342d230046676df35efb69ea948760ff767 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1258,7 +1258,7 @@ libjournal_core = static_library(
 libsystemd_sym_path = '@0@/@1@'.format(meson.current_source_dir(), libsystemd_sym)
 libsystemd = shared_library(
         'systemd',
-        libsystemd_internal_sources,
+        libsystemd_sources,
         journal_internal_sources,
         version : libsystemd_version,
         include_directories : includes,
@@ -1338,7 +1338,7 @@ foreach tuple : [['myhostname', 'ENABLE_MYHOSTNAME'],
                                      '-shared',
                                      '-Wl,--version-script=' + version_script_arg,
                                      '-Wl,--undefined'],
-                        link_with : [libsystemd_internal,
+                        link_with : [libsystemd_static,
                                      libbasic],
                         dependencies : [threads,
                                         librt],
@@ -1576,7 +1576,7 @@ if conf.get('ENABLE_LOGIND') == 1
                         include_directories : includes,
                         link_args : ['-shared',
                                      '-Wl,--version-script=' + version_script_arg],
-                        link_with : [libsystemd_internal,
+                        link_with : [libsystemd_static,
                                      libshared_static],
                         dependencies : [threads,
                                         libpam,

diff --git a/src/libsystemd/meson.build b/src/libsystemd/meson.build
index 4abf50b1113ff58aff989827e406160651af6fdd..b305af159c9e5bea6cdefc62eeb0a1d00d9e0d67 100644 (file)
--- a/src/libsystemd/meson.build
+++ b/src/libsystemd/meson.build
@@ -17,7 +17,7 @@
 
 sd_login_c = files('sd-login/sd-login.c')
 
-libsystemd_internal_sources = files('''
+libsystemd_sources = files('''
         sd-bus/bus-bloom.c
         sd-bus/bus-bloom.h
         sd-bus/bus-common-errors.c
@@ -93,9 +93,9 @@ libsystemd_internal_sources = files('''
         sd-utf8/sd-utf8.c
 '''.split()) + sd_login_c
 
-libsystemd_internal = static_library(
+libsystemd_static = static_library(
         'systemd',
-        libsystemd_internal_sources,
+        libsystemd_sources,
         install : false,
         include_directories : includes,
         link_with : libbasic,

diff --git a/src/libudev/meson.build b/src/libudev/meson.build
index 30d6721b608b8df30d93ffaab24cc33d601d5f4e..09cf762c273e6437ebd16a409f9cae9ac79db7f3 100644 (file)
--- a/src/libudev/meson.build
+++ b/src/libudev/meson.build
@@ -41,7 +41,7 @@ libudev = shared_library(
         link_args : ['-shared',
                      '-Wl,--version-script=' + libudev_sym_path],
         link_with : [libbasic,
-                     libsystemd_internal],
+                     libsystemd_static],
         dependencies : [threads],
         link_depends : libudev_sym,
         install : true,

diff --git a/src/shared/meson.build b/src/shared/meson.build
index 06a944c49df1c7587cb4998ab045fd2e5e929e14..4620eaa007a949529a7c5950bbb37b4a65943f41 100644 (file)
--- a/src/shared/meson.build
+++ b/src/shared/meson.build
@@ -164,7 +164,7 @@ libshared = shared_library(
         shared_sources,
         basic_sources,
         journal_internal_sources,
-        libsystemd_internal_sources,
+        libsystemd_sources,
         libudev_sources,
         include_directories : includes,
         link_args : ['-shared',

diff --git a/src/test/meson.build b/src/test/meson.build
index 6bb5bd629e385219cb6a5bfa7e2e235404ef0be5..dcec53fa51520630cefb3879208988fe93ffdd60 100644 (file)
--- a/src/test/meson.build
+++ b/src/test/meson.build
@@ -67,7 +67,7 @@ tests += [
           'src/test/test-helper.c'],
          [libcore,
           libudev,
-          libsystemd_internal],
+          libsystemd_static],
          [threads,
           librt,
           libseccomp,
@@ -772,7 +772,7 @@ tests += [
 
         [['src/libsystemd/sd-bus/test-bus-error.c'],
          [libshared_static,
-          libsystemd_internal],
+          libsystemd_static],
          []],
 
         [['src/libsystemd/sd-bus/test-bus-track.c'],

diff --git a/src/udev/meson.build b/src/udev/meson.build
index 3b2c7b5e1246f696ba92d8b70a41dc62f2f08dc7..fc06d6f85aa52d458e87fa57e3eea6af5c9bdb23 100644 (file)
--- a/src/udev/meson.build
+++ b/src/udev/meson.build
@@ -113,7 +113,7 @@ if get_option('link-udev-shared')
         udev_rpath = rootlibexecdir
 else
         udev_link_with = [libshared_static,
-                          libsystemd_internal]
+                          libsystemd_static]
         udev_rpath = ''
 endif