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.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2017-12-19 11:35:01 +01:00
parent db7d1dcae6
commit 37e4d7a855
6 changed files with 11 additions and 11 deletions

View file

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

View file

@ -17,7 +17,7 @@
sd_login_c = files('sd-login/sd-login.c') 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.c
sd-bus/bus-bloom.h sd-bus/bus-bloom.h
sd-bus/bus-common-errors.c sd-bus/bus-common-errors.c
@ -93,9 +93,9 @@ libsystemd_internal_sources = files('''
sd-utf8/sd-utf8.c sd-utf8/sd-utf8.c
'''.split()) + sd_login_c '''.split()) + sd_login_c
libsystemd_internal = static_library( libsystemd_static = static_library(
'systemd', 'systemd',
libsystemd_internal_sources, libsystemd_sources,
install : false, install : false,
include_directories : includes, include_directories : includes,
link_with : libbasic, link_with : libbasic,

View file

@ -41,7 +41,7 @@ libudev = shared_library(
link_args : ['-shared', link_args : ['-shared',
'-Wl,--version-script=' + libudev_sym_path], '-Wl,--version-script=' + libudev_sym_path],
link_with : [libbasic, link_with : [libbasic,
libsystemd_internal], libsystemd_static],
dependencies : [threads], dependencies : [threads],
link_depends : libudev_sym, link_depends : libudev_sym,
install : true, install : true,

View file

@ -164,7 +164,7 @@ libshared = shared_library(
shared_sources, shared_sources,
basic_sources, basic_sources,
journal_internal_sources, journal_internal_sources,
libsystemd_internal_sources, libsystemd_sources,
libudev_sources, libudev_sources,
include_directories : includes, include_directories : includes,
link_args : ['-shared', link_args : ['-shared',

View file

@ -67,7 +67,7 @@ tests += [
'src/test/test-helper.c'], 'src/test/test-helper.c'],
[libcore, [libcore,
libudev, libudev,
libsystemd_internal], libsystemd_static],
[threads, [threads,
librt, librt,
libseccomp, libseccomp,
@ -772,7 +772,7 @@ tests += [
[['src/libsystemd/sd-bus/test-bus-error.c'], [['src/libsystemd/sd-bus/test-bus-error.c'],
[libshared_static, [libshared_static,
libsystemd_internal], libsystemd_static],
[]], []],
[['src/libsystemd/sd-bus/test-bus-track.c'], [['src/libsystemd/sd-bus/test-bus-track.c'],

View file

@ -113,7 +113,7 @@ if get_option('link-udev-shared')
udev_rpath = rootlibexecdir udev_rpath = rootlibexecdir
else else
udev_link_with = [libshared_static, udev_link_with = [libshared_static,
libsystemd_internal] libsystemd_static]
udev_rpath = '' udev_rpath = ''
endif endif